X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fview%2Fview_receipt.php;h=b2dd53ba14ce92e2c39c32ccbf191a70614cd945;hb=c99c4da3f3a009e48b536dc1cc5268d566dfc6cb;hp=51e79dc7850063c2515898412b7dbcbdb376ebc2;hpb=bf00f0e16df5974ecba17b59be8bc660bdf6b8a8;p=fa-stable.git

diff --git a/sales/view/view_receipt.php b/sales/view/view_receipt.php
index 51e79dc7..b2dd53ba 100644
--- a/sales/view/view_receipt.php
+++ b/sales/view/view_receipt.php
@@ -1,7 +1,16 @@
 <?php
-
-$page_security = 1;
-$path_to_root="../..";
+/**********************************************************************
+    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 = 'SA_SALESTRANSVIEW';
+$path_to_root = "../..";
 include_once($path_to_root . "/includes/session.inc");
 
 include_once($path_to_root . "/includes/date_functions.inc");
@@ -19,7 +28,7 @@ if (isset($_GET["trans_no"]))
 	$trans_id = $_GET["trans_no"];
 }
 
-$receipt = get_customer_trans($trans_id, systypes::cust_payment());
+$receipt = get_customer_trans($trans_id, ST_CUSTPAYMENT);
 
 display_heading(sprintf(_("Customer Payment #%d"),$trans_id));
 
@@ -32,23 +41,23 @@ 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"), 
-	bank_account_types::transfer_type($receipt['BankTransType']), "class='tableheader2'");
+	$bank_transfer_types[$receipt['BankTransType']], "class='tableheader2'");
 label_cells(_("Reference"), $receipt['reference'], "class='tableheader2'", "colspan=4");
 end_row();
-comments_display_row(systypes::cust_payment(), $trans_id);
+comments_display_row(ST_CUSTPAYMENT, $trans_id);
 
 end_table(1);
 
-$voided = is_voided_display(systypes::cust_payment(), $trans_id, _("This customer payment has been voided."));
+$voided = is_voided_display(ST_CUSTPAYMENT, $trans_id, _("This customer payment has been voided."));
 
 if (!$voided)
 {
-	display_allocations_from(payment_person_types::customer(), $receipt['debtor_no'], systypes::cust_payment(), $trans_id, $receipt['Total']);
+	display_allocations_from(PT_CUSTOMER, $receipt['debtor_no'], ST_CUSTPAYMENT, $trans_id, $receipt['Total']);
 }
 
 end_page(true);