X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fio.pl;h=7648dc1fd710f06c96a5807a8a3606e18339dc93;hb=480c67096c7aab3ccfe6b55e8d981975c7f08578;hp=476ff015365a23d8a306a905986e96febedea052;hpb=97e289a3d316f3e5deaf691ecc982b0332f2c28d;p=kivitendo-erp.git diff --git a/bin/mozilla/io.pl b/bin/mozilla/io.pl index 476ff0153..7648dc1fd 100644 --- a/bin/mozilla/io.pl +++ b/bin/mozilla/io.pl @@ -38,14 +38,14 @@ use SL::IC; use CGI::Ajax; use CGI; -require "$form->{path}/common.pl"; +require "bin/mozilla/common.pl"; # any custom scripts for this one -if (-f "$form->{path}/custom_io.pl") { - eval { require "$form->{path}/custom_io.pl"; }; +if (-f "bin/mozilla/custom_io.pl") { + eval { require "bin/mozilla/custom_io.pl"; }; } -if (-f "$form->{path}/$form->{login}_io.pl") { - eval { require "$form->{path}/$form->{login}_io.pl"; }; +if (-f "bin/mozilla/$form->{login}_io.pl") { + eval { require "bin/mozilla/$form->{login}_io.pl"; }; } 1; @@ -368,9 +368,9 @@ sub display_row { } $column_data{sellprice_pg} = - qq||; + qq||; $column_data{sellprice} = - qq||; + qq||; } else { # for last row and report @@ -388,10 +388,10 @@ sub display_row { # for last row $column_data{sellprice_pg} = qq| |; - } - + } + $column_data{sellprice} = - qq||; @@ -486,7 +486,7 @@ sub display_row { ? 'deliverydate' : 'reqdate'; # invoice uses a different term for the same thing. print qq| - ${$reqdate_term} + ${$reqdate_term} |; } my $subtotalchecked = ($form->{"subtotal_$i"}) ? "checked" : ""; @@ -583,7 +583,7 @@ sub select_item { $colspan = $#column_index + 1; print qq| - +

