Merged changes from main trunk up to version_2_1_4

[fa-stable.git] / purchasing / view / view_supp_payment.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);