X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=inventory%2Fincludes%2Fdb%2Fitems_adjust_db.inc;h=205b782e700f67a58b55a8ccb493cdaa325488aa;hb=8ffddf50ffbe93672c769e2cf0501d0f9125e2a0;hp=7be0f9bbb05a1b759b9cb816f8a14af19592008d;hpb=6d65fde699a327a6fee0d8d46abf8d2b37e53947;p=fa-stable.git

diff --git a/inventory/includes/db/items_adjust_db.inc b/inventory/includes/db/items_adjust_db.inc
index 7be0f9bb..205b782e 100644
--- a/inventory/includes/db/items_adjust_db.inc
+++ b/inventory/includes/db/items_adjust_db.inc
@@ -9,28 +9,37 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
     See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
 ***********************************************************************/
-//-------------------------------------------------------------------------------------------------------------
 
-function add_stock_adjustment($items, $location, $date_, $type, $increase, $reference, $memo_)
+function add_stock_adjustment($items, $location, $date_, $reference, $memo_)
 {
-	global $Refs;
+	global $SysPrefs, $path_to_root, $Refs;
 
 	begin_transaction();
 	$args = func_get_args();
-	$args = (object)array_combine(array('items', 'location', 'date_', 'type', 'increase',
-		'reference', 'memo_'), $args);
+	$args = (object)array_combine(array('items', 'location', 'date_', 'reference', 'memo_'), $args);
 	$args->trans_no = 0;
 	hook_db_prewrite($args, ST_INVADJUST);
 
 	$adj_id = get_next_trans_no(ST_INVADJUST);
 
+	if ($SysPrefs->loc_notification() == 1)
+	{
+		include_once($path_to_root . "/inventory/includes/inventory_db.inc");
+		$st_ids = array();
+		$st_names = array();
+		$st_num = array();
+		$st_reorder = array();
+	}
 	foreach ($items as $line_item)
 	{
 
-		if (!$increase)
-			$line_item->quantity = -$line_item->quantity;
+		if ($SysPrefs->loc_notification() == 1 && $line_item->qty < 0)
+		{
+			$chg = $line; $chg->qty = -$chg->qty;	// calculate_reorder_level expect positive qty
+			$loc = calculate_reorder_level($location, $line_item, $st_ids, $st_names, $st_num, $st_reorder); 
+		}
 
-		add_stock_adjustment_item($adj_id, $line_item->stock_id, $location, $date_, $type, $reference,
+		add_stock_adjustment_item($adj_id, $line_item->stock_id, $location, $date_, $reference,
 			$line_item->quantity, $line_item->standard_cost, $memo_);
 	}
 
@@ -42,6 +51,8 @@ function add_stock_adjustment($items, $location, $date_, $type, $increase, $refe
 	$args->trans_no = $adj_id;
 	hook_db_postwrite($args, ST_INVADJUST);
 	commit_transaction();
+	if ($SysPrefs->loc_notification() == 1 && count($st_ids) > 0)
+		send_reorder_email($loc, $st_ids, $st_names, $st_num, $st_reorder);
 
 	return $adj_id;
 }
@@ -71,7 +82,7 @@ function get_stock_adjustment_items($trans_no)
 
 //--------------------------------------------------------------------------------------------------
 
-function add_stock_adjustment_item($adj_id, $stock_id, $location, $date_, $type, $reference,
+function add_stock_adjustment_item($adj_id, $stock_id, $location, $date_, $reference,
 	$quantity, $standard_cost, $memo_)
 {
 	$mb_flag = get_mb_flag($stock_id);
@@ -81,43 +92,10 @@ function add_stock_adjustment_item($adj_id, $stock_id, $location, $date_, $type,
     	display_db_error("Cannot do inventory adjustment for Service item : $stock_id", "");
     }
 
-	/* Logic shifted to function update_average_material_cost
-	//Chaitanya : If negative adjustment result in negative or zero inventory 
-	//then difference should be adjusted
-	$qoh = get_qoh_on_date($stock_id);
-	if ($qoh + $quantity <= 0 && $qoh > 0) //Positive inventory turning zero/negative
-	{
-		global $Refs;
-
-		$id = get_next_trans_no(ST_JOURNAL);
-		$ref = $Refs->get_next(ST_JOURNAL);
-		$diff = get_standard_cost($stock_id) - $standard_cost;
-		
-		if ($diff !=0)
-		{
-			$stock_gl_code = get_stock_gl_code($stock_id);
-			$memo = _("For zero inventory of ").$stock_id." INVADJ REF: ".$reference;
-			//Reverse the inventory effect if $qoh <=0
-			add_gl_trans_std_cost(ST_JOURNAL, $id, $date_, 
-				$stock_gl_code["inventory_account"],
-				$stock_gl_code['dimension_id'], $stock_gl_code['dimension2_id'], $memo, 
-				-$qoh * $diff);
-			//GL Posting to inventory adjustment account
-			add_gl_trans_std_cost(ST_JOURNAL, $id, $date_, 
-				$stock_gl_code["adjustment_account"],
-				$stock_gl_code['dimension_id'], $stock_gl_code['dimension2_id'], $memo,
-				$qoh * $diff);
-				
-			add_audit_trail(ST_JOURNAL, $id, $date_);
-			add_comments(ST_JOURNAL, $id, $date_, $memo);
-			$Refs->save(ST_JOURNAL, $id, $ref);	
-		}		
-	}*/
-
 	update_average_material_cost(null, $stock_id, $standard_cost, $quantity, $date_);
 
 	add_stock_move(ST_INVADJUST, $stock_id, $adj_id, $location,
-        $date_, $reference, $quantity, $standard_cost, $type);
+        $date_, $reference, $quantity, $standard_cost);
 
 	if ($standard_cost > 0)
 	{
@@ -130,7 +108,3 @@ function add_stock_adjustment_item($adj_id, $stock_id, $location, $date_, $type,
 		add_gl_trans_std_cost(ST_INVADJUST, $adj_id, $date_, $stock_gl_codes['inventory_account'], 0, 0, $memo_, ($standard_cost * $quantity));
 	}
 }
-
-//-------------------------------------------------------------------------------------------------------------
-
-?>
\ No newline at end of file