X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FCA.pm;h=8122b9d4eeecab9497b2176a93c533793c739565;hb=a7820e648c271e85f408353c1be009ad16a5b70c;hp=28ffc2e73df9fa3506ee019cc59f3b2aa66b1a97;hpb=70e8595918db106d9efdc76559059898a9ed8e6a;p=kivitendo-erp.git diff --git a/SL/CA.pm b/SL/CA.pm index 28ffc2e73..8122b9d4e 100644 --- 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; } @@ -144,29 +144,11 @@ sub all_transactions { $glwhere .= " AND ac.transdate <= '$form->{todate}'"; } - if ($form->{eur}) { - $AR_PAID = qq|AND ac.trans_id IN - ( - SELECT trans_id - FROM acc_trans - JOIN chart ON (chart_id = id) - WHERE link LIKE '%AR_paid%' - $subwhere - )|; - $AP_PAID = qq|AND ac.trans_id IN - ( - SELECT trans_id - FROM acc_trans - JOIN chart ON (chart_id = id) - WHERE link LIKE '%AP_paid%' - $subwhere - )|; - } else { - $where .= $fromto; - $AR_PAID = ""; - $AP_PAID = ""; - $glwhere = ""; # note! gl will be aliased as "a" later... - } + + $where .= $fromto; + $AR_PAID = ""; + $AP_PAID = ""; + $glwhere = ""; # note! gl will be aliased as "a" later... my $sortorder = join ', ', $form->sort_columns(qw(transdate reference description)); my $false = ($myconfig->{dbdriver} eq 'Pg') ? FALSE: q|'0'|;