X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FCA.pm;h=ef6e9c373b5ce32533dd0e64c808823f29ca49a7;hb=0767bd031c06f034571510701433e64f2241a2ed;hp=e24be69c3c68d7964459deb8c5f542933c3359c8;hpb=49556f01cfe6a395cf5554e1a00dc61d6da0493e;p=kivitendo-erp.git diff --git a/SL/CA.pm b/SL/CA.pm index e24be69c3..ef6e9c373 100644 --- a/SL/CA.pm +++ b/SL/CA.pm @@ -182,13 +182,6 @@ sub all_transactions { 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); @@ -272,7 +265,7 @@ sub all_transactions { # 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 .