From: Moritz Bunkus Date: Thu, 12 Feb 2009 14:39:41 +0000 (+0000) Subject: Die Warengruppe beim Ausdruck der Vorlage zur Verfügung stellen. X-Git-Tag: release-2.6.0beta2~170 X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=613c0749a46dd4e5e0dbec1f3f1997c77f55fffb;p=kivitendo-erp.git Die Warengruppe beim Ausdruck der Vorlage zur Verfügung stellen. --- diff --git a/SL/IS.pm b/SL/IS.pm index 62cbf5369..d011a083b 100644 --- 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 - price_factor price_factor_name); + price_factor price_factor_name partsgroup); 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->{partsgroup} }, $form->{"partsgroup_$i"}; if ($form->{lizenzen}) { if ($form->{"licensenumber_$i"}) { diff --git a/SL/OE.pm b/SL/OE.pm index f700c357d..b8250123f 100644 --- 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 - 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+)/);