Merge von 772,773 aus unstable: Bugfix 220

-Fix zu Bug 220, Rabatt wurde nur fuer ein einzelnes Item berechnet.
 Man sollte dazu noch erwaehnen, dass das anscheinend kein Bug,
 sondern eine Designentscheidung im SQL-Ledger ist.
-Nachtrag zu Bug 220, Rabatt wurde nur fuer ein einzelnes Item berechnet.
 Korrektur bei Angeboten

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;
 
-      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)
-      $form->{"netprice_$i"} = $sellprice - $discount;
+      $form->{"netprice_$i"} = $sellprice - $i_discount;
+
       push(@{ $form->{netprice} },
            ($form->{"netprice_$i"} != 0)
            ? $form->format_amount(

diff --git a/SL/OE.pm b/SL/OE.pm
index 4e3be4539bb735c066e0b101f083ac0568db2d36..6dec175bdded79b46998627a6683301b53ece16c 100644 (file)
--- a/SL/OE.pm
+++ b/SL/OE.pm
@@ -887,14 +887,14 @@ sub order_details {
       $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)
-      $form->{"netprice_$i"} = $sellprice - $discount;
+      #$form->{"netprice_$i"} = $sellprice - $discount;
+      $form->{"netprice_$i"} = $sellprice - $i_discount;
 
       my $linetotal =
         $form->round_amount($form->{"qty_$i"} * $form->{"netprice_$i"}, 2);