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

diff --git a/inventory/adjustments.php b/inventory/adjustments.php
index 7d86faa6..fe720392 100644
--- a/inventory/adjustments.php
+++ b/inventory/adjustments.php
@@ -18,20 +18,23 @@ include_once($path_to_root . "/includes/session.inc");
 include_once($path_to_root . "/includes/date_functions.inc");
 include_once($path_to_root . "/includes/data_checks.inc");
 
+include_once($path_to_root . "/fixed_assets/includes/fixed_assets_db.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 (user_use_date_picker())
 	$js .= get_js_date_picker();
-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['NewAdjustment'])) {
+	if (isset($_GET['FixedAsset'])) {
+		$page_security = 'SA_ASSETDISPOSAL';
+		$_SESSION['page_title'] = _($help_context = "Fixed Assets Disposal");
+	} else {
+		$_SESSION['page_title'] = _($help_context = "Item Adjustments Note");
+	}
+}
+page($_SESSION['page_title'], false, false, "", $js);
 
 //-----------------------------------------------------------------------------------------------
 
@@ -40,12 +43,24 @@ if (isset($_GET['AddedID']))
 	$trans_no = $_GET['AddedID'];
 	$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")));
+  $result = get_stock_adjustment_items($trans_no);
+  $row = db_fetch($result);
 
-	display_note(get_gl_view_str($trans_type, $trans_no, _("View the GL &Postings for this Adjustment")), 1, 0);
+  if (is_fixed_asset($row['mb_flag'])) {
+    display_notification_centered(_("Fixed Assets disposal has been processed"));
+    display_note(get_trans_view_str($trans_type, $trans_no, _("&View this disposal")));
 
-	hyperlink_no_params($_SERVER['PHP_SELF'], _("Enter &Another Adjustment"));
+    display_note(get_gl_view_str($trans_type, $trans_no, _("View the GL &Postings for this Disposal")), 1, 0);
+	  hyperlink_params($_SERVER['PHP_SELF'], _("Enter &Another Disposal"), "NewAdjustment=1&FixedAsset=1");
+  }
+  else {
+    display_notification_centered(_("Items adjustment has been processed"));
+    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);
+
+	  hyperlink_params($_SERVER['PHP_SELF'], _("Enter &Another Adjustment"), "NewAdjustment=1");
+  }
 
 	hyperlink_params("$path_to_root/admin/attachments.php", _("Add an Attachment"), "filterType=$trans_type&trans_no=$trans_no");
 
@@ -70,6 +85,7 @@ function handle_new_order()
 	}
 
     $_SESSION['adj_items'] = new items_cart(ST_INVADJUST);
+    $_SESSION['adj_items']->fixed_asset = isset($_GET['FixedAsset']);
 	$_POST['AdjDate'] = new_doc_date();
 	if (!is_date_in_fiscalyear($_POST['AdjDate']))
 		$_POST['AdjDate'] = end_fiscalyear();
@@ -80,7 +96,7 @@ function handle_new_order()
 
 function can_process()
 {
-	global $Refs, $SysPrefs;
+	global $SysPrefs;
 
 	$adj = &$_SESSION['adj_items'];
 
@@ -89,16 +105,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;
 	}
@@ -117,7 +126,7 @@ function can_process()
 	}
 	elseif (!$SysPrefs->allow_negative_stock())
 	{
-		$low_stock = $adj->check_qoh($_POST['StockLocation'], $_POST['AdjDate'], !$_POST['Increase']);
+		$low_stock = $adj->check_qoh($_POST['StockLocation'], $_POST['AdjDate']);
 
 		if ($low_stock)
 		{
@@ -133,13 +142,17 @@ function can_process()
 
 if (isset($_POST['Process']) && can_process()){
 
+  $fixed_asset = $_SESSION['adj_items']->fixed_asset; 
+
 	$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']);
 
+  if ($fixed_asset)
+   	meta_forward($_SERVER['PHP_SELF'], "AddedID=$trans_no&FixedAsset=1");
+  else
    	meta_forward($_SERVER['PHP_SELF'], "AddedID=$trans_no");
 
 } /*end of process credit note */
@@ -148,9 +161,9 @@ if (isset($_POST['Process']) && can_process()){
 
 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;
 	}
@@ -169,12 +182,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();
 }
 
@@ -190,11 +200,8 @@ 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'));
+	input_num('qty'), input_num('std_cost'));
 	line_start_focus();
 }
 
@@ -203,38 +210,54 @@ $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']))
+	unset($_POST['selected_id']);
+}
+if (isset($_POST['UpdateItem']) && check_item_data()) {
 	handle_update_item();
-
+	unset($_POST['selected_id']);
+}
 if (isset($_POST['CancelItemChanges'])) {
+	unset($_POST['selected_id']);
 	line_start_focus();
 }
 //-----------------------------------------------------------------------------------------------
 
 if (isset($_GET['NewAdjustment']) || !isset($_SESSION['adj_items']))
 {
+
+	if (isset($_GET['FixedAsset']))
+		check_db_has_disposable_fixed_assets(_("There are no fixed assets defined in the system."));
+	else
+		check_db_has_costable_items(_("There are no inventory items defined in the system which can be adjusted (Purchased or Manufactured)."));
+
 	handle_new_order();
 }
 
 //-----------------------------------------------------------------------------------------------
 start_form();
 
+if ($_SESSION['adj_items']->fixed_asset) {
+	$items_title = _("Disposal Items");
+	$button_title = _("Process Disposal");
+} else {
+	$items_title = _("Adjustment Items");
+	$button_title = _("Process Adjustment");
+}
+
 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']);
+display_adjustment_items($items_title, $_SESSION['adj_items']);
 adjustment_options_controls();
 
 end_outer_table(1, false);
 
 submit_center_first('Update', _("Update"), '', null);
-submit_center_last('Process', _("Process Adjustment"), '', 'default');
+submit_center_last('Process', $button_title, '', 'default');
 
 end_form();
 end_page();
 
-?>