X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fcredit_note_entry.php;h=89a1cf05361d501dce5721001bb9437ef3f2dac1;hb=13aa48ccc9265df336a1805d2e4709365f19c956;hp=5b2af3b2e63b388152d7ea34859f7d3d37e1ced4;hpb=5af53b13622ca77bc851cccaa087d7e2aedc3401;p=fa-stable.git

diff --git a/sales/credit_note_entry.php b/sales/credit_note_entry.php
index 5b2af3b2..89a1cf05 100644
--- a/sales/credit_note_entry.php
+++ b/sales/credit_note_entry.php
@@ -10,6 +10,7 @@ include_once($path_to_root . "/includes/session.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/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");
 
@@ -39,6 +40,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'];
@@ -54,6 +67,13 @@ if (isset($_GET['AddedID'])) {
 
 	display_footer_exit();
 }
+//--------------------------------------------------------------------------------
+
+function line_start_focus() {
+  global $Ajax;
+  $Ajax->activate('items_table');
+  set_focus('_stock_id_edit');
+}
 
 //-----------------------------------------------------------------------------
 
@@ -102,17 +122,21 @@ function can_process()
 	if($_SESSION['Items']->trans_no == 0) {
 	    if (!references::is_valid($_POST['ref'])) {
 		display_error( _("You must enter a reference."));
+		set_focus('ref');
 		$input_error = 1;
 	    } elseif (!is_new_reference($_POST['ref'], 11))	{
 		display_error( _("The entered reference is already in use."));
+		set_focus('ref');
 		$input_error = 1;
-	    } 
+	    }
 	}
 	if (!is_date($_POST['OrderDate'])) {
 		display_error(_("The entered date for the credit note is invalid."));
+		set_focus('OrderDate');
 		$input_error = 1;
 	} elseif (!is_date_in_fiscalyear($_POST['OrderDate'])) {
 		display_error(_("The entered date is not in fiscal year."));
+		set_focus('OrderDate');
 		$input_error = 1;
 	}
 	return ($input_error == 0);
@@ -126,6 +150,7 @@ if (isset($_POST['ProcessCredit']) && can_process()) {
 		display_note(_("For credit notes created to write off the stock, a general ledger account is required to be selected."), 1, 0);
 		display_note(_("Please select an account to write the cost of the stock off to, then click on Process again."), 1, 0);
 		exit;
+		
 	}
 	if (!isset($_POST['WriteOffGLCode'])) {
 		$_POST['WriteOffGLCode'] = 0;
@@ -142,14 +167,17 @@ function check_item_data()
 {
 	if (!check_num('qty',0)) {
 		display_error(_("The quantity must be greater than zero."));
+		set_focus('qty');
 		return false;
 	}
 	if (!check_num('price',0)) {
 		display_error(_("The entered price is negative or invalid."));
+		set_focus('price');
 		return false;
 	}
 	if (!check_num('Disc', 0, 100)) {
 		display_error(_("The entered discount percent is negative, greater than 100 or invalid."));
+		set_focus('Disc');
 		return false;
 	}
 	return true;
@@ -163,7 +191,7 @@ function handle_update_item()
 		$_SESSION['Items']->update_cart_item($_POST['line_no'], input_num('qty'),
 			input_num('price'), input_num('Disc') / 100);
 	}
-    set_focus('StockID2');
+    line_start_focus();
 }
 
 //-----------------------------------------------------------------------------
@@ -171,7 +199,7 @@ function handle_update_item()
 function handle_delete_item($line_no)
 {
 	$_SESSION['Items']->remove_from_cart($line_no);
-    set_focus('StockID2');
+    line_start_focus();
 }
 
 //-----------------------------------------------------------------------------
@@ -184,34 +212,26 @@ function handle_new_item()
 
 	add_to_order($_SESSION['Items'], $_POST['stock_id'], input_num('qty'),
 		input_num('price'), input_num('Disc') / 100);
-    set_focus('StockID2');
+    line_start_focus();
 }
 //-----------------------------------------------------------------------------
 $id = find_submit('Delete');
 if ($id!=-1)
 	handle_delete_item($id);
 
-if (isset($_POST['AddItem']) || isset($_POST['UpdateItem']))
-	copy_to_cn();
-
 if (isset($_POST['AddItem']))
 	handle_new_item();
 
 if (isset($_POST['UpdateItem']))
 	handle_update_item();
 
-if (isset($_POST['CancelItemChanges']) || isset($_POST['UpdateItem']))
-	set_focus('StockID2');
+if (isset($_POST['CancelItemChanges']))
+	line_start_focus();
 
 //-----------------------------------------------------------------------------
 
 if (!processing_active()) {
 	handle_new_credit();
-} else {
-	if (!isset($_POST['customer_id']))
-		$_POST['customer_id'] = $_SESSION['Items']->customer_id;
-	if (!isset($_POST['branch_id']))
-		$_POST['branch_id'] = $_SESSION['Items']->Branch;
 }
 
 //-----------------------------------------------------------------------------
@@ -234,7 +254,7 @@ if ($customer_error == "") {
 echo "<br><center><table><tr>";
 submit_cells('Update', _("Update"));
 submit_cells('ProcessCredit', _("Process Credit Note"));
-echo "</tr></table>";
+echo "</tr></table></center>";
 
 end_form();
 end_page();