X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=inventory%2Fadjustments.php;h=7d86faa63beaf027740550b214070a792fa7ad7c;hb=0c1ab57c09d87eed2bd248892dbfe3f256767a82;hp=20ac09d1971bb7fcc51ec29005663fcfb0f4859b;hpb=d2cc0860eccf02eaefcd90731ac3af141a841529;p=fa-stable.git

diff --git a/inventory/adjustments.php b/inventory/adjustments.php
index 20ac09d1..7d86faa6 100644
--- a/inventory/adjustments.php
+++ b/inventory/adjustments.php
@@ -23,7 +23,7 @@ include_once($path_to_root . "/inventory/includes/inventory_db.inc");
 $js = "";
 if ($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);
 
@@ -47,6 +47,8 @@ if (isset($_GET['AddedID']))
 
 	hyperlink_no_params($_SERVER['PHP_SELF'], _("Enter &Another Adjustment"));
 
+	hyperlink_params("$path_to_root/admin/attachments.php", _("Add an Attachment"), "filterType=$trans_type&trans_no=$trans_no");
+
 	display_footer_exit();
 }
 //--------------------------------------------------------------------------------------------------
@@ -67,8 +69,6 @@ function handle_new_order()
 		unset ($_SESSION['adj_items']);
 	}
 
-    session_register("adj_items");
-
     $_SESSION['adj_items'] = new items_cart(ST_INVADJUST);
 	$_POST['AdjDate'] = new_doc_date();
 	if (!is_date_in_fiscalyear($_POST['AdjDate']))
@@ -80,7 +80,7 @@ function handle_new_order()
 
 function can_process()
 {
-	global $Refs;
+	global $Refs, $SysPrefs;
 
 	$adj = &$_SESSION['adj_items'];
 
@@ -111,19 +111,19 @@ function can_process()
 	} 
 	elseif (!is_date_in_fiscalyear($_POST['AdjDate'])) 
 	{
-		display_error(_("The entered date is not in fiscal year."));
+		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'], !$_POST['Increase']);
+
+		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;
@@ -141,6 +141,7 @@ if (isset($_POST['Process']) && can_process()){
 	unset($_SESSION['adj_items']);
 
    	meta_forward($_SERVER['PHP_SELF'], "AddedID=$trans_no");
+
 } /*end of process credit note */
 
 //-----------------------------------------------------------------------------------------------
@@ -223,7 +224,7 @@ start_form();
 
 display_order_header($_SESSION['adj_items']);
 
-start_outer_table("$table_style width=70%", 10);
+start_outer_table(TABLESTYLE, "width=70%", 10);
 
 display_adjustment_items(_("Adjustment Items"), $_SESSION['adj_items']);
 adjustment_options_controls();