X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=inline;f=bin%2Fmozilla%2Fio.pl;h=8eb6363cf8b295894def47b0b1c694961cc7e6e3;hb=befa8b79f46fa8815bed0da27cbf406ca8a9b94f;hp=e597aa036b56ff52a38a5cdfe1ab13df2b6f518a;hpb=1387c8c3ae668f43cafc8b81f51f7952b42db262;p=kivitendo-erp.git diff --git a/bin/mozilla/io.pl b/bin/mozilla/io.pl index e597aa036..8eb6363cf 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; @@ -646,12 +646,12 @@ sub select_item { my @new_fields = qw(bin listprice inventory_accno income_accno expense_accno unit weight - assembly taxaccounts partsgroup formel logdescription not_discountable - part_payment_id partnodes id); + assembly taxaccounts partsgroup formel longdescription not_discountable + part_payment_id partnotes id); push(@new_fields, "lizenzen") if ($lizenzen); - map({ print($cgi->hidden("-name" => "new_${_}_$i", - "-value" => $ref->{$_})); } @new_fields); + print join "\n", map { $cgi->hidden("-name" => "new_${_}_$i", "-value" => $ref->{$_}) } @new_fields; + print "\n"; } print qq| @@ -706,7 +706,7 @@ sub item_selected { map { $form->{"${_}_$i"} = $form->{"new_${_}_$j"} } qw(id partnumber description sellprice listprice inventory_accno income_accno expense_accno bin unit weight assembly taxaccounts - partsgroup formel longdescription not_discountable partnotes); + partsgroup formel longdescription not_discountable partnotes lastcost); if ($form->{"part_payment_id_$i"} ne "") { $form->{payment_id} = $form->{"part_payment_id_$i"}; } @@ -822,7 +822,7 @@ sub new_item { . $locale->text('Service'); print $cgi->hidden("-name" => "previousform", "-value" => $previousform); map({ print($cgi->hidden("-name" => $_, "-value" => $form->{$_})); } - ("rowcount", "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}); @@ -854,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; } @@ -1129,6 +1129,9 @@ sub order { } $form->{ordnumber} = $form->{invnumber}; + $form->{old_employee_id} = $form->{employee_id}; + $form->{old_salesman_id} = $form->{salesman_id}; + map { delete $form->{$_} } qw(id printed emailed queued); if ($form->{script} eq 'ir.pl' || $form->{type} eq 'request_quotation') { $form->{title} = $locale->text('Add Purchase Order'); @@ -1150,7 +1153,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$||; @@ -1214,7 +1217,7 @@ sub quotation { $form->{rowcount}--; - require "$form->{path}/$form->{script}"; + require "bin/mozilla/$form->{script}"; map { $form->{"select$_"} = "" } ($form->{vc}, currency); @@ -1256,166 +1259,36 @@ sub edit_e_mail { $form->{print_and_post} = 0; $form->{resubmit} = 0; } - if ($myconfig{role} eq 'admin') { - $bcc = qq| -