Wrong presentation of left to allocate if discount was given

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 4ce7516c144fb1f56857de746cc6e37e2ff7824d..a4218d5fe3a5f28560151d84e987b8384315e84c 100644 (file)
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -19,6 +19,11 @@ Legend:
 ! -> Note
 $ -> Affected files
 
+12-Jul-2009 Joe Hunt
+# Wrong presentation of left to allocate if discount was given
+$ /sales/view/view_receipt.php
+  /purchasing/view/view_supp_payment.php
+  
 11-Jul-2009 Joe Hunt
 ! Improved Inventory Sales Report. Now by Customer and quantities as well.
 $ /reporting/rep304.php

diff --git a/purchasing/view/view_supp_payment.php b/purchasing/view/view_supp_payment.php
index 3b6d75333842a119c9551d7e23525ec4e0c7950b..793f6d417c4c83219a5135991115bd474bbd46ce 100644 (file)
--- a/purchasing/view/view_supp_payment.php
+++ b/purchasing/view/view_supp_payment.php
@@ -66,7 +66,7 @@ if ($show_currencies)
        label_cells(_("Supplier's Currency"), $receipt['SupplierCurrCode'], "class='tableheader2'");
 }
 if ($show_both_amounts)
-       label_cells(_("Amount"), number_format2(-$receipt['ov_amount'], user_price_dec()), "class='tableheader2'");
+       label_cells(_("Amount"), number_format2(-$receipt['Total'], user_price_dec()), "class='tableheader2'");
 label_cells(_("Reference"), $receipt['ref'], "class='tableheader2'");
 end_row();
 comments_display_row(22, $trans_no);
@@ -78,7 +78,7 @@ $voided = is_voided_display(22, $trans_no, _("This payment has been voided."));
 // now display the allocations for this payment
 if (!$voided) 
 {
-       display_allocations_from(payment_person_types::supplier(), $receipt['supplier_id'], 22, $trans_no, -$receipt['ov_amount']);
+       display_allocations_from(payment_person_types::supplier(), $receipt['supplier_id'], 22, $trans_no, -$receipt['Total']);
 }
 
 end_page(true);

diff --git a/sales/view/view_receipt.php b/sales/view/view_receipt.php
index 10dfd0c848b197ac9a97376cb54b2cd6a997e03e..458e9071d9f460d93653c944c888e4dadda73cfd 100644 (file)
--- a/sales/view/view_receipt.php
+++ b/sales/view/view_receipt.php
@@ -41,7 +41,7 @@ label_cells(_("Date of Deposit"), sql2date($receipt['tran_date']), "class='table
 end_row();
 start_row();
 label_cells(_("Payment Currency"), $receipt['curr_code'], "class='tableheader2'");
-label_cells(_("Amount"), price_format($receipt['ov_amount']), "class='tableheader2'");
+label_cells(_("Amount"), price_format($receipt['Total'] - $receipt['ov_discount']), "class='tableheader2'");
 label_cells(_("Discount"), price_format($receipt['ov_discount']), "class='tableheader2'");
 end_row();
 start_row();