X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FGL.pm;h=d6723d3c51abbe9370d377ce2bb63bbae3189396;hb=682a07436395bb9d12d25663db72aebe651d554a;hp=50358d264ec5b05d85f2628cf904e82919929027;hpb=f1e5fd2d8c139e903899a984cf4b116afb2efd47;p=kivitendo-erp.git

diff --git a/SL/GL.pm b/SL/GL.pm
index 50358d264..d6723d3c5 100644
--- a/SL/GL.pm
+++ b/SL/GL.pm
@@ -38,6 +38,8 @@
 
 package GL;
 
+use Data::Dumper;
+
 sub delete_transaction {
   my ($self, $myconfig, $form) = @_;
   $main::lxdebug->enter_sub();
@@ -281,9 +283,12 @@ 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}) {
@@ -342,6 +347,20 @@ sub all_transactions {
 
   my $false = ($myconfig->{dbdriver} eq 'Pg') ? FALSE: q|'0'|;
 
+  my $sortorder = join ', ',
+    $form->sort_columns(qw(transdate reference source description accno));
+  my %ordinal = (transdate   => 6,
+                 reference   => 4,
+                 source      => 7,
+                 description => 5);
+  map { $sortorder =~ s/$_/$ordinal{$_}/ } keys %ordinal;
+
+  if ($form->{sort}) {
+    $sortorder = $form->{sort} . ",";
+  } else {
+    $sortorder = "";
+  }
+
   my $query =
     qq|SELECT g.id, 'gl' AS type, $false AS invoice, g.reference, ac.taxkey, t.taxkey AS sorttax,
                  g.description, ac.transdate, ac.source, ac.trans_id,
@@ -371,111 +390,121 @@ sub all_transactions {
 		 AND ac.chart_id = c.id
 		 AND a.vendor_id = ct.id
 		 AND a.id = ac.trans_id
-	         ORDER BY transdate, trans_id, taxkey DESC, sorttax DESC, oid|;
+	         ORDER BY $sortorder transdate, trans_id, taxkey DESC, sorttax DESC,oid|;
   my $sth = $dbh->prepare($query);
   $sth->execute || $form->dberror($query);
+  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;
+      }
+      $ref       = $ref0;
+      $trans_id2 = $ref->{id};
 
-  while (my $ref = $sth->fetchrow_hashref(NAME_lc)) {
-    print(STDERR $ref->{id}, " Transaction\n");
-
-    # gl
-    if ($ref->{type} eq "gl") {
-      $ref->{module} = "gl";
-    }
+      # 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";
+      # ap
+      if ($ref->{type} eq "ap") {
+        if ($ref->{invoice}) {
+          $ref->{module} = "ir";
+        } else {
+          $ref->{module} = "ap";
+        }
       }
-    }
 
-    # ar
-    if ($ref->{type} eq "ar") {
-      if ($ref->{invoice}) {
-        $ref->{module} = "is";
-      } else {
-        $ref->{module} = "ar";
+      # ar
+      if ($ref->{type} eq "ar") {
+        if ($ref->{invoice}) {
+          $ref->{module} = "is";
+        } else {
+          $ref->{module} = "ar";
+        }
       }
-    }
-    $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};
+      $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 {
-        $ref->{debit}{$k}        = $ref->{amount} * -1;
-        $ref->{debit_accno}{$k}  = $ref->{accno};
-        $ref->{debit_taxkey}{$k} = $ref->{taxkey};
+        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};
+        }
       }
     } else {
-      if ($ref->{chart_id} > 0) {
-        $ref->{credit_tax}{$j}       = $ref->{amount};
-        $ref->{credit_tax_accno}{$j} = $ref->{accno};
+      $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};
+        }
       } else {
-        $ref->{credit}{$l}        = $ref->{amount};
-        $ref->{credit_accno}{$l}  = $ref->{accno};
-        $ref->{credit_taxkey}{$l} = $ref->{taxkey};
-      }
-    }
-    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};
+        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 ($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};
+          if ($ref->{credit_accno}{$l} ne "") {
+            $l++;
           }
+          $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 +577,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} = ();