X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/blobdiff_plain/e82db1a7b5f8cfce019012e60a689c9142851a63..ff6cd9b714ffff6797df2c68e4dfeebcd1b86d08:/SL/GL.pm diff --git a/SL/GL.pm b/SL/GL.pm index a42287735..e6c87b314 100644 --- a/SL/GL.pm +++ b/SL/GL.pm @@ -171,10 +171,10 @@ sub post_transaction { qq|INSERT INTO acc_trans (trans_id, chart_id, amount, transdate, source, memo, project_id, taxkey, tax_id, chart_link) VALUES (?, (SELECT chart_id FROM tax WHERE id = ?), - ?, ?, ?, ?, ?, ?, ?, (SELECT link - FROM chart - WHERE id = (SELECT chart_id - FROM tax + ?, ?, ?, ?, ?, ?, ?, (SELECT link + FROM chart + WHERE id = (SELECT chart_id + FROM tax WHERE id = ?)))|; @values = (conv_i($form->{id}), conv_i($form->{"tax_id_$i"}), $tax, conv_date($form->{transdate}), $form->{"source_$i"}, @@ -198,6 +198,7 @@ sub post_transaction { dbh => $dbh, from => $transdate, to => $transdate, + trans_id => $form->{id}, ); $datev->export; @@ -353,8 +354,6 @@ sub all_transactions { } } - my $false = ($myconfig->{dbdriver} eq 'Pg') ? "FALSE" : q|'0'|; - my %sort_columns = ( 'id' => [ qw(id) ], 'transdate' => [ qw(transdate id) ], @@ -384,7 +383,7 @@ sub all_transactions { $query = qq|SELECT - ac.acc_trans_id, g.id, 'gl' AS type, $false AS invoice, g.reference, ac.taxkey, c.link, + ac.acc_trans_id, g.id, 'gl' AS type, FALSE AS invoice, g.reference, ac.taxkey, c.link, g.description, ac.transdate, ac.gldate, ac.source, ac.trans_id, ac.amount, c.accno, g.notes, t.chart_id, CASE WHEN (COALESCE(e.name, '') = '') THEN e.login ELSE e.name END AS employee