X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=purchasing%2Fview%2Fview_supp_payment.php;h=43877659b2da32bed88c6819c186b61deee89fd1;hb=0d191c7bff92b9a9bbc44dab48855477edb99ebf;hp=554b34455acb8150c6e4c7a7cb41b8e1934e13c3;hpb=d542ce4a94415648f7993f219963d683c372210a;p=fa-stable.git
diff --git a/purchasing/view/view_supp_payment.php b/purchasing/view/view_supp_payment.php
index 554b3445..43877659 100644
--- a/purchasing/view/view_supp_payment.php
+++ b/purchasing/view/view_supp_payment.php
@@ -19,7 +19,7 @@ include_once($path_to_root . "/purchasing/includes/purchasing_db.inc");
$js = "";
if ($use_popup_windows)
$js .= get_js_open_window(900, 500);
-page(_("View Payment to Supplier"), true, false, "", $js);
+page(_($help_context = "View Payment to Supplier"), true, false, "", $js);
if (isset($_GET["trans_no"]))
{
@@ -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;
@@ -47,7 +47,7 @@ echo "
";
display_heading(_("Payment to Supplier") . " #$trans_no");
echo "
";
-start_table("$table_style2 width=80%");
+start_table(TABLESTYLE2, "width=80%");
start_row();
label_cells(_("To Supplier"), $receipt['supplier_name'], "class='tableheader2'");
@@ -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);
@@ -81,5 +90,4 @@ if (!$voided)
display_allocations_from(PT_SUPPLIER, $receipt['supplier_id'], ST_SUPPAYMENT, $trans_no, -$receipt['Total']);
}
-end_page(true);
-?>
\ No newline at end of file
+end_page(true, false, false, ST_SUPPAYMENT, $trans_no);