Noch ein paar Formatierungsfehler bei Umwandlung von Sammelbestellung in Rechnung

diff --git a/SL/OE.pm b/SL/OE.pm
index ecd46470a575e8719973809b18a865bef7d5524e..29d8c09e797c2169677dc89a0e12b6e4cb1d027d 100644 (file)
--- a/SL/OE.pm
+++ b/SL/OE.pm
@@ -483,30 +483,12 @@ sub close_orders {
 
     if ($form->{"qty_$i"}) {
 
 
     if ($form->{"qty_$i"}) {
 

-      map { $form->{"${_}_$i"} =~ s/\'/\'\'/g }
-        qw(partnumber description unit);
-

       # set values to 0 if nothing entered
       $form->{"discount_$i"} =
       # set values to 0 if nothing entered
       $form->{"discount_$i"} =

-        $form->parse_amount($myconfig, $form->{"discount_$i"}) / 100;
+        $form->parse_amount($myconfig, $form->{"discount_$i"});

 
       $form->{"sellprice_$i"} =
         $form->parse_amount($myconfig, $form->{"sellprice_$i"});
 
       $form->{"sellprice_$i"} =
         $form->parse_amount($myconfig, $form->{"sellprice_$i"});

-      $fxsellprice = $form->{"sellprice_$i"};
-
-      my ($dec) = ($form->{"sellprice_$i"} =~ /\.(\d+)/);
-      $dec = length $dec;
-      my $decimalplaces = ($dec > 2) ? $dec : 2;
-
-      $discount =
-        $form->round_amount($form->{"sellprice_$i"} * $form->{"discount_$i"},
-                            $decimalplaces);
-      $form->{"sellprice_$i"} =
-        $form->round_amount($form->{"sellprice_$i"} - $discount,
-                            $decimalplaces);
-
-      $form->{"inventory_accno_$i"} *= 1;
-      $form->{"expense_accno_$i"}   *= 1;

     }
   }
   # get ids from $form
     }
   }
   # get ids from $form