X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=inventory%2Fadjustments.php;h=3d2c39baf1c1fc89a3794b834887a50335e60d21;hb=d735235be078e107597bad3fbcfef25943076a5f;hp=18f26096f98c27f8fdad4536f12d5f8042fa120e;hpb=264c09696d65efe4532c197f317162daf8c24f32;p=fa-stable.git

diff --git a/inventory/adjustments.php b/inventory/adjustments.php
index 18f26096..3d2c39ba 100644
--- a/inventory/adjustments.php
+++ b/inventory/adjustments.php
@@ -21,9 +21,9 @@ include_once($path_to_root . "/includes/data_checks.inc");
 include_once($path_to_root . "/inventory/includes/item_adjustments_ui.inc");
 include_once($path_to_root . "/inventory/includes/inventory_db.inc");
 $js = "";
-if ($use_popup_windows)
+if ($SysPrefs->use_popup_windows)
 	$js .= get_js_open_window(800, 500);
-if ($use_date_picker)
+if (user_use_date_picker())
 	$js .= get_js_date_picker();
 page(_($help_context = "Item Adjustments Note"), false, false, "", $js);
 
@@ -31,8 +31,6 @@ page(_($help_context = "Item Adjustments Note"), false, false, "", $js);
 
 check_db_has_costable_items(_("There are no inventory items defined in the system which can be adjusted (Purchased or Manufactured)."));
 
-check_db_has_movement_types(_("There are no inventory movement types defined in the system. Please define at least one inventory adjustment type."));
-
 //-----------------------------------------------------------------------------------------------
 
 if (isset($_GET['AddedID'])) 
@@ -80,7 +78,7 @@ function handle_new_order()
 
 function can_process()
 {
-	global $Refs;
+	global $Refs, $SysPrefs;
 
 	$adj = &$_SESSION['adj_items'];
 
@@ -89,16 +87,9 @@ function can_process()
 		set_focus('stock_id');
 		return false;
 	}
-	if (!$Refs->is_valid($_POST['ref'])) 
-	{
-		display_error( _("You must enter a reference."));
-		set_focus('ref');
-		return false;
-	}
 
-	if (!is_new_reference($_POST['ref'], ST_INVADJUST)) 
+	if (!check_reference($_POST['ref'], ST_INVADJUST))
 	{
-		display_error( _("The entered reference is already in use."));
 		set_focus('ref');
 		return false;
 	}
@@ -114,16 +105,16 @@ function can_process()
 		display_error(_("The entered date is out of fiscal year or is closed for further data entry."));
 		set_focus('AdjDate');
 		return false;
-	} else {
-		$failed_item = $adj->check_qoh($_POST['StockLocation'], $_POST['AdjDate'], !$_POST['Increase']);
-		if ($failed_item >= 0) 
+	}
+	elseif (!$SysPrefs->allow_negative_stock())
+	{
+		$low_stock = $adj->check_qoh($_POST['StockLocation'], $_POST['AdjDate']);
+
+		if ($low_stock)
 		{
-			$line = $adj->line_items[$failed_item];
-    		display_error(_("The adjustment cannot be processed because an adjustment item would cause a negative inventory balance :") .
-    			" " . $line->stock_id . " - " .  $line->item_description);
-			$_POST['Edit'.$failed_item] = 1; // enter edit mode
+    		display_error(_("The adjustment cannot be processed because it would cause negative inventory balance for marked items as of document date or later."));
 			unset($_POST['Process']);
-		return false;
+			return false;
 		}
 	}
 	return true;
@@ -134,22 +125,22 @@ function can_process()
 if (isset($_POST['Process']) && can_process()){
 
 	$trans_no = add_stock_adjustment($_SESSION['adj_items']->line_items,
-		$_POST['StockLocation'], $_POST['AdjDate'],	$_POST['type'], $_POST['Increase'],
-		$_POST['ref'], $_POST['memo_']);
+		$_POST['StockLocation'], $_POST['AdjDate'],	$_POST['ref'], $_POST['memo_']);
 	new_doc_date($_POST['AdjDate']);
 	$_SESSION['adj_items']->clear_items();
 	unset($_SESSION['adj_items']);
 
    	meta_forward($_SERVER['PHP_SELF'], "AddedID=$trans_no");
+
 } /*end of process credit note */
 
 //-----------------------------------------------------------------------------------------------
 
 function check_item_data()
 {
-	if (!check_num('qty',0))
+	if (input_num('qty') == 0)
 	{
-		display_error(_("The quantity entered is negative or invalid."));
+		display_error(_("The quantity entered is invalid."));
 		set_focus('qty');
 		return false;
 	}
@@ -168,12 +159,9 @@ function check_item_data()
 
 function handle_update_item()
 {
-    if($_POST['UpdateItem'] != "" && check_item_data())
-    {
-		$id = $_POST['LineNo'];
-    	$_SESSION['adj_items']->update_cart_item($id, input_num('qty'), 
-			input_num('std_cost'));
-    }
+	$id = $_POST['LineNo'];
+   	$_SESSION['adj_items']->update_cart_item($id, input_num('qty'), 
+		input_num('std_cost'));
 	line_start_focus();
 }
 
@@ -189,9 +177,6 @@ function handle_delete_item($id)
 
 function handle_new_item()
 {
-	if (!check_item_data())
-		return;
-
 	add_to_order($_SESSION['adj_items'], $_POST['stock_id'], 
 	  input_num('qty'), input_num('std_cost'));
 	line_start_focus();
@@ -202,10 +187,10 @@ $id = find_submit('Delete');
 if ($id != -1)
 	handle_delete_item($id);
 
-if (isset($_POST['AddItem']))
+if (isset($_POST['AddItem']) && check_item_data())
 	handle_new_item();
 
-if (isset($_POST['UpdateItem']))
+if (isset($_POST['UpdateItem']) && check_item_data())
 	handle_update_item();
 
 if (isset($_POST['CancelItemChanges'])) {
@@ -223,7 +208,7 @@ start_form();
 
 display_order_header($_SESSION['adj_items']);
 
-start_outer_table(TABLESTYLE, "width=70%", 10);
+start_outer_table(TABLESTYLE, "width='70%'", 10);
 
 display_adjustment_items(_("Adjustment Items"), $_SESSION['adj_items']);
 adjustment_options_controls();
@@ -236,4 +221,3 @@ submit_center_last('Process', _("Process Adjustment"), '', 'default');
 end_form();
 end_page();
 
-?>