Bilanzfunktion:

[kivitendo-erp.git] / SL / OE.pm

diff --git a/SL/OE.pm b/SL/OE.pm
index 3afd462..b825012 100644 (file)
--- a/SL/OE.pm
+++ b/SL/OE.pm
@@ -437,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),
@@ -958,7 +958,7 @@ sub order_details {
        partnotes serialnumber reqdate sellprice listprice netprice
        discount p_discount discount_sub nodiscount_sub
        linetotal  nodiscount_linetotal tax_rate projectnumber
-       price_factor price_factor_name);
+       price_factor price_factor_name partsgroup);
 
   my $sameitem = "";
   foreach $item (sort { $a->[1] cmp $b->[1] } @partsgroup) {
@@ -1008,6 +1008,7 @@ sub order_details {
       push @{ $form->{listprice} },         $form->{"listprice_$i"};
       push @{ $form->{price_factor} },      $price_factor->{formatted_factor};
       push @{ $form->{price_factor_name} }, $price_factor->{description};
+      push @{ $form->{partsgroup} },        $form->{"partsgroup_$i"};
 
       my $sellprice     = $form->parse_amount($myconfig, $form->{"sellprice_$i"});
       my ($dec)         = ($sellprice =~ /\.(\d+)/);
@@ -1075,9 +1076,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;
         }
       }