projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Verwendete Lizenz eindeutig bennennen.
[kivitendo-erp.git]
/
SL
/
AR.pm
diff --git
a/SL/AR.pm
b/SL/AR.pm
index
fe687ee
..
b4c0ae1
100644
(file)
--- a/
SL/AR.pm
+++ b/
SL/AR.pm
@@
-91,13
+91,16
@@
sub post_transaction {
$form->{taxincluded} = 0 if ($form->{amount} == 0);
for $i (1 .. $form->{rowcount}) {
$form->{taxincluded} = 0 if ($form->{amount} == 0);
for $i (1 .. $form->{rowcount}) {
- ($form->{"taxkey_$i"}, $NULL) = split /--/, $form->{"taxchart_$i"};
+ ($form->{"tax_id_$i"}, $NULL) = split /--/, $form->{"taxchart_$i"};
+
+ $query = qq|SELECT c.accno, t.taxkey, t.rate
+ FROM tax t LEFT JOIN chart c on (c.id=t.chart_id)
+ WHERE t.id=$form->{"tax_id_$i"}
+ ORDER BY c.accno|;
- $query =
- qq| SELECT c.accno, t.rate FROM chart c, tax t where c.id=t.chart_id AND t.taxkey=$form->{"taxkey_$i"}|;
$sth = $dbh->prepare($query);
$sth->execute || $form->dberror($query);
$sth = $dbh->prepare($query);
$sth->execute || $form->dberror($query);
- ($form->{AR_amounts}{"tax_$i"}, $form->{"taxrate_$i"}) =
+ ($form->{AR_amounts}{"tax_$i"}, $form->{"tax
key_$i"}, $form->{"tax
rate_$i"}) =
$sth->fetchrow_array;
$form->{AR_amounts}{"tax_$i"}{taxkey} = $form->{"taxkey_$i"};
$form->{AR_amounts}{"amount_$i"}{taxkey} = $form->{"taxkey_$i"};
$sth->fetchrow_array;
$form->{AR_amounts}{"tax_$i"}{taxkey} = $form->{"taxkey_$i"};
$form->{AR_amounts}{"amount_$i"}{taxkey} = $form->{"taxkey_$i"};