Fix zu Bug 220, Rabatt wurde nur fuer ein einzelnes Item berechnet.

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

diff --git a/SL/IS.pm b/SL/IS.pm
index f4bfd1da65fd6bbd3558f50e8044b6a75f3eee87..14f375a1f25c593aa42925ac1d68d8835a23bf63 100644 (file)
--- a/SL/IS.pm
+++ b/SL/IS.pm
@@ -141,14 +141,14 @@ sub invoice_details {
       $dec = length $dec;
       my $decimalplaces = ($dec > 2) ? $dec : 2;
 
       $dec = length $dec;
       my $decimalplaces = ($dec > 2) ? $dec : 2;
 

-      my $discount =
-        $form->round_amount(
-                            $sellprice * $form->parse_amount($myconfig,
-                                                 $form->{"discount_$i"}) / 100,
-                            $decimalplaces);
+      my $i_discount = $form->round_amount($sellprice * 
+                                           $form->parse_amount($myconfig, $form->{"discount_$i"}) / 100, $decimalplaces);
+
+      my $discount = $form->round_amount($form->{"qty_$i"} * $i_discount, $decimalplaces);

 
       # keep a netprice as well, (sellprice - discount)
 
       # keep a netprice as well, (sellprice - discount)

-      $form->{"netprice_$i"} = $sellprice - $discount;
+      $form->{"netprice_$i"} = $sellprice - $i_discount;
+

       push(@{ $form->{netprice} },
            ($form->{"netprice_$i"} != 0)
            ? $form->format_amount(
       push(@{ $form->{netprice} },
            ($form->{"netprice_$i"} != 0)
            ? $form->format_amount(