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

diff --git a/inventory/includes/db/items_adjust_db.inc b/inventory/includes/db/items_adjust_db.inc
index f3c8c9d2..7be0f9bb 100644
--- a/inventory/includes/db/items_adjust_db.inc
+++ b/inventory/includes/db/items_adjust_db.inc
@@ -51,14 +51,6 @@ function add_stock_adjustment($items, $location, $date_, $type, $increase, $refe
 function void_stock_adjustment($type_no)
 {
 	hook_db_prevoid(ST_INVADJUST, $type_no);
-
-    //Average the cost while voiding
-    $adjustment_items = get_stock_adjustment_items($type_no);
-    while ($adjustment = db_fetch($adjustment_items))
-    {
-        update_average_material_cost(0, $adjustment['stock_id'],
-            $adjustment['standard_cost'], -$adjustment['qty'], sql2date($adjustment['tran_date']));
-    }
 	void_gl_trans(ST_INVADJUST, $type_no);
 	void_stock_move(ST_INVADJUST, $type_no);
 }
@@ -89,6 +81,39 @@ 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,