From 5584ee75c52beab54a4f2bf72069e2fbdeb7214d Mon Sep 17 00:00:00 2001 From: Joe Hunt Date: Mon, 25 Jan 2010 16:13:00 +0000 Subject: [PATCH] Rerun --- CHANGELOG.txt | 2 +- purchasing/supplier_payment.php | 2 +- sales/customer_payments.php | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 5974387a..7cdf1f57 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -20,7 +20,7 @@ Legend: $ -> Affected files 25-Jan-2010 Joe Hunt -# Bug not deleting refs record when deleting Sales Order, Quotation +# {0000195] Bug not deleting refs record when deleting Sales Order, Quotation # A couple of redirecting bugs $ /sales/sales_order_entry.php /sales/includes/db/sales_order_db.inc diff --git a/purchasing/supplier_payment.php b/purchasing/supplier_payment.php index 0c8aa7dd..e0aa2d08 100644 --- a/purchasing/supplier_payment.php +++ b/purchasing/supplier_payment.php @@ -73,7 +73,7 @@ if (isset($_GET['AddedID'])) submenu_print(_("&Print This Remittance"), ST_SUPPAYMENT, $payment_id."-".ST_SUPPAYMENT, 'prtopt'); submenu_print(_("&Email This Remittance"), ST_SUPPAYMENT, $payment_id."-".ST_SUPPAYMENT, null, 1); - display_note(get_gl_view_str(22, $payment_id, _("View the GL &Journal Entries for this Payment"))); + display_note(get_gl_view_str(ST_SUPPAYMENT, $payment_id, _("View the GL &Journal Entries for this Payment"))); // hyperlink_params($path_to_root . "/purchasing/allocations/supplier_allocate.php", _("&Allocate this Payment"), "trans_no=$payment_id&trans_type=22"); diff --git a/sales/customer_payments.php b/sales/customer_payments.php index 20f9d3ab..7300450e 100644 --- a/sales/customer_payments.php +++ b/sales/customer_payments.php @@ -19,6 +19,7 @@ include_once($path_to_root . "/includes/banking.inc"); include_once($path_to_root . "/includes/data_checks.inc"); include_once($path_to_root . "/sales/includes/sales_db.inc"); //include_once($path_to_root . "/sales/includes/ui/cust_alloc_ui.inc"); +include_once($path_to_root . "/reporting/includes/reporting.inc"); $js = ""; if ($use_popup_windows) { @@ -67,9 +68,8 @@ if (isset($_GET['AddedID'])) { // hyperlink_params($path_to_root . "/sales/allocations/customer_allocate.php", _("&Allocate this Customer Payment"), "trans_no=$payment_no&trans_type=12"); hyperlink_no_params($path_to_root . "/sales/customer_payments.php", _("Enter Another &Customer Payment")); - br(1); - end_page(); - exit; + + display_footer_exit(); } //---------------------------------------------------------------------------------------------- -- 2.30.2