Lokale Hashes richtig deklarieren.

[mfinanz.git] / SL / CA.pm

diff --git a/SL/CA.pm b/SL/CA.pm
index 3517a3488d3b992b92172f9a072bec43da4f529b..4f4dbde63f9082d5412b40160632a722d8ed9ba4 100644 (file)
--- a/SL/CA.pm
+++ b/SL/CA.pm
@@ -42,7 +42,7 @@ sub all_accounts {
 
   my ($self, $myconfig, $form) = @_;
 
-  my $amount = ();
+  my %amount;
 
   # connect to database
   my $dbh = $form->dbconnect($myconfig);
@@ -65,7 +65,7 @@ sub all_accounts {
   $sth = $dbh->prepare($query);
   $sth->execute || $form->dberror($query);
 
-  my $gifi = ();
+  my %gifi;
   while (my ($accno, $description) = $sth->fetchrow_array) {
     $gifi{$accno} = $description;
   }
@@ -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