$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
my $sortorder = join ', ',
$form->sort_columns(qw(transdate reference description));
- my $false = ($myconfig->{dbdriver} eq 'Pg') ? "FALSE" : q|'0'|;
-
- # Oracle workaround, use ordinal positions
- my %ordinal = (transdate => 4,
- reference => 2,
- description => 3);
- map { $sortorder =~ s/$_/$ordinal{$_}/ } keys %ordinal;
my ($null, $department_id) = split(/--/, $form->{department});
my ($dpt_where, $dpt_join, @department_values);
$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}) {
# get all transactions
$query =
qq|SELECT a.id, a.reference, a.description, ac.transdate, ac.chart_id, | .
- qq| $false AS invoice, ac.amount, 'gl' as module, | .
+ qq| FALSE AS invoice, ac.amount, 'gl' as module, | .
qq§(SELECT accno||'--'||rate FROM tax LEFT JOIN chart ON (tax.chart_id=chart.id) WHERE tax.id = (SELECT tax_id FROM taxkeys WHERE taxkey_id = ac.taxkey AND taxkeys.startdate <= ac.transdate ORDER BY taxkeys.startdate DESC LIMIT 1)) AS taxinfo, ac.source || ' ' || ac.memo AS memo § .
qq|FROM acc_trans ac, gl a | .
$dpt_join .