@@ -624,7 +624,7 @@ sub select_item { $column_data{partnumber} = qq|$ref->{partnumber}|; $column_data{description} = - qq|{description}>$ref->{description}|; + qq|$ref->{description}|; $column_data{sellprice} = qq|| . $form->format_amount(\%myconfig, $ref->{sellprice}, 2, " ") @@ -642,18 +642,16 @@ sub select_item { map { print "\n$column_data{$_}" } @column_index; - print qq| - -|; -map({ print($cgi->hidden("-name" => "new_$__$i", "-value" => $ref->{$_})); } - qw(bin listprice inventory_accno income_accno expense_accno unit weight assembly taxaccounts partsgroup - formel logdescription not_discountable part_payment_id partnodes id)); -if ($lizenzen) { - print qq| - -|; - } + print("\n"); + my @new_fields = + qw(bin listprice inventory_accno income_accno expense_accno unit weight + assembly taxaccounts partsgroup formel longdescription not_discountable + part_payment_id partnotes id); + push(@new_fields, "lizenzen") if ($lizenzen); + + print join "\n", map { $cgi->hidden("-name" => "new_${_}_$i", "-value" => $ref->{$_}) } @new_fields; + print "\n"; } print qq| @@ -824,17 +822,10 @@ sub new_item { . $locale->text('Service'); print $cgi->hidden("-name" => "previousform", "-value" => $previousform); map({ print($cgi->hidden("-name" => $_, "-value" => $form->{$_})); } - ("partnumber_$i", "description_$i", "rowcount", "taxaccounts", "vc", "path", "login", "password")); - -# -# -# -# -# -# -# -# -# + qw(rowcount vc login password)); + map({ print($cgi->hidden("-name" => $_, "-value" => $form->{"$__$i"})); } + ("partnumber", "description")); +print $cgi->hidden("-name" => "taxaccount2", "-value" => $form->{taxaccounts}); print qq| @@ -863,7 +854,7 @@ sub display_form { # if we have a display_form if ($form->{display_form}) { - &{"$form->{display_form}"}; + call_sub($form->{"display_form"}); exit; } @@ -1159,7 +1150,7 @@ sub order { $form->{cp_id} *= 1; - require "$form->{path}/$form->{script}"; + require "bin/mozilla/$form->{script}"; my $script = $form->{"script"}; $script =~ s|.*/||; $script =~ s|.pl$||; @@ -1223,7 +1214,7 @@ sub quotation { $form->{rowcount}--; - require "$form->{path}/$form->{script}"; + require "bin/mozilla/$form->{script}"; map { $form->{"select$_"} = "" } ($form->{vc}, currency); @@ -1265,166 +1256,36 @@ sub edit_e_mail { $form->{print_and_post} = 0; $form->{resubmit} = 0; } - if ($myconfig{role} eq 'admin') { - $bcc = qq| - - | . $locale->text('Bcc') . qq| - - -|; - } - if ($form->{formname} =~ /(pick|packing|bin)_list/) { - $form->{email} = $form->{shiptoemail} if $form->{shiptoemail}; - } + $form->{email} = $form->{shiptoemail} if $form->{shiptoemail} && $form->{formname} =~ /(pick|packing|bin)_list/; if ($form->{"cp_id"} && !$form->{"email"}) { CT->get_contact(\%myconfig, $form); $form->{"email"} = $form->{"cp_email"}; } - $name = $form->{ $form->{vc} }; - $name =~ s/--.*//g; - $title = $locale->text('E-mail') . " $name"; + $form->{ $form->{vc} } =~ /--/; + $title = $locale->text('E-mail') . " $`"; $form->{oldmedia} = $form->{media}; $form->{media} = "email"; - my %formname_translations = - ( - "bin_list" => $locale->text('Bin List'), - "credit_note" => $locale->text('Credit Note'), - "invoice" => $locale->text('Invoice'), - "packing_list" => $locale->text('Packing List'), - "pick_list" => $locale->text('Pick List'), - "proforma" => $locale->text('Proforma Invoice'), - "purchase_order" => $locale->text('Purchase Order'), - "request_quotation" => $locale->text('RFQ'), - "sales_order" => $locale->text('Confirmation'), - "sales_quotation" => $locale->text('Quotation'), - "storno_invoice" => $locale->text('Storno Invoice'), - "storno_packing_list" => $locale->text('Storno Packing List'), - ); - - my $attachment_filename = $formname_translations{$form->{"formname"}}; - my $prefix; - - if (grep({ $form->{"type"} eq $_ } qw(invoice credit_note))) { - $prefix = "inv"; - } elsif ($form->{"type"} =~ /_quotation$/) { - $prefix = "quo"; - } else { - $prefix = "ord"; - } - - if ($attachment_filename && $form->{"${prefix}number"}) { - $attachment_filename .= "_" . $form->{"${prefix}number"} . - ($form->{"format"} =~ /pdf/i ? ".pdf" : - $form->{"format"} =~ /postscript/i ? ".ps" : - $form->{"format"} =~ /opendocument/i ? ".odt" : - $form->{"format"} =~ /html/i ? ".html" : ""); - $attachment_filename =~ s/ /_/g; - my %umlaute = - ( - "ä" => "ae", "ö" => "oe", "ü" => "ue", - "Ä" => "Ae", "Ö" => "Oe", "Ü" => "Ue", - "ß" => "ss" - ); - map({ $attachment_filename =~ s/$_/$umlaute{$_}/g; } keys(%umlaute)); - } else { - $attachment_filename = ""; - } + my $attachment_filename = $form->generate_attachment_filename(); - if ($form->{"email"}) { - $form->{"fokus"} = "Form.subject"; - } else { - $form->{"fokus"} = "Form.email"; - } + $form->{"fokus"} = $form->{"email"} ? "Form.subject" : "Form.email"; $form->header; - print qq| - - - - - - - - - - - - - - - - - - - - - -

$title

- - - - - - - - - - $bcc - - - - - - - -

\| . $locale->text('To') . qq\|
\| . $locale->text('Cc') . qq\|
\| . $locale->text('Subject') . qq\|
\| . $locale->text('Attachment name') . - qq\|

- - - - - - - -

\| . $locale->text('Message') . qq\|
\| . - H($form->{"message"}) . qq\|

-|; - - &print_options; + my (@dont_hide_key_list, %dont_hide_key, @hidden_keys); + @dont_hide_key_list = qw(action email cc bcc subject message formname sendmode format header override); + @dont_hide_key{@dont_hide_key_list} = (1) x @dont_hide_key_list; + @hidden_keys = grep { !$dont_hide_key{$_} } grep { !ref $form->{$_} } keys %$form; - map { delete $form->{$_} } - qw(action email cc bcc subject message formname sendmode format header override); - - # save all other variables - foreach $key (keys %$form) { - $form->{$key} =~ s/\"/"/g; - print qq|\n|; - } - - print qq| -

- - - -
- -

- - - -|; + print $form->parse_html_template('generic/edit_email', + { title => $title, + a_filename => $attachment_filename, + _print_options_ => print_options('inline'), + HIDDEN => [ map +{ name => $_, value => $form->{$_} }, @hidden_keys ], + SHOW_BCC => $myconfig{role} eq 'admin' }); $lxdebug->leave_sub(); } @@ -1434,7 +1295,7 @@ sub send_email { my $callback = $form->{script} . "?action=edit"; map({ $callback .= "\&${_}=" . E($form->{$_}); } - qw(login password path type id)); + qw(login password type id)); print_form("return"); @@ -1507,7 +1368,7 @@ sub print_options { push @MEDIA, grep $_, opthash("screen", $form->{OP}{screen}, $locale->text('Screen')), - (scalar keys %{ $form->{printers} } && $latex_templates) ? + (scalar @{ $form->{printers} } && $latex_templates) ? opthash("printer", $form->{OP}{printer}, $locale->text('Printer')) : undef, ($latex_templates) ? opthash("queue", $form->{OP}{queue}, $locale->text('Queue')) : undef @@ -1530,12 +1391,12 @@ sub print_options { push @PRINTER_ID, map { opthash($_->{id}, ($_->{id} eq $form->{printer_id} ? 'selected' : ''), $_->{printer_description}) } +{}, @{ $form->{printers} } - if (ref $form->{printers} eq 'ARRAY'); + if ((ref $form->{printers} eq 'ARRAY') && scalar @{ $form->{printers } }); @SELECTS = map { sname => lc $_, DATA => \@$_, show => scalar @$_ }, qw(FORMNAME LANGUAGE_ID FORMAT SENDMODE MEDIA PRINTER_ID); %template_vars = ( - display_copies => scalar keys %{ $form->{printers} } && $latex_templates && $form->{media} ne 'email', + display_copies => scalar @{ $form->{printers} } && $latex_templates && $form->{media} ne 'email', display_remove_draft => (!$form->{id} && $form->{draft_id}), groupitems_checked => $form->{groupitems} ? "checked" : '', remove_draft_checked => $form->{remove_draft} ? "checked" : '' @@ -1722,9 +1583,10 @@ sub print_form { $form->{rowcount}--; - &{"$display_form"}; + call_sub($display_form); # saving the history if(!exists $form->{addition}) { + $form->{snumbers} = qq|ordnumber_| . $form->{ordnumber}; $form->{addition} = "PRINTED"; $form->save_history($form->dbconnect(\%myconfig)); } @@ -1744,7 +1606,7 @@ sub print_form { $salesman_id_saved = $form->{salesman_id}; $cp_id_saved = $form->{cp_id}; - &{"$form->{vc}_details"}(); + call_sub("$form->{vc}_details"); $form->{language_id} = $language_saved; $form->{payment_id} = $payment_id_saved; @@ -1811,6 +1673,8 @@ sub print_form { $form->{templates} = "$myconfig{templates}"; + delete $form->{printer_command}; + $form->{language} = $form->get_template_language(\%myconfig); $form->{printer_code} = $form->get_printer_code(\%myconfig); @@ -1840,13 +1704,16 @@ sub print_form { reformat_numbers($output_numberformat, 2, qw(invtotal ordtotal quototal subtotal linetotal listprice sellprice netprice discount - tax taxbase), + tax taxbase total paid), grep({ /^linetotal_\d+$/ || /^listprice_\d+$/ || /^sellprice_\d+$/ || /^netprice_\d+$/ || /^taxbase_\d+$/ || /^discount_\d+$/ || + /^paid_\d+$/ || + /^subtotal_\d+$/ || + /^total_\d+$/ || /^tax_\d+$/ } keys(%{$form}))); @@ -1875,6 +1742,8 @@ sub print_form { $form->{"IN"} =~ s/html$/odt/; } + delete $form->{OUT}; + if ($form->{media} eq 'printer') { $form->{OUT} = "| $form->{printer_command} &>/dev/null"; $form->{printed} .= " $form->{formname}"; @@ -1886,15 +1755,13 @@ sub print_form { $form->{subject} = qq|$form->{label} $form->{"${inv}number"}| unless $form->{subject}; - $form->{OUT} = "$sendmail"; - $form->{emailed} .= " $form->{formname}"; $form->{emailed} =~ s/^ //; } $emailed = $form->{emailed}; if ($form->{media} eq 'queue') { - %queued = split / /, $form->{queued}; + %queued = map { s|.*/|| } split / /, $form->{queued}; if ($filename = $queued{ $form->{formname} }) { $form->{queued} =~ s/$form->{formname} $filename//; @@ -1917,6 +1784,7 @@ sub print_form { # saving the history if(!exists $form->{addition}) { + $form->{snumbers} = qq|ordnumber_| . $form->{ordnumber}; if($form->{media} =~ /printer/) { $form->{addition} = "PRINTED"; } @@ -1973,7 +1841,7 @@ sub print_form { } qw(paid exchangerate); } - &{"$display_form"}; + call_sub($display_form); exit; } @@ -1984,7 +1852,7 @@ sub print_form { $form->redirect(qq|$form->{label} $form->{"${inv}number"} $msg|); } if ($form->{printing}) { - &{"$display_form"}; + call_sub($display_form); exit; } @@ -2038,7 +1906,7 @@ sub ship_to { contact email phone fax)); # get details for name - &{"$form->{vc}_details"}(@addr_vars); + call_sub("$form->{vc}_details", @addr_vars); $number = ($form->{vc} eq 'customer') @@ -2115,7 +1983,7 @@ sub ship_to { | . $locale->text('Contact') . qq| $form->{contact} - + | . $locale->text('Phone') . qq| @@ -2136,7 +2004,7 @@ sub ship_to { -| . $cgi->hidden("-name" => "nexsub", "-value" => $nextsub); +| . $cgi->hidden("-name" => "nextsub", "-value" => $nextsub); ; @@ -2198,7 +2066,7 @@ sub new_license { map { $form->{$_} = $form->escape($form->{$_}, 1) } qw(partnumber description); $form->{callback} = - qq|$form->{script}?login=$form->{login}&path=$form->{path}&password=$form->{password}&action=add&vc=$form->{db}&$form->{db}_id=$form->{id}&$form->{db}=$name&type=$form->{type}&customer=$customer&partnumber=$form->{partnumber}&description=$form->{description}&previousform="$previousform"&initial=1|; + qq|$form->{script}?login=$form->{login}&password=$form->{password}&action=add&vc=$form->{db}&$form->{db}_id=$form->{id}&$form->{db}=$name&type=$form->{type}&customer=$customer&partnumber=$form->{partnumber}&description=$form->{description}&previousform="$previousform"&initial=1|; $form->redirect; $lxdebug->leave_sub();