projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
tax_id in acc_trans
[kivitendo-erp.git]
/
SL
/
GL.pm
diff --git
a/SL/GL.pm
b/SL/GL.pm
index
c9fcd9c
..
80c5fda
100644
(file)
--- a/
SL/GL.pm
+++ b/
SL/GL.pm
@@
-159,11
+159,11
@@
sub post_transaction {
if ($amount != 0) {
$query =
qq|INSERT INTO acc_trans (trans_id, chart_id, amount, transdate,
if ($amount != 0) {
$query =
qq|INSERT INTO acc_trans (trans_id, chart_id, amount, transdate,
- source, memo, project_id, taxkey, ob_transaction, cb_transaction)
+ source, memo, project_id, taxkey, ob_transaction, cb_transaction
, tax_id
)
VALUES (?, (SELECT id FROM chart WHERE accno = ?),
VALUES (?, (SELECT id FROM chart WHERE accno = ?),
- ?, ?, ?, ?, ?, ?, ?, ?)|;
+ ?, ?, ?, ?, ?, ?, ?, ?
, ?
)|;
@values = (conv_i($form->{id}), $accno, $amount, conv_date($form->{transdate}),
@values = (conv_i($form->{id}), $accno, $amount, conv_date($form->{transdate}),
- $form->{"source_$i"}, $form->{"memo_$i"}, $project_id, $taxkey, $form->{ob_transaction} ? 't' : 'f', $form->{cb_transaction} ? 't' : 'f');
+ $form->{"source_$i"}, $form->{"memo_$i"}, $project_id, $taxkey, $form->{ob_transaction} ? 't' : 'f', $form->{cb_transaction} ? 't' : 'f'
, conv_i($form->{"tax_id_$i"})
);
do_query($form, $dbh, $query, @values);
}
do_query($form, $dbh, $query, @values);
}
@@
-171,12
+171,12
@@
sub post_transaction {
# add taxentry
$query =
qq|INSERT INTO acc_trans (trans_id, chart_id, amount, transdate,
# add taxentry
$query =
qq|INSERT INTO acc_trans (trans_id, chart_id, amount, transdate,
- source, memo, project_id, taxkey)
+ source, memo, project_id, taxkey
, tax_id
)
VALUES (?, (SELECT chart_id FROM tax WHERE id = ?),
VALUES (?, (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"},
@values = (conv_i($form->{id}), conv_i($form->{"tax_id_$i"}),
$tax, conv_date($form->{transdate}), $form->{"source_$i"},
- $form->{"memo_$i"}, $project_id, $taxkey);
+ $form->{"memo_$i"}, $project_id, $taxkey
, conv_i($form->{"tax_id_$i"})
);
do_query($form, $dbh, $query, @values);
}
}
do_query($form, $dbh, $query, @values);
}
}