X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=inventory%2Fadjustments.php;h=3de3713f5494d0ed8a344410d4412de8deaa990b;hb=2a42ffb56ef6651b8a136cd89271e65d397d7677;hp=2f837fa0d7394c8aacc149fc6d10af1196348380;hpb=5cae8206ae7eaf4df4b95b7f2184e2332f85ec8d;p=fa-stable.git

diff --git a/inventory/adjustments.php b/inventory/adjustments.php
index 2f837fa0..3de3713f 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");
@@ -29,14 +38,14 @@ 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"));
 
 	display_footer_exit();
 }
@@ -48,27 +57,6 @@ function line_start_focus() {
   $Ajax->activate('items_table');
   set_focus('_stock_id_edit');
 }
-//--------------------------------------------------------------------------------------------------
-
-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 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_;
-}
-
 //-----------------------------------------------------------------------------------------------
 
 function handle_new_order()
@@ -81,8 +69,8 @@ function handle_new_order()
 
     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'];	
@@ -92,6 +80,8 @@ function handle_new_order()
 
 function can_process()
 {
+	global $Refs;
+
 	$adj = &$_SESSION['adj_items'];
 
 	if (count($adj->line_items) == 0)	{
@@ -99,14 +89,14 @@ function can_process()
 		set_focus('stock_id');
 		return false;
 	}
-	if (!references::is_valid($_POST['ref'])) 
+	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');
@@ -146,7 +136,7 @@ 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']);
 
@@ -212,11 +202,6 @@ $id = find_submit('Delete');
 if ($id != -1)
 	handle_delete_item($id);
 
-if (isset($_POST['AddItem']) || isset($_POST['UpdateItem'])) {
-	copy_to_st();
-	line_start_focus();
-}
-
 if (isset($_POST['AddItem']))
 	handle_new_item();
 
@@ -234,21 +219,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("$table_style width=70%", 10);
+
 display_adjustment_items(_("Adjustment Items"), $_SESSION['adj_items']);
 adjustment_options_controls();
-echo "</TD>";
-end_row();
-end_table(1);
 
-submit_center_first('Update', _("Update"), '', true);
-submit_center_last('Process', _("Process Transfer"), '', true);
+end_outer_table(1, false);
+
+submit_center_first('Update', _("Update"), '', null);
+submit_center_last('Process', _("Process Adjustment"), '', 'default');
 
 end_form();
 end_page();