summaryrefslogtreecommitdiff
path: root/bin/oe.pl
diff options
context:
space:
mode:
Diffstat (limited to 'bin/oe.pl')
-rwxr-xr-xbin/oe.pl6
1 files changed, 3 insertions, 3 deletions
diff --git a/bin/oe.pl b/bin/oe.pl
index f8080bff..402563be 100755
--- a/bin/oe.pl
+++ b/bin/oe.pl
@@ -682,10 +682,10 @@ qq|<textarea name=intnotes rows=$rows cols=35 wrap=soft>$form->{intnotes}</texta
if ( !$form->{taxincluded} ) {
my @taxes = Tax::init_taxes( $form, $form->{taxaccounts} );
- $form->{invtotal} +=
- Tax::calculate_taxes( \@taxes, $form, $form->{invsubtotal}, 0 );
foreach my $item (@taxes) {
my $taccno = $item->account;
+ $form->{invtotal} += $form->round_amount(
+ $form->{"${taccno}_rate"} * $form->{"${taccno}_base"}, 2);
$form->{"${taccno}_total"} =
$form->format_amount( \%myconfig,
$form->{"${taccno}_rate"} * $form->{"${taccno}_base"}, 2 );
@@ -695,7 +695,7 @@ qq|<textarea name=intnotes rows=$rows cols=35 wrap=soft>$form->{intnotes}</texta
<th align=right>$form->{"${taccno}_description"}</th>
<td align=right>$form->{"${taccno}_total"}</td>
</tr>
- | if $item->value;
+ | if $form->{"${taccno}_base"};
}
$form->{invsubtotal} =