X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=purchasing%2Fincludes%2Fdb%2Fgrn_db.inc;h=f973af91cd50f265cb12c0719fa2dbbc1afeeab7;hb=fff85845ae2899b1dbf4a39df94d3e6f27a4fa7e;hp=df35e23db60577bda56800421bfbcc337bf679e1;hpb=2f85dd59adb080270e39d0e52edc8af9a60175b1;p=fa-stable.git

diff --git a/purchasing/includes/db/grn_db.inc b/purchasing/includes/db/grn_db.inc
index df35e23d..f973af91 100644
--- a/purchasing/includes/db/grn_db.inc
+++ b/purchasing/includes/db/grn_db.inc
@@ -12,11 +12,6 @@
 //------------------- update average material cost ------------------------------------------ Joe Hunt Mar-03-2008
 function update_average_material_cost($supplier, $stock_id, $price, $qty, $date, $adj_only=false)
 {
-	//Handle if inventory will become negative
-    //8-OCT-2011 : Skip negative inventory adjustment for case of adjust_only
-    if (is_inventory_item($stock_id) && !$adj_only) 
-        handle_negative_inventory($stock_id, $qty, $price, $date);	
-
 	// probably this function should be optimized
 	// passing transaction cart as argument. This would
 	// save a couple of db calls like get_supplier()
@@ -40,14 +35,19 @@ function update_average_material_cost($supplier, $stock_id, $price, $qty, $date,
 		$price_in_home_currency = $price;
 	
 	$price_in_home_currency_ = $price_in_home_currency;
+
+	//Handle if inventory will become negative
+    //8-OCT-2011 : Skip negative inventory adjustment for case of adjust_only
+    if (is_inventory_item($stock_id) && !$adj_only) 
+        handle_negative_inventory($stock_id, $qty, $price_in_home_currency, $date);
 	
 	$sql = "SELECT mb_flag, material_cost, labour_cost, overhead_cost FROM ".TB_PREF."stock_master WHERE stock_id=".db_escape($stock_id);
 	$result = db_query($sql);
 	$myrow = db_fetch($result);
 	$material_cost = $myrow['material_cost'];
 	
-	//Price adjustment for manufactured item
-	if (!$adj_only && $myrow['mb_flag'] == 'M') 
+	//Price adjustment for manufactured item
+	if (!$adj_only && $myrow['mb_flag'] == 'M') 
 	{
 		$standard_cost = get_standard_cost($stock_id);
 		//reduce overhead_cost and labour_cost from price as those will remain as is
@@ -75,14 +75,14 @@ function update_average_material_cost($supplier, $stock_id, $price, $qty, $date,
 			$qoh = 0;
 		}
 		if ($qoh + $qty > 0)
-			$material_cost 
-= ($qoh * $material_cost + $qty * $price_in_home_currency) /	($qoh + $qty);
-	}	
-	
+			$material_cost = ($qoh * $material_cost + $qty * $price_in_home_currency) /	($qoh + $qty);
+	}
+
 	if ($cost_adjust) // new 2010-02-10 //Chaitanya : Material_cost replaced with price
 		adjust_deliveries($stock_id, $price_in_home_currency_, $date);
 	$sql = "UPDATE ".TB_PREF."stock_master SET material_cost=".db_escape($material_cost)."
 		WHERE stock_id=".db_escape($stock_id);
+
 	db_query($sql,"The cost details for the inventory item could not be updated");
 	return $material_cost;
 }
@@ -98,6 +98,8 @@ function add_grn(&$po)
 	begin_transaction();
 	hook_db_prewrite($po, ST_SUPPRECEIVE);
 
+	add_new_exchange_rate(get_supplier_currency($po->supplier_id), $date_, $po->ex_rate);
+
 	$grn = add_grn_batch($po->order_no, $po->supplier_id, $po->reference, $po->Location, $date_);
 
     $clearing_act = get_company_pref('grn_clearing_act');
@@ -117,8 +119,8 @@ function add_grn(&$po)
 				if ($clearing_act)
 					$total += add_gl_trans_supplier(ST_SUPPRECEIVE, $grn, $date_, $stock_gl_code["inventory_account"],
 						$stock_gl_code['dimension_id'], $stock_gl_code['dimension2_id'],
-						$order_line->receive_qty * $order_line->taxfree_charge_price($po), $po->supplier_id);
-				update_average_material_cost($po->supplier_id, $order_line->stock_id, $order_line->taxfree_charge_price($po),
+						$order_line->taxfree_charge_value($po), $po->supplier_id, '', 0, $order_line->stock_id);
+				update_average_material_cost($po->supplier_id, $order_line->stock_id, $order_line->price,
 					$order_line->receive_qty, $date_);
 			}		
 			//----------------------------------------------------------------------------------------------------------------
@@ -143,7 +145,7 @@ function add_grn(&$po)
 			/* Update location stock records - NB  a po cannot be entered for a service/kit parts done automatically */
 			add_stock_move(ST_SUPPRECEIVE, $order_line->stock_id, $grn, $po->Location, $date_, "",
 				$order_line->receive_qty, $order_line->standard_cost,
-            		$po->supplier_id, 1, $order_line->price);
+            		$po->supplier_id, 1, $order_line->taxfree_charge_value($po)/$order_line->receive_qty);
 
 		} /*quantity received is != 0 */
 	} /*end of order_line loop */
@@ -364,7 +366,7 @@ function read_grn($grn_batch, &$order)
 
 		$order->trans_type = ST_SUPPRECEIVE;
 		$order->orig_order_date = sql2date($row["delivery_date"]);
-		$order->location = $row["loc_code"];
+		$order->Location = $row["loc_code"];
 		$order->reference = $row["reference"];
 
 		read_grn_items_to_order($grn_batch, $order);