Fixed warning displayed before 2.2 db upgrade.

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

diff --git a/sales/view/view_receipt.php b/sales/view/view_receipt.php
index 1f1fbd50c04677c2b3d6b174a8741b65f82f6329..458e9071d9f460d93653c944c888e4dadda73cfd 100644 (file)
--- a/sales/view/view_receipt.php
+++ b/sales/view/view_receipt.php
@@ -1,15 +1,28 @@
 <?php
-
+/**********************************************************************
+    Copyright (C) FrontAccounting, LLC.
+       Released under the terms of the GNU General Public License, GPL, 
+       as published by the Free Software Foundation, either version 3 
+       of the License, or (at your option) any later version.
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
+    See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
+***********************************************************************/
 $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"];
@@ -28,11 +41,12 @@ 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();
-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);