Merged all main trunk bugfixes up to release 2.0.5

[fa-stable.git] / sales / view / view_receipt.php

diff --git a/sales/view/view_receipt.php b/sales/view/view_receipt.php
index 1f1fbd50c04677c2b3d6b174a8741b65f82f6329..51e79dc7850063c2515898412b7dbcbdb376ebc2 100644 (file)
--- a/sales/view/view_receipt.php
+++ b/sales/view/view_receipt.php
@@ -4,12 +4,16 @@ $page_security = 1;
 $path_to_root="../..";
 include_once($path_to_root . "/includes/session.inc");
 
-page(_("View Customer Payment"), true);
-
 include_once($path_to_root . "/includes/date_functions.inc");
 include_once($path_to_root . "/includes/ui.inc");
 include_once($path_to_root . "/sales/includes/sales_db.inc");
 
+$js = "";
+if ($use_popup_windows)
+       $js .= get_js_open_window(900, 600);
+
+page(_("View Customer Payment"), true, false, "", $js);
+
 if (isset($_GET["trans_no"]))
 {
        $trans_id = $_GET["trans_no"];
@@ -32,7 +36,8 @@ label_cells(_("Amount"), price_format($receipt['ov_amount']), "class='tableheade
 label_cells(_("Discount"), price_format($receipt['ov_discount']), "class='tableheader2'");
 end_row();
 start_row();
-label_cells(_("Payment Type"), $receipt['BankTransType'], "class='tableheader2'");
+label_cells(_("Payment Type"), 
+       bank_account_types::transfer_type($receipt['BankTransType']), "class='tableheader2'");
 label_cells(_("Reference"), $receipt['reference'], "class='tableheader2'", "colspan=4");
 end_row();
 comments_display_row(systypes::cust_payment(), $trans_id);