X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FRP.pm;h=ef93e73bbe934b49bb75a784004c5dca66ad2179;hb=95eab00b4c0bf3f5a1f9503d5fc5982c725367de;hp=a41c2a8f68827c36e6d4478416472edea758ac43;hpb=cf0a808e57c47f92c7ad05c4f45d0310d502db85;p=kivitendo-erp.git diff --git a/SL/RP.pm b/SL/RP.pm index a41c2a8f6..ef93e73bb 100644 --- a/SL/RP.pm +++ b/SL/RP.pm @@ -832,14 +832,16 @@ sub trial_balance { if ($form->{fromdate} || $form->{todate}) { if ($form->{fromdate}) { $fromdate = conv_dateq($form->{fromdate}); + my $fiscal_year_startdate = conv_dateq($self->get_balance_starting_date($form->{fromdate})); + # my $date_trunc = "(select date_trunc('year', date $fromdate))"; $tofrom .= " AND (ac.transdate >= $fromdate)"; $subwhere .= " AND (ac.transdate >= $fromdate)"; - $sumsubwhere .= " AND (ac.transdate >= (select date_trunc('year', date $fromdate))) "; - $saldosubwhere .= " AND (ac.transdate >= (select date_trunc('year', date $fromdate))) "; + $sumsubwhere .= " AND (ac.transdate >= $fiscal_year_startdate) "; + $saldosubwhere .= " AND (ac.transdate >= $fiscal_year_startdate) "; $invwhere .= " AND (a.transdate >= $fromdate)"; - $glsaldowhere .= " AND (ac.transdate >= (select date_trunc('year', date $fromdate))) "; + $glsaldowhere .= " AND (ac.transdate >= $fiscal_year_startdate) "; $glwhere = " AND (ac.transdate >= $fromdate)"; - $glsumwhere = " AND (ac.transdate >= (select date_trunc('year', date $fromdate))) "; + $glsumwhere = " AND (ac.transdate >= $fiscal_year_startdate) "; } if ($form->{todate}) { $todate = conv_dateq($form->{todate});