X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=inventory%2Fadjustments.php;h=dc14d93ef4a31edfbd3d3802c1edcda6cd29c1a6;hb=8f9265a8c89570c7815998dce800b5145dcf160e;hp=9a114e41c6ab5ef217ab6c481a3a6c8c550015eb;hpb=da8311619dd73feae101d246a1957b972e00cbd2;p=fa-stable.git

diff --git a/inventory/adjustments.php b/inventory/adjustments.php
index 9a114e41..dc14d93e 100644
--- a/inventory/adjustments.php
+++ b/inventory/adjustments.php
@@ -1,7 +1,16 @@
 <?php
-
-$page_security = 3;
-$path_to_root="..";
+/**********************************************************************
+    Copyright (C) FrontAccounting, LLC.
+	Released under the terms of the GNU General Public License, GPL, 
+	as published by the Free Software Foundation, either version 3 
+	of the License, or (at your option) any later version.
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
+    See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
+***********************************************************************/
+$page_security = 'SA_INVENTORYADJUSTMENT';
+$path_to_root = "..";
 include_once($path_to_root . "/includes/ui/items_cart.inc");
 
 include_once($path_to_root . "/includes/session.inc");
@@ -14,7 +23,9 @@ include_once($path_to_root . "/inventory/includes/inventory_db.inc");
 $js = "";
 if ($use_popup_windows)
 	$js .= get_js_open_window(800, 500);
-page(_("Item Adjustments Note"), false, false, "", $js);
+if ($use_date_picker)
+	$js .= get_js_date_picker();
+page(_($help_context = "Item Adjustments Note"), false, false, "", $js);
 
 //-----------------------------------------------------------------------------------------------
 
@@ -27,40 +38,27 @@ check_db_has_movement_types(_("There are no inventory movement types defined in
 if (isset($_GET['AddedID'])) 
 {
 	$trans_no = $_GET['AddedID'];
-	$trans_type = systypes::inventory_adjustment();
+	$trans_type = ST_INVADJUST;
 
 	display_notification_centered(_("Items adjustment has been processed"));
-	display_note(get_trans_view_str($trans_type, $trans_no, _("View this adjustment")));
+	display_note(get_trans_view_str($trans_type, $trans_no, _("&View this adjustment")));
+
+	display_note(get_gl_view_str($trans_type, $trans_no, _("View the GL &Postings for this Adjustment")), 1, 0);
 
-	display_note(get_gl_view_str($trans_type, $trans_no, _("View the GL Postings for this Adjustment")), 1, 0);
+	hyperlink_no_params($_SERVER['PHP_SELF'], _("Enter &Another Adjustment"));
 
-	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();
 }
-
 //--------------------------------------------------------------------------------------------------
 
-function copy_to_st()
-{
-	$_SESSION['adj_items']->from_loc = $_POST['StockLocation'];
-	$_SESSION['adj_items']->tran_date = $_POST['AdjDate'];
-	$_SESSION['adj_items']->transfer_type = $_POST['type'];
-	$_SESSION['adj_items']->increase = $_POST['Increase'];
-	$_SESSION['adj_items']->memo_ = $_POST['memo_'];
-}
-
-//--------------------------------------------------------------------------------------------------
+function line_start_focus() {
+  global 	$Ajax;
 
-function copy_from_st()
-{
-	$_POST['StockLocation'] = $_SESSION['adj_items']->from_loc;
-	$_POST['AdjDate'] = $_SESSION['adj_items']->tran_date;
-	$_POST['type'] = $_SESSION['adj_items']->transfer_type;
-	$_POST['Increase'] = $_SESSION['adj_items']->increase;
-	$_POST['memo_'] = $_SESSION['adj_items']->memo_;
+  $Ajax->activate('items_table');
+  set_focus('_stock_id_edit');
 }
-
 //-----------------------------------------------------------------------------------------------
 
 function handle_new_order()
@@ -71,10 +69,8 @@ function handle_new_order()
 		unset ($_SESSION['adj_items']);
 	}
 
-    session_register("adj_items");
-
-    $_SESSION['adj_items'] = new items_cart;
-	$_POST['AdjDate'] = Today();
+    $_SESSION['adj_items'] = new items_cart(ST_INVADJUST);
+	$_POST['AdjDate'] = new_doc_date();
 	if (!is_date_in_fiscalyear($_POST['AdjDate']))
 		$_POST['AdjDate'] = end_fiscalyear();
 	$_SESSION['adj_items']->tran_date = $_POST['AdjDate'];	
@@ -84,36 +80,52 @@ function handle_new_order()
 
 function can_process()
 {
-	if (!references::is_valid($_POST['ref'])) 
+	global $Refs, $SysPrefs;
+
+	$adj = &$_SESSION['adj_items'];
+
+	if (count($adj->line_items) == 0)	{
+		display_error(_("You must enter at least one non empty item line."));
+		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'], systypes::inventory_adjustment())) 
+	if (!is_new_reference($_POST['ref'], ST_INVADJUST)) 
 	{
 		display_error( _("The entered reference is already in use."));
+		set_focus('ref');
 		return false;
 	}
 
 	if (!is_date($_POST['AdjDate'])) 
 	{
 		display_error(_("The entered date for the adjustment is invalid."));
+		set_focus('AdjDate');
 		return false;
 	} 
 	elseif (!is_date_in_fiscalyear($_POST['AdjDate'])) 
 	{
 		display_error(_("The entered date is not in fiscal year."));
+		set_focus('AdjDate');
 		return false;
 	}
-	$failed_item = $_SESSION['adj_items']->check_qoh($_POST['StockLocation'], $_POST['AdjDate'], !$_POST['Increase']);
-	if ($failed_item != null) 
+	elseif (!$SysPrefs->allow_negative_stock())
 	{
-    	display_error(_("The adjustment cannot be processed because an adjustment item would cause a negative inventory balance :") .
-    		" " . $failed_item->stock_id . " - " .  $failed_item->item_description);
-		return false;
+		$low_stock = $adj->check_qoh($_POST['StockLocation'], $_POST['AdjDate'], !$_POST['Increase']);
+
+		if ($low_stock)
+		{
+    		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 true;
 }
 
@@ -124,31 +136,29 @@ 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_']);
-
+	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 (!is_numeric($_POST['qty']))
-	{
-		display_error(_("The quantity entered is not a valid number."));
-		return false;
-	}
-
-	if ($_POST['qty'] <= 0)
+	if (!check_num('qty',0))
 	{
-		display_error(_("The quantity entered must be greater than zero."));
+		display_error(_("The quantity entered is negative or invalid."));
+		set_focus('qty');
 		return false;
 	}
 
-	if (!is_numeric($_POST['std_cost']) || $_POST['std_cost'] < 0)
+	if (!check_num('std_cost', 0))
 	{
 		display_error(_("The entered standard cost is negative or invalid."));
+		set_focus('std_cost');
 		return false;
 	}
 
@@ -161,15 +171,19 @@ function handle_update_item()
 {
     if($_POST['UpdateItem'] != "" && check_item_data())
     {
-    	$_SESSION['adj_items']->update_cart_item($_POST['stock_id'], $_POST['qty'], $_POST['std_cost']);
+		$id = $_POST['LineNo'];
+    	$_SESSION['adj_items']->update_cart_item($id, input_num('qty'), 
+			input_num('std_cost'));
     }
+	line_start_focus();
 }
 
 //-----------------------------------------------------------------------------------------------
 
-function handle_delete_item()
+function handle_delete_item($id)
 {
-	$_SESSION['adj_items']->remove_from_cart($_GET['Delete']);
+	$_SESSION['adj_items']->remove_from_cart($id);
+	line_start_focus();
 }
 
 //-----------------------------------------------------------------------------------------------
@@ -179,26 +193,25 @@ function handle_new_item()
 	if (!check_item_data())
 		return;
 
-	add_to_order($_SESSION['adj_items'], $_POST['stock_id'], $_POST['qty'], $_POST['std_cost']);
+	add_to_order($_SESSION['adj_items'], $_POST['stock_id'], 
+	  input_num('qty'), input_num('std_cost'));
+	line_start_focus();
 }
 
 //-----------------------------------------------------------------------------------------------
+$id = find_submit('Delete');
+if ($id != -1)
+	handle_delete_item($id);
 
-if (isset($_GET['Delete']) || isset($_GET['Edit']))
-	copy_from_st();
-
-if (isset($_GET['Delete']))
-	handle_delete_item();
-
-if (isset($_POST['AddItem']) || isset($_POST['UpdateItem']))
-	copy_to_st();
-	
 if (isset($_POST['AddItem']))
 	handle_new_item();
 
 if (isset($_POST['UpdateItem']))
 	handle_update_item();
 
+if (isset($_POST['CancelItemChanges'])) {
+	line_start_focus();
+}
 //-----------------------------------------------------------------------------------------------
 
 if (isset($_GET['NewAdjustment']) || !isset($_SESSION['adj_items']))
@@ -207,29 +220,19 @@ if (isset($_GET['NewAdjustment']) || !isset($_SESSION['adj_items']))
 }
 
 //-----------------------------------------------------------------------------------------------
-
-start_form(false, true);
+start_form();
 
 display_order_header($_SESSION['adj_items']);
 
-start_table("$table_style width=70%", 10);
-start_row();
-echo "<TD>";
+start_outer_table(TABLESTYLE, "width=70%", 10);
+
 display_adjustment_items(_("Adjustment Items"), $_SESSION['adj_items']);
 adjustment_options_controls();
-echo "</TD>";
-end_row();
-end_table(1);
-
-start_table();
-start_row();
-submit_cells('Update', _("Update"));
-if ($_SESSION['adj_items']->count_items() >= 1)
-{
-    submit_cells('Process', _("Process Adjustment"));
-}
-end_row();
-end_table();
+
+end_outer_table(1, false);
+
+submit_center_first('Update', _("Update"), '', null);
+submit_center_last('Process', _("Process Adjustment"), '', 'default');
 
 end_form();
 end_page();