X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=sales%2Fcredit_note_entry.php;h=e64bc8cd1b2e70d73a139f08149695d9d403ba7b;hb=813a5c558638f7937da410b969a7935dd0de7342;hp=9a73d7c25c8c71ad715280e9030a1924c23bfa32;hpb=e8623dd6746abb8eec4eb3ddd583d208e531b8e7;p=fa-stable.git

diff --git a/sales/credit_note_entry.php b/sales/credit_note_entry.php
index 9a73d7c2..e64bc8cd 100644
--- a/sales/credit_note_entry.php
+++ b/sales/credit_note_entry.php
@@ -13,6 +13,7 @@ include_once($path_to_root . "/sales/includes/sales_ui.inc");
 include_once($path_to_root . "/sales/includes/db/sales_types_db.inc");
 include_once($path_to_root . "/sales/includes/ui/sales_credit_ui.inc");
 include_once($path_to_root . "/sales/includes/ui/sales_order_ui.inc");
+include_once($path_to_root . "/reporting/includes/reporting.inc");
 
 $js = "";
 if ($use_popup_windows) {
@@ -40,6 +41,18 @@ check_db_has_stock_items(_("There are no items defined in the system."));
 check_db_has_customer_branches(_("There are no customers, or there are no customers with branches. Please define customers and customer branches."));
 
 //-----------------------------------------------------------------------------
+if ($ret = context_restore()) {
+ // return from new customer add
+	copy_from_cn();
+	if(isset($ret['customer_id']))
+		$_POST['customer_id'] = $ret['customer_id'];
+	if(isset($ret['branch_id']))
+		$_POST['branch_id'] = $ret['branch_id'];
+}
+if (isset($_POST['_customer_id_editor'])) {
+	copy_to_cn(); //store context
+	context_call($path_to_root.'/sales/manage/customers.php?debtor_no='.$_POST['customer_id'], 'Items');
+}
 
 if (isset($_GET['AddedID'])) {
 	$credit_no = $_GET['AddedID'];
@@ -47,11 +60,13 @@ if (isset($_GET['AddedID'])) {
 
 	display_notification_centered(sprintf(_("Credit Note # %d has been processed"),$credit_no));
 
-	display_note(get_customer_trans_view_str($trans_type, $credit_no, _("View this credit note")), 0, 1);
+	display_note(get_customer_trans_view_str($trans_type, $credit_no, _("&View this credit note")), 0, 1);
 
-	display_note(get_gl_view_str($trans_type, $credit_no, _("View the GL Journal Entries for this Credit Note")));
+	display_note(print_document_link($credit_no, _("&Print This Credit Invoice"), true, 11),0, 1);
 
-	hyperlink_params($_SERVER['PHP_SELF'], _("Enter Another Credit Note"), "NewCredit=yes");
+	display_note(get_gl_view_str($trans_type, $credit_no, _("View the GL &Journal Entries for this Credit Note")));
+
+	hyperlink_params($_SERVER['PHP_SELF'], _("Enter Another &Credit Note"), "NewCredit=yes");
 
 	display_footer_exit();
 }
@@ -74,6 +89,8 @@ function copy_to_cn()
 	$_SESSION['Items']->sales_type = $_POST['sales_type_id'];
 	$_SESSION['Items']->reference = $_POST['ref'];
 	$_SESSION['Items']->ship_via = $_POST['ShipperID'];
+	$_SESSION['Items']->dimension_id = $_POST['dimension_id'];
+	$_SESSION['Items']->dimension2_id = $_POST['dimension2_id'];
 }
 
 //-----------------------------------------------------------------------------
@@ -87,6 +104,8 @@ function copy_from_cn()
 	$_POST['sales_type_id'] = $_SESSION['Items']->sales_type;
 	$_POST['ref'] = $_SESSION['Items']->reference;
 	$_POST['ShipperID'] = $_SESSION['Items']->ship_via;
+	$_POST['dimension_id'] = $_SESSION['Items']->dimension_id;
+	$_POST['dimension2_id'] = $_SESSION['Items']->dimension2_id;
 }
 
 //-----------------------------------------------------------------------------
@@ -96,7 +115,6 @@ function handle_new_credit($trans_no)
 	processing_start();
 	$_SESSION['Items'] = new Cart(11,$trans_no);
 	copy_from_cn();
-    line_start_focus();
 }
 
 //-----------------------------------------------------------------------------
@@ -134,6 +152,7 @@ function can_process()
 //-----------------------------------------------------------------------------
 
 if (isset($_POST['ProcessCredit']) && can_process()) {
+	copy_to_cn();
 	if ($_POST['CreditType'] == "WriteOff" && (!isset($_POST['WriteOffGLCode']) ||
 		$_POST['WriteOffGLCode'] == '')) {
 		display_note(_("For credit notes created to write off the stock, a general ledger account is required to be selected."), 1, 0);