X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FOE.pm;h=f700c357d515aa7ba64e6953a426c8e24b7f25d6;hb=115d9bb0740b874e6b68637db5847bac38f00996;hp=6013d24c55ac6176b0aa0692d7528d8e6977c31d;hpb=21717dcdc5c4da65aee616af66271b9f6fc164eb;p=kivitendo-erp.git diff --git a/SL/OE.pm b/SL/OE.pm index 6013d24c5..f700c357d 100644 --- a/SL/OE.pm +++ b/SL/OE.pm @@ -39,6 +39,7 @@ use List::Util qw(max); use SL::AM; use SL::Common; use SL::DBUtils; +use SL::IC; sub transactions { $main::lxdebug->enter_sub(); @@ -436,7 +437,7 @@ sub save { globalproject_id = ?, employee_id = ?, salesman_id = ?, cp_id = ?, transaction_description = ?, marge_total = ?, marge_percent = ? WHERE id = ?|; - @values = ($form->{ordnumber}, $form->{quonumber}, + @values = ($form->{ordnumber} || '', $form->{quonumber}, $form->{cusordnumber}, conv_date($form->{transdate}), conv_i($form->{vendor_id}), conv_i($form->{customer_id}), $amount, $netamount, conv_date($reqdate), @@ -950,6 +951,8 @@ sub order_details { $form->{discount} = []; + IC->prepare_parts_for_printing(); + my @arrays = qw(runningnumber number description longdescription qty ship unit bin partnotes serialnumber reqdate sellprice listprice netprice @@ -1072,9 +1075,9 @@ sub order_details { } if ($taxamount != 0) { - foreach my $item (split / /, $form->{"taxaccounts_$i"}) { - $taxaccounts{$item} += $taxamount * $form->{"${item}_rate"} / $taxrate; - $taxbase{$item} += $taxbase; + foreach my $accno (split / /, $form->{"taxaccounts_$i"}) { + $taxaccounts{$accno} += $taxamount * $form->{"${accno}_rate"} / $taxrate; + $taxbase{$accno} += $taxbase; } }