X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=purchasing%2Fview%2Fview_supp_payment.php;h=a23e8d713574a4a90b726305bf3f0fb1a98ae5b0;hb=d859c6081f650d22eba97b13a298b681148d0d6d;hp=f37d0a776aed1ec699040dd5b95d5475ef804716;hpb=46c5f7a65a7659a44ae8254c63152074363d3987;p=fa-stable.git

diff --git a/purchasing/view/view_supp_payment.php b/purchasing/view/view_supp_payment.php
index f37d0a77..a23e8d71 100644
--- a/purchasing/view/view_supp_payment.php
+++ b/purchasing/view/view_supp_payment.php
@@ -33,10 +33,10 @@ $company_currency = get_company_currency();
 $show_currencies = false;
 $show_both_amounts = false;
 
-if (($receipt['bank_curr_code'] != $company_currency) || ($receipt['SupplierCurrCode'] != $company_currency))
+if (($receipt['bank_curr_code'] != $company_currency) || ($receipt['curr_code'] != $company_currency))
 	$show_currencies = true;
 
-if ($receipt['bank_curr_code'] != $receipt['SupplierCurrCode']) 
+if ($receipt['bank_curr_code'] != $receipt['curr_code']) 
 {
 	$show_currencies = true;
 	$show_both_amounts = true;
@@ -57,18 +57,27 @@ end_row();
 start_row();
 if ($show_currencies)
 	label_cells(_("Payment Currency"), $receipt['bank_curr_code'], "class='tableheader2'");
-label_cells(_("Amount"), number_format2(-$receipt['BankAmount'], user_price_dec()), "class='tableheader2'");
-label_cells(_("Payment Type"), $bank_transfer_types[$receipt['BankTransType']], "class='tableheader2'");
+label_cells(_("Amount"), number_format2(-$receipt['bank_amount'], user_price_dec()), "class='tableheader2'");
+if ($receipt['ov_discount'] != 0)
+	label_cells(_("Discount"), number_format2(-$receipt['ov_discount']*$receipt['rate'], user_price_dec()), "class='tableheader2'");
+else
+	label_cells(_("Payment Type"), $bank_transfer_types[$receipt['BankTransType']], "class='tableheader2'");
 end_row();
 start_row();
 if ($show_currencies) 
 {
-	label_cells(_("Supplier's Currency"), $receipt['SupplierCurrCode'], "class='tableheader2'");
+	label_cells(_("Supplier's Currency"), $receipt['curr_code'], "class='tableheader2'");
 }
 if ($show_both_amounts)
 	label_cells(_("Amount"), number_format2(-$receipt['Total'], user_price_dec()), "class='tableheader2'");
 label_cells(_("Reference"), $receipt['ref'], "class='tableheader2'");
 end_row();
+if ($receipt['ov_discount'] != 0)
+{
+	start_row();
+	label_cells(_("Payment Type"), $bank_transfer_types[$receipt['BankTransType']], "class='tableheader2'");
+	end_row();
+}
 comments_display_row(ST_SUPPAYMENT, $trans_no);
 
 end_table(1);