summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Changelog4
-rwxr-xr-xbin/oe.pl3
2 files changed, 6 insertions, 1 deletions
diff --git a/Changelog b/Changelog
index 739e9644..f369b98e 100644
--- a/Changelog
+++ b/Changelog
@@ -1,3 +1,7 @@
+Changelog for 1.2.2
+* Corrected sales tax display bug in order entry screen
+
+
Changelog for LedgerSMB 1.2.1
* Modifed AM.pm to correctly use globals from ledgersmb.conf (Joshua Drake)
* Simplified backup functions in AM.pm (Joshua Drake)
diff --git a/bin/oe.pl b/bin/oe.pl
index 320a7fa8..3312e2b6 100755
--- a/bin/oe.pl
+++ b/bin/oe.pl
@@ -608,7 +608,8 @@ sub form_footer {
foreach my $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>