Bei verschachtelten Schleifen in der inneren Schleife eine andere Schleifenvariable...

diff --git a/SL/IS.pm b/SL/IS.pm
index af47ca7d053c7157815b74beff15f99946e4e387..2363771a4d3d9e9bb31136f7df76bbfd7154b85e 100644 (file)
--- a/SL/IS.pm
+++ b/SL/IS.pm
@@ -279,29 +279,25 @@ sub invoice_details {
 
       if ($form->round_amount($taxrate, 7) == 0) {
         if ($form->{taxincluded}) {
 
       if ($form->round_amount($taxrate, 7) == 0) {
         if ($form->{taxincluded}) {

-          foreach $item (@taxaccounts) {
-            $taxamount =
-              $form->round_amount($linetotal * $form->{"${item}_rate"} /
-                                    (1 + abs($form->{"${item}_rate"})),
-                                  2);
+          foreach my $accno (@taxaccounts) {
+            $taxamount            = $form->round_amount($linetotal * $form->{"${accno}_rate"} / (1 + abs($form->{"${accno}_rate"})), 2);

 
 

-            $taxaccounts{$item} += $taxamount;
-            $taxdiff            += $taxamount;
+            $taxaccounts{$accno} += $taxamount;
+            $taxdiff             += $taxamount;

 
 

-            $taxbase{$item} += $taxbase;
+            $taxbase{$accno}     += $taxbase;

           }
           $taxaccounts{ $taxaccounts[0] } += $taxdiff;
         } else {
           }
           $taxaccounts{ $taxaccounts[0] } += $taxdiff;
         } else {

-          foreach $item (@taxaccounts) {
-            $taxaccounts{$item} += $linetotal * $form->{"${item}_rate"};
-            $taxbase{$item}     += $taxbase;
+          foreach my $accno (@taxaccounts) {
+            $taxaccounts{$accno} += $linetotal * $form->{"${accno}_rate"};
+            $taxbase{$accno}     += $taxbase;

           }
         }
       } else {
           }
         }
       } else {

-        foreach $item (@taxaccounts) {
-          $taxaccounts{$item} +=
-            $taxamount * $form->{"${item}_rate"} / $taxrate;
-          $taxbase{$item} += $taxbase;
+        foreach my $accno (@taxaccounts) {
+          $taxaccounts{$accno} += $taxamount * $form->{"${accno}_rate"} / $taxrate;
+          $taxbase{$accno}     += $taxbase;

         }
       }
       $tax_rate = $taxrate * 100;
         }
       }
       $tax_rate = $taxrate * 100;

diff --git a/SL/OE.pm b/SL/OE.pm
index 3afd46262166ea89cee6f18ed452c2e7b988ebfd..95d60c36f68b85b6c42da5086c9bb7c0c55a18d2 100644 (file)
--- a/SL/OE.pm
+++ b/SL/OE.pm
@@ -1075,9 +1075,9 @@ sub order_details {
       }
 
       if ($taxamount != 0) {
       }
 
       if ($taxamount != 0) {

-        foreach my $item (split / /, $form->{"taxaccounts_$i"}) {
-          $taxaccounts{$item} += $taxamount * $form->{"${item}_rate"} / $taxrate;
-          $taxbase{$item}     += $taxbase;
+        foreach my $accno (split / /, $form->{"taxaccounts_$i"}) {
+          $taxaccounts{$accno} += $taxamount * $form->{"${accno}_rate"} / $taxrate;
+          $taxbase{$accno}     += $taxbase;

         }
       }
 
         }
       }