Die Warengruppe beim Ausdruck der Vorlage zur Verfügung stellen.

diff --git a/SL/IS.pm b/SL/IS.pm
index 62cbf5369ba6ed92df8506e92d26cc0895b61d56..d011a083bfadd3b39659e30a1f47861376cc904d 100644 (file)
--- a/SL/IS.pm
+++ b/SL/IS.pm
@@ -143,7 +143,7 @@ sub invoice_details {
        partnotes serialnumber reqdate sellprice listprice netprice
        discount p_discount discount_sub nodiscount_sub
        linetotal  nodiscount_linetotal tax_rate projectnumber
        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 @tax_arrays =
     qw(taxbase tax taxdescription taxrate taxnumber);
 
   my @tax_arrays =
     qw(taxbase tax taxdescription taxrate taxnumber);


@@ -196,6 +196,7 @@ sub invoice_details {
       push @{ $form->{invdate} },           $form->{"invdate"};
       push @{ $form->{price_factor} },      $price_factor->{formatted_factor};
       push @{ $form->{price_factor_name} }, $price_factor->{description};
       push @{ $form->{invdate} },           $form->{"invdate"};
       push @{ $form->{price_factor} },      $price_factor->{formatted_factor};
       push @{ $form->{price_factor_name} }, $price_factor->{description};

+      push @{ $form->{partsgroup} },        $form->{"partsgroup_$i"};

 
       if ($form->{lizenzen}) {
         if ($form->{"licensenumber_$i"}) {
 
       if ($form->{lizenzen}) {
         if ($form->{"licensenumber_$i"}) {

diff --git a/SL/OE.pm b/SL/OE.pm
index f700c357d515aa7ba64e6953a426c8e24b7f25d6..b8250123f9e7aaec75b1754b7cc6183b2a9cf119 100644 (file)
--- a/SL/OE.pm
+++ b/SL/OE.pm
@@ -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
        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) {
 
   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->{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+)/);
 
       my $sellprice     = $form->parse_amount($myconfig, $form->{"sellprice_$i"});
       my ($dec)         = ($sellprice =~ /\.(\d+)/);