diff options
author | einhverfr <einhverfr@4979c152-3d1c-0410-bac9-87ea11338e46> | 2007-04-09 20:37:21 +0000 |
---|---|---|
committer | einhverfr <einhverfr@4979c152-3d1c-0410-bac9-87ea11338e46> | 2007-04-09 20:37:21 +0000 |
commit | 9717f09801fa4c963f338a97123b2fbbe9260f02 (patch) | |
tree | ba92c16e1f40e73f0900c60e58c32eca9c00e02f /bin/is.pl | |
parent | d3f27376d7ec8e8c157021189787dd1dff302479 (diff) |
All sales tax bugs fixed
git-svn-id: https://ledger-smb.svn.sourceforge.net/svnroot/ledger-smb/branches/1.2@1045 4979c152-3d1c-0410-bac9-87ea11338e46
Diffstat (limited to 'bin/is.pl')
-rwxr-xr-x | bin/is.pl | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -470,14 +470,13 @@ sub form_footer { } if (!$form->{taxincluded}) { - my @taxes = Tax::init_taxes($form, $form->{taxaccounts}); $form->{invtotal} += Tax::calculate_taxes(\@taxes, $form, $form->{invsubtotal}, 0); foreach $item (@taxes) { my $taccno = $item->account; $form->{"${taccno}_total"} = $form->format_amount(\%myconfig, - $item->value, 2); + $form->{"${taccno}_rate"} * $form->{"${taccno}_base"}, 2); $tax .= qq| <tr> <th align=right>$form->{"${taccno}_description"}</th> @@ -818,7 +817,8 @@ sub update { for (split / /, $form->{taxaccounts}) { $form->{"${_}_base"} = 0 } for (split / /, $form->{"taxaccounts_$i"}) { $form->{"${_}_base"} += $amount } if (!$form->{taxincluded}) { - my @taxes = Tax::init_taxes($form, $form->{"taxaccounts_$i"}); + my @taxes = Tax::init_taxes($form, $form->{"taxaccounts_$i"}, + $form->{taxaccounts}); $amount += Tax::calculate_taxes(\@taxes, $form, $amount, 0); } |