X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Fcredit_note_entry.php;h=9a73d7c25c8c71ad715280e9030a1924c23bfa32;hb=3e2a432dd72688dbac39a07716201b2b00c16c8b;hp=5b43a17352f7b6d443c08d2d296064fb001b7093;hpb=0c1bcd8ce3c089d7ddb3722a097f8fc8417f41e6;p=fa-stable.git

diff --git a/sales/credit_note_entry.php b/sales/credit_note_entry.php
index 5b43a173..9a73d7c2 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");
 
@@ -54,6 +55,13 @@ if (isset($_GET['AddedID'])) {
 
 	display_footer_exit();
 }
+//--------------------------------------------------------------------------------
+
+function line_start_focus() {
+  global $Ajax;
+  $Ajax->activate('items_table');
+  set_focus('_stock_id_edit');
+}
 
 //-----------------------------------------------------------------------------
 
@@ -61,9 +69,9 @@ function copy_to_cn()
 {
 	$_SESSION['Items']->Comments = $_POST['CreditText'];
 	$_SESSION['Items']->document_date = $_POST['OrderDate'];
-	$_SESSION['Items']->freight_cost = $_POST['ChargeFreightCost'];
+	$_SESSION['Items']->freight_cost = input_num('ChargeFreightCost');
 	$_SESSION['Items']->Location = $_POST["Location"];
-	$_SESSION['Items']->default_sales_type = $_POST['sales_type_id'];
+	$_SESSION['Items']->sales_type = $_POST['sales_type_id'];
 	$_SESSION['Items']->reference = $_POST['ref'];
 	$_SESSION['Items']->ship_via = $_POST['ShipperID'];
 }
@@ -74,9 +82,9 @@ function copy_from_cn()
 {
 	$_POST['CreditText'] = $_SESSION['Items']->Comments;
 	$_POST['OrderDate'] = $_SESSION['Items']->document_date;
-	$_POST['ChargeFreightCost'] = $_SESSION['Items']->freight_cost;
+	$_POST['ChargeFreightCost'] = price_format($_SESSION['Items']->freight_cost);
 	$_POST['Location'] = $_SESSION['Items']->Location;
-	$_POST['sales_type_id'] = $_SESSION['Items']->default_sales_type;
+	$_POST['sales_type_id'] = $_SESSION['Items']->sales_type;
 	$_POST['ref'] = $_SESSION['Items']->reference;
 	$_POST['ShipperID'] = $_SESSION['Items']->ship_via;
 }
@@ -88,6 +96,7 @@ function handle_new_credit($trans_no)
 	processing_start();
 	$_SESSION['Items'] = new Cart(11,$trans_no);
 	copy_from_cn();
+    line_start_focus();
 }
 
 //-----------------------------------------------------------------------------
@@ -97,21 +106,26 @@ function can_process()
 
 	$input_error = 0;
 
-	if ($_SESSION['Items']->count_items() == 0
-		&& (!isset($_POST['ChargeFreightCost']) || $_POST['ChargeFreightCost'] <= 0))
+	if ($_SESSION['Items']->count_items() == 0 && (!check_num('ChargeFreightCost',0)))
 		return false;
-
-	if (!references::is_valid($_POST['ref'])) {
+	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))	{
+	    } elseif (!is_new_reference($_POST['ref'], 11))	{
 		display_error( _("The entered reference is already in use."));
+		set_focus('ref');
 		$input_error = 1;
-	} elseif (!is_date($_POST['OrderDate'])) {
+	    }
+	}
+	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);
@@ -125,6 +139,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;
@@ -139,16 +154,19 @@ if (isset($_POST['ProcessCredit']) && can_process()) {
 
 function check_item_data()
 {
-	if ($_POST['qty'] <= 0) {
+	if (!check_num('qty',0)) {
 		display_error(_("The quantity must be greater than zero."));
+		set_focus('qty');
 		return false;
 	}
-	if (!is_numeric($_POST['price']) || $_POST['price'] < 0) {
+	if (!check_num('price',0)) {
 		display_error(_("The entered price is negative or invalid."));
+		set_focus('price');
 		return false;
 	}
-	if (!is_numeric($_POST['Disc']) || $_POST['Disc'] > 100 || $_POST['Disc'] < 0) {
+	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;
@@ -159,16 +177,18 @@ function check_item_data()
 function handle_update_item()
 {
 	if ($_POST['UpdateItem'] != "" && check_item_data()) {
-		$_SESSION['Items']->update_cart_item($_POST['line_no'], $_POST['qty'],
-			$_POST['price'], ($_POST['Disc'] / 100));
+		$_SESSION['Items']->update_cart_item($_POST['line_no'], input_num('qty'),
+			input_num('price'), input_num('Disc') / 100);
 	}
+    line_start_focus();
 }
 
 //-----------------------------------------------------------------------------
 
-function handle_delete_item()
+function handle_delete_item($line_no)
 {
-	$_SESSION['Items']->remove_from_cart($_GET['Delete']);
+	$_SESSION['Items']->remove_from_cart($line_no);
+    line_start_focus();
 }
 
 //-----------------------------------------------------------------------------
@@ -179,18 +199,14 @@ function handle_new_item()
 	if (!check_item_data())
 		return;
 
-	add_to_order($_SESSION['Items'], $_POST['stock_id'], $_POST['qty'],
-		$_POST['price'], $_POST['Disc'] / 100);
+	add_to_order($_SESSION['Items'], $_POST['stock_id'], input_num('qty'),
+		input_num('price'), input_num('Disc') / 100);
+    line_start_focus();
 }
 //-----------------------------------------------------------------------------
-if (isset($_GET['Delete']) || isset($_GET['Edit']))
-	copy_from_cn();
-
-if (isset($_GET['Delete']))
-	handle_delete_item();
-
-if (isset($_POST['AddItem']) || isset($_POST['UpdateItem']))
-	copy_to_cn();
+$id = find_submit('Delete');
+if ($id!=-1)
+	handle_delete_item($id);
 
 if (isset($_POST['AddItem']))
 	handle_new_item();
@@ -198,15 +214,13 @@ if (isset($_POST['AddItem']))
 if (isset($_POST['UpdateItem']))
 	handle_update_item();
 
+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;
 }
 
 //-----------------------------------------------------------------------------
@@ -229,7 +243,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();