X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FCA.pm;h=28ffc2e73df9fa3506ee019cc59f3b2aa66b1a97;hb=b61db412d0d913a4fcecbce6678710ad0eb76cf6;hp=3517a3488d3b992b92172f9a072bec43da4f529b;hpb=8181ef34837e9856c9168db79847c6fe584c15b4;p=kivitendo-erp.git

diff --git a/SL/CA.pm b/SL/CA.pm
index 3517a3488..28ffc2e73 100644
--- a/SL/CA.pm
+++ b/SL/CA.pm
@@ -141,6 +141,7 @@ sub all_transactions {
   if ($form->{todate}) {
     $fromto   .= " AND ac.transdate <= '$form->{todate}'";
     $subwhere .= " AND transdate <= '$form->{todate}'";
+    $glwhere .= " AND ac.transdate <= '$form->{todate}'";
   }
 
   if ($form->{eur}) {
@@ -164,7 +165,7 @@ sub all_transactions {
     $where .= $fromto;
     $AR_PAID = "";
     $AP_PAID = "";
-    $glwhere = ""; # note! gl will be aliased as "a" later...
+    $glwhere = "";    # note! gl will be aliased as "a" later...
   }
   my $sortorder = join ', ',
     $form->sort_columns(qw(transdate reference description));
@@ -323,14 +324,14 @@ sub all_transactions {
 
   foreach my $id (@id) {
 
-      # NOTE: 
-      #  Postgres is really picky about the order of implicit CROSS JOINs with ','
-      #  if you alias the  tables and want to use the alias later in another JOIN.
-      #  the alias you want to use has to be the most recent in the list, otherwise
-      #  Postgres will overwrite the alias internally and complain.
-      #  For this reason, in the next 3 SELECTs, the 'a' alias is last in the list.
-      #  Don't change this, and if you do, substitute the ',' with CROSS JOIN
-      #  ... that also works.
+    # NOTE:
+    #  Postgres is really picky about the order of implicit CROSS JOINs with ','
+    #  if you alias the  tables and want to use the alias later in another JOIN.
+    #  the alias you want to use has to be the most recent in the list, otherwise
+    #  Postgres will overwrite the alias internally and complain.
+    #  For this reason, in the next 3 SELECTs, the 'a' alias is last in the list.
+    #  Don't change this, and if you do, substitute the ',' with CROSS JOIN
+    #  ... that also works.
 
     # get all transactions
     $query .= qq|$union