X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fview%2Fview_receipt.php;h=a96f2f7b1ca7870b81a5658395efe0415ec38834;hb=fc24ee893402902fc58632dabb5d7c2594e191d0;hp=94e4d4f93331ecf3f3f76524df57097cdf8c7152;hpb=da8311619dd73feae101d246a1957b972e00cbd2;p=fa-stable.git

diff --git a/sales/view/view_receipt.php b/sales/view/view_receipt.php
index 94e4d4f9..a96f2f7b 100644
--- a/sales/view/view_receipt.php
+++ b/sales/view/view_receipt.php
@@ -1,50 +1,64 @@
 <?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");
 
-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(_($help_context = "View Customer Payment"), true, false, "", $js);
+
 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(_("Customer Payment") . " #$trans_id");
+display_heading(sprintf(_("Customer Payment #%d"),$trans_id));
 
 echo "<br>";
-start_table("$table_style width=80%");
+start_table(TABLESTYLE, "width='80%'");
 start_row();
 label_cells(_("From Customer"), $receipt['DebtorName'], "class='tableheader2'");
-label_cells(_("Into Bank Account"), $receipt['bank_account_name'], "class='tableheader2'");
+label_cells(_("Reference"), $receipt['reference'], "class='tableheader2'");
 label_cells(_("Date of Deposit"), sql2date($receipt['tran_date']), "class='tableheader2'");
 end_row();
 start_row();
-label_cells(_("Payment Currency"), $receipt['curr_code'], "class='tableheader2'");
-label_cells(_("Amount"), number_format2(-$receipt['ov_amount'], user_price_dec()), "class='tableheader2'");
-label_cells(_("Discount"), number_format2(-$receipt['ov_discount'], user_price_dec()), "class='tableheader2'");
+label_cells(_("Customer Currency"), $receipt['curr_code'], "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(_("Reference"), $receipt['reference'], "class='tableheader2'", "colspan=4");
+label_cells(_("Into Bank Account"), $receipt['bank_account_name'].' ['.$receipt['bank_curr_code'].']', "class='tableheader2'");
+label_cells(_("Bank Amount"), price_format($receipt['bank_amount']), "class='tableheader2'");
+label_cells(_("Payment Type"), $bank_transfer_types[$receipt['BankTransType']], "class='tableheader2'");
 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);
+end_page(true, false, false, ST_CUSTPAYMENT, $trans_id);
 ?>
\ No newline at end of file