# 1.) Gehe zurück bis zu dem Datum an dem die Bücher geschlossen wurden
# 2.) Falls die Bücher noch nie geschlossen wurden, gehe zurück bis zum Bearbeitungsstart
# COALESCE((SELECT closedto FROM defaults),(SELECT itime FROM defaults))
+ # PROBLEM: Das date_trunc schneidet auf den 1.1.20XX ab und KEINE Buchungen werden angezeigt
+ # Lösung: date_trunc rausgeworfen und nicht mehr auf itime geprüft, sondern auf die erste Buchung
+ # in transdate jan 11.04.2011
- my $closedto_sql = "COALESCE((SELECT closedto FROM defaults),(SELECT itime FROM defaults))";
+ my $closedto_sql = "COALESCE((SELECT closedto FROM defaults),
+ (SELECT transdate from acc_trans order by transdate limit 1))";
if ($form->{method} eq "cash") { # EÜR
$acc_cash_where = qq| AND (a.trans_id IN (SELECT id FROM ar WHERE datepaid>= $closedto_sql
UNION SELECT id FROM gl WHERE transdate>= $closedto_sql
)) |;
} else { # Bilanzierung
- $acc_cash_where = " AND ((select date_trunc('year', a.transdate::date)) >= $closedto_sql) ";
+ $acc_cash_where = " AND (a.transdate >= $closedto_sql) ";
}
my $query =
$amount{ $ref->{accno} } = $ref->{amount};
}
- my $where = "AND c.id = $chart_id" if ($chart_id ne '');
+ my $where = $chart_id ne '' ? "AND c.id = $chart_id" : '';
$query = qq{
SELECT
LEFT JOIN tax tx ON (tk.tax_id = tx.id)
WHERE 1=1
$where
- GROUP BY c.accno, c.id, c.description, c.charttype, c.gifi_accno,
+ GROUP BY c.accno, c.id, c.description, c.charttype,
c.category, c.link, c.pos_bwa, c.pos_bilanz, c.pos_eur, c.valid_from,
c.datevautomatik
ORDER BY c.accno
$project = qq| AND ac.project_id = ? |;
@project_values = (conv_i($form->{project_id}));
}
- my $acc_cash_where = "";
- my $ar_cash_where = "";
- my $ap_cash_where = "";
-
-
- if ($form->{method} eq "cash") {
- $where = qq| (ac.trans_id IN (SELECT id FROM ar WHERE datepaid>= ? AND datepaid<= ? UNION SELECT id FROM ap WHERE datepaid>= ? AND datepaid<= ? UNION SELECT id FROM gl WHERE transdate>= ? AND transdate<= ?)) |;
- @where_values = ();
- push(@where_values, conv_date($form->{fromdate}));
- push(@where_values, conv_date($form->{todate}));
- push(@where_values, conv_date($form->{fromdate}));
- push(@where_values, conv_date($form->{todate}));
- push(@where_values, conv_date($form->{fromdate}));
- push(@where_values, conv_date($form->{todate}));
- }
-
if ($form->{accno}) {