X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FGL.pm;h=c56de7beb37f8aff621bd9c88c3ee51a5daaac8f;hb=6b321c53c6fe735d29851ae988950ada875ff46e;hp=b3b0e0580010f6833f392d1b59b941f790b8aa4c;hpb=a5f55e6fe23ee776e90567d3e5ee6cdf116c3f9c;p=kivitendo-erp.git

diff --git a/SL/GL.pm b/SL/GL.pm
index b3b0e0580..c56de7beb 100644
--- a/SL/GL.pm
+++ b/SL/GL.pm
@@ -405,7 +405,7 @@ sub all_transactions {
     
     $trans_id = $ref0->{id};
     
-    if ($trans_id != $trans_id2) {
+    if ($trans_id != $trans_id2) { # first line of a booking
     
       if ($trans_id2) {
         push @{ $form->{GL} }, $ref;
@@ -440,35 +440,49 @@ sub all_transactions {
     
       $balance = $ref->{amount};
     
-      $i       = 0;
-      $j       = 0;
-      $k       = 0;
-      $l       = 0;
-
-      if ($ref->{amount} < 0) {
-        if ($ref->{chart_id} > 0) {
-          $ref->{debit_tax}{$i}       = $ref->{amount} * -1;
-          $ref->{debit_tax_accno}{$i} = $ref->{accno};
+      # Linenumbers of General Ledger  
+      $k       = 0; # Debit      # AP      # Soll
+      $l       = 0; # Credit     # AR      # Haben
+      $i       = 0; # Debit Tax  # AP_tax  # VSt
+      $j       = 0; # Credit Tax # AR_tax  # USt
+      
+
+      if ($ref->{chart_id} > 0) { # all tax accounts first line, no line increasing
+        if ($ref->{amount} < 0) {
+          if ($ref->{link} =~ /AR_tax/) {
+            $ref->{credit_tax}{$j}       = $ref->{amount};
+            $ref->{credit_tax_accno}{$j} = $ref->{accno};              
+          }
+          if ($ref->{link} =~ /AP_tax/) {
+            $ref->{debit_tax}{$i}       = $ref->{amount} * -1;
+            $ref->{debit_tax_accno}{$i} = $ref->{accno};   
+          }
         } else {
+          if ($ref->{link} =~ /AR_tax/) {
+            $ref->{credit_tax}{$j}       = $ref->{amount};
+            $ref->{credit_tax_accno}{$j} = $ref->{accno};              
+          }
+          if ($ref->{link} =~ /AP_tax/) {
+            $ref->{debit_tax}{$i}       = $ref->{amount} * -1;
+            $ref->{debit_tax_accno}{$i} = $ref->{accno};   
+          }
+        }
+      } else { #all other accounts first line
+        if ($ref->{amount} < 0) {
           $ref->{debit}{$k}        = $ref->{amount} * -1;
           $ref->{debit_accno}{$k}  = $ref->{accno};
           $ref->{debit_taxkey}{$k} = $ref->{taxkey};
-        }
-
-      } else {
 
-        if ($ref->{chart_id} > 0) {
-          $ref->{credit_tax}{$j}       = $ref->{amount};
-          $ref->{credit_tax_accno}{$j} = $ref->{accno};
         } else {
-          $ref->{credit}{$l}        = $ref->{amount};
+          $ref->{credit}{$l}        = $ref->{amount} * 1;
           $ref->{credit_accno}{$l}  = $ref->{accno};
           $ref->{credit_taxkey}{$l} = $ref->{taxkey};
-        }
 
+
+        }
       }
 
-    } else {
+    } else { # following lines of a booking, line increasing
 
       $ref2      = $ref0;
       $trans_old  =$trans_id2;
@@ -477,52 +491,48 @@ sub all_transactions {
       $balance =
         (int($balance * 100000) + int(100000 * $ref2->{amount})) / 100000;
 
-      if ($ref2->{amount} < 0) {
-
-        if ($ref2->{chart_id} > 0) {
-
-          if ($ref->{debit_tax_accno}{$i} ne "") {
-            $i++;
-          }
 
+      if ($ref2->{chart_id} > 0) { # all tax accounts, following lines
+        if ($ref2->{amount} < 0) {
           if ($ref2->{link} =~ /AR_tax/) {
+            if ($ref->{credit_tax_accno}{$j} ne "") {
+              $j++;
+            }
             $ref->{credit_tax}{$j}       = $ref2->{amount};
             $ref->{credit_tax_accno}{$j} = $ref2->{accno};              
           }
           if ($ref2->{link} =~ /AP_tax/) {
-            $ref->{debit_tax}{$j}       = $ref2->{amount} * -1;
-            $ref->{debit_tax_accno}{$j} = $ref2->{accno};   
+            if ($ref->{debit_tax_accno}{$i} ne "") {
+              $i++;
+            }
+            $ref->{debit_tax}{$i}       = $ref2->{amount} * -1;
+            $ref->{debit_tax_accno}{$i} = $ref2->{accno};   
           }
-          
         } else {
-
-          if ($ref->{debit_accno}{$k} ne "") {
-            $k++;
-          }
-          $ref->{debit}{$k}        = $ref2->{amount} * -1;
-          $ref->{debit_accno}{$k}  = $ref2->{accno};
-          $ref->{debit_taxkey}{$k} = $ref2->{taxkey};
-        }
-
-      } else {
-
-        if ($ref2->{chart_id} > 0) {
-
-          if ($ref->{credit_tax_accno}{$j} ne "") {
-            $j++;
-          }
-
           if ($ref2->{link} =~ /AR_tax/) {
+            if ($ref->{credit_tax_accno}{$j} ne "") {
+              $j++;
+            }
             $ref->{credit_tax}{$j}       = $ref2->{amount};
-            $ref->{credit_tax_accno}{$j} = $ref2->{accno}; 
+            $ref->{credit_tax_accno}{$j} = $ref2->{accno};              
           }
           if ($ref2->{link} =~ /AP_tax/) {
-            $ref->{debit_tax}{$j}       = $ref2->{amount} * -1;
-            $ref->{debit_tax_accno}{$j} = $ref2->{accno};  
+            if ($ref->{debit_tax_accno}{$i} ne "") {
+              $i++;
+            }
+            $ref->{debit_tax}{$i}       = $ref2->{amount} * -1;
+            $ref->{debit_tax_accno}{$i} = $ref2->{accno};   
           }
-
+        }
+      } else { # all other accounts, following lines
+        if ($ref2->{amount} < 0) {
+          if ($ref->{debit_accno}{$k} ne "") {
+            $k++;
+          }
+          $ref->{debit}{$k}        = $ref2->{amount} * - 1;
+          $ref->{debit_accno}{$k}  = $ref2->{accno};
+          $ref->{debit_taxkey}{$k} = $ref2->{taxkey};
         } else {
-
           if ($ref->{credit_accno}{$l} ne "") {
             $l++;
           }