my $glwhere = '';
my $glsumwhere = '';
my $tofrom;
- my ($fromdate, $todate, $hotfix_query);
+ my ($fromdate, $todate, $fetch_accounts_before_from);
if ($form->{fromdate} || $form->{todate}) {
if ($form->{fromdate}) {
$sumwhere .= $glsumwhere . " AND (NOT ac.ob_transaction OR ac.ob_transaction IS NULL) AND (NOT ac.cb_transaction OR ac.cb_transaction IS NULL)";
# get all entries before fromdate, which are not yet fetched
- # TODO dpt_where_without_arapgl and project
- $hotfix_query = qq|SELECT c.accno, c.description, c.category, SUM(ac.amount) AS amount
+ # TODO dpt_where_without_arapgl and project - project calculation seems bogus anyway
+ # TODO use fiscal_year_startdate for the whole trial balance
+ # anyway, if the last booking is in a deviating fiscal year, this already improves the query
+ my $fiscal_year_startdate = conv_dateq(get_balance_starting_date($form->{fromdate}));
+ $fetch_accounts_before_from = qq|SELECT c.accno, c.description, c.category, SUM(ac.amount) AS amount
FROM acc_trans ac JOIN chart c ON (c.id = ac.chart_id) WHERE 1 = 1 AND (ac.transdate <= $fromdate)
- AND (ac.transdate >= (SELECT date_trunc('YEAR', | . $fromdate . qq|::date)))
+ AND (ac.transdate >= $fiscal_year_startdate)
AND (NOT ac.ob_transaction OR ac.ob_transaction IS NULL) AND (NOT ac.cb_transaction OR ac.cb_transaction IS NULL)
AND c.accno NOT IN (SELECT c.accno FROM acc_trans ac JOIN chart c ON (c.id = ac.chart_id) WHERE 1 = 1 AND (ac.transdate >= $fromdate) AND (ac.transdate <= $todate)
AND (NOT ac.ob_transaction OR ac.ob_transaction IS NULL) AND (NOT ac.cb_transaction OR ac.cb_transaction IS NULL))
}
$sth->finish;
- if (! $form->{method} eq "cash") {
- $sth = prepare_execute_query($form, $dbh, $hotfix_query);
+ if (!$form->{method} ne "cash") {
+ $sth = prepare_execute_query($form, $dbh, $fetch_accounts_before_from);
while ($ref = $sth->fetchrow_hashref("NAME_lc")) {
$trb{ $ref->{accno} }{description} = $ref->{description};
$trb{ $ref->{accno} }{charttype} = 'A';