X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/blobdiff_plain/f1e5fd2d8c139e903899a984cf4b116afb2efd47..2ceb6719379a2825dfd3f2ea41c94eb7ec06a491:/SL/GL.pm

diff --git a/SL/GL.pm b/SL/GL.pm
index 50358d264..a080b85fc 100644
--- a/SL/GL.pm
+++ b/SL/GL.pm
@@ -281,9 +281,9 @@ sub all_transactions {
     $apwhere .= " AND c.gifi_accno = '$form->{gifi_accno}'";
   }
   if ($form->{category} ne 'X') {
-    $glwhere .= " AND c.category = '$form->{category}'";
-    $arwhere .= " AND c.category = '$form->{category}'";
-    $apwhere .= " AND c.category = '$form->{category}'";
+    $glwhere .= " AND gl.id in (SELECT trans_id FROM acc_trans ac2 WHERE ac2.chart_id IN (SELECT id FROM chart c2 WHERE c2.category = '$form->{category}'))";
+    $arwhere .= " AND ar.id in (SELECT trans_id FROM acc_trans ac2 WHERE ac2.chart_id IN (SELECT id FROM chart c2 WHERE c2.category = '$form->{category}'))";
+    $apwhere .= " AND ap.id in (SELECT trans_id FROM acc_trans ac2 WHERE ac2.chart_id IN (SELECT id FROM chart c2 WHERE c2.category = '$form->{category}'))";
   }
 
   if ($form->{accno}) {
@@ -374,108 +374,117 @@ sub all_transactions {
 	         ORDER BY transdate, trans_id, taxkey DESC, sorttax DESC, oid|;
   my $sth = $dbh->prepare($query);
   $sth->execute || $form->dberror($query);
-
-  while (my $ref = $sth->fetchrow_hashref(NAME_lc)) {
-    print(STDERR $ref->{id}, " Transaction\n");
-
-    # gl
-    if ($ref->{type} eq "gl") {
-      $ref->{module} = "gl";
-    }
-
-    # ap
-    if ($ref->{type} eq "ap") {
-      if ($ref->{invoice}) {
-        $ref->{module} = "ir";
-      } else {
-        $ref->{module} = "ap";
+  my $trans_id = "";
+  my $trans_id2 = "";
+  while (my $ref0 = $sth->fetchrow_hashref(NAME_lc)) {
+    $trans_id = $ref0->{id};
+    if ($trans_id != $trans_id2) {
+      if ($trans_id2) {
+        push @{ $form->{GL} }, $ref;
+        $balance = 0;
       }
-    }
-
-    # ar
-    if ($ref->{type} eq "ar") {
-      if ($ref->{invoice}) {
-        $ref->{module} = "is";
-      } else {
-        $ref->{module} = "ar";
+      $ref = $ref0;
+      $trans_id2 = $ref->{id};
+      
+      # gl
+      if ($ref->{type} eq "gl") {
+        $ref->{module} = "gl";
       }
-    }
-    $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};
-      } else {
-        $ref->{debit}{$k}        = $ref->{amount} * -1;
-        $ref->{debit_accno}{$k}  = $ref->{accno};
-        $ref->{debit_taxkey}{$k} = $ref->{taxkey};
+      # ap
+      if ($ref->{type} eq "ap") {
+        if ($ref->{invoice}) {
+          $ref->{module} = "ir";
+        } else {
+          $ref->{module} = "ap";
+        }
       }
-    } 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_accno}{$l}  = $ref->{accno};
-        $ref->{credit_taxkey}{$l} = $ref->{taxkey};
+  
+      # ar
+      if ($ref->{type} eq "ar") {
+        if ($ref->{invoice}) {
+          $ref->{module} = "is";
+        } else {
+          $ref->{module} = "ar";
+        }
       }
-    }
-    if ($form->{accno} eq ''){ # flo & udo: if general report,
-                               # then check balance
-      while (abs($balance) >= 0.015) {
-        my $ref2 = $sth->fetchrow_hashref(NAME_lc)
-          || $form->error("Unbalanced ledger!");
-
-        $balance =
-          (int($balance * 100000) + int(100000 * $ref2->{amount})) / 100000;
-        print(STDERR $balance, " BAlance\n");
-        print(STDERR $ref2->{amount}, " Ref2->amount\n");
-        if ($ref2->{amount} < 0) {
-          if ($ref2->{chart_id} > 0) {
-            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};
-          }
+      $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};
+        } else {
+          $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 {
-          if ($ref2->{chart_id} > 0) {
-            if ($ref->{credit_tax_accno}{$j} ne "") {
-              $j++;
+          $ref->{credit}{$l}        = $ref->{amount};
+          $ref->{credit_accno}{$l}  = $ref->{accno};
+          $ref->{credit_taxkey}{$l} = $ref->{taxkey};
+        }
+      }
+    } else {
+      $ref2 = $ref0;
+      $trans_id2 = $ref2->{id};
+#      if ($form->{accno} eq ''){ # flo & udo: if general report,
+                                  # then check balance
+#         while (abs($balance) >= 0.015) {
+#           my $ref2 = $sth->fetchrow_hashref(NAME_lc)
+#             || $form->error("Unbalanced ledger!");
+#     
+          $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++;
+              }
+              $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};
             }
-            $ref->{credit_tax}{$j}       = $ref2->{amount};
-            $ref->{credit_tax_accno}{$j} = $ref2->{accno};
           } else {
-            if ($ref->{credit_accno}{$l} ne "") {
-              $l++;
+            if ($ref2->{chart_id} > 0) {
+              if ($ref->{credit_tax_accno}{$j} ne "") {
+                $j++;
+              }
+              $ref->{credit_tax}{$j}       = $ref2->{amount};
+              $ref->{credit_tax_accno}{$j} = $ref2->{accno};
+            } else {
+              if ($ref->{credit_accno}{$l} ne "") {
+                $l++;
+              }
+              $ref->{credit}{$l}        = $ref2->{amount};
+              $ref->{credit_accno}{$l}  = $ref2->{accno};
+              $ref->{credit_taxkey}{$l} = $ref2->{taxkey};
             }
-            $ref->{credit}{$l}        = $ref2->{amount};
-            $ref->{credit_accno}{$l}  = $ref2->{accno};
-            $ref->{credit_taxkey}{$l} = $ref2->{taxkey};
           }
-        }
-      }
-    } else {
-      # if account-report, then calculate the Balance?!
-      # ToDo: Calculate the Balance
-      1;
+#         }
+#       } else {
+#         # if account-report, then calculate the Balance?!
+#         # ToDo: Calculate the Balance
+#         1;
+#       }
     }
        
     #    print(STDERR Dumper($ref));
-    push @{ $form->{GL} }, $ref;
-    $balance = 0;
+
   }
+  push @{ $form->{GL} }, $ref;
   $sth->finish;
 
   if ($form->{accno}) {
@@ -548,7 +557,7 @@ sub transaction {
     }
 
     # get tax description
-    $query = qq| SELECT * FROM tax t|;
+    $query = qq| SELECT * FROM tax t order by t.taxkey|;
     $sth   = $dbh->prepare($query);
     $sth->execute || $form->dberror($query);
     $form->{TAX} = ();