X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=purchasing%2Fincludes%2Fdb%2Fgrn_db.inc;h=1e9f71be23769b860cba371dd26e5ecf891d80bb;hb=19d08aef75bd8960f1f0452303750ed0387fb1b8;hp=2b979f1a3b91359d3ed522365ecda8b527bcb37f;hpb=f19ddeb227739e5b993ab5ba2310cfd0ace18c4f;p=fa-stable.git

diff --git a/purchasing/includes/db/grn_db.inc b/purchasing/includes/db/grn_db.inc
index 2b979f1a..1e9f71be 100644
--- a/purchasing/includes/db/grn_db.inc
+++ b/purchasing/includes/db/grn_db.inc
@@ -12,6 +12,10 @@
 //------------------- 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
+	if (is_inventory_item($stock_id))
+		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()
@@ -36,12 +40,25 @@ function update_average_material_cost($supplier, $stock_id, $price, $qty, $date,
 	}	
 	else
 		$price_in_home_currency = $price;
-	$sql = "SELECT material_cost FROM ".TB_PREF."stock_master WHERE stock_id=".db_escape($stock_id);
+	
+	$price_in_home_currency_ = $price_in_home_currency;
+	
+	$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'];
-	if ($price > -0.0001 && $price < 0.0001)
-		return $material_cost;
+	
+	//Chaitanya : For Manufactured Items 
+	//IF inventory adjustment is made for manufactured item, the material cost averages and labour, overhead remains as is, but in inventory valuation total standard_cost matters resulting in invalid  valuation.	
+	if (!$adj_only && $myrow['mb_flag'] == 'M') //For manufactured items price is adjusted
+	{
+		$standard_cost = get_standard_cost($stock_id);
+		//reduce overhead_cost and labour_cost from price as those will remain as is
+		$price_in_home_currency = $price_in_home_currency - $myrow['labour_cost'] - $myrow['overhead_cost'];
+	}
+	
+	//if ($price > -0.0001 && $price < 0.0001) commented out by Chaitanya
+	//	return $material_cost;
 	if ($adj_only)
 		$exclude = ST_CUSTDELIVERY;
 	else
@@ -49,7 +66,7 @@ function update_average_material_cost($supplier, $stock_id, $price, $qty, $date,
 	$cost_adjust = false;
 	//$qoh = get_qoh_on_date($stock_id, null, $date, $exclude);
 	$qoh = get_qoh_on_date($stock_id);
-	
+
 	if ($adj_only)
 	{
 		if ($qoh > 0)
@@ -59,17 +76,18 @@ function update_average_material_cost($supplier, $stock_id, $price, $qty, $date,
 	{
 		if ($qoh < 0)
 		{
-			if ($qoh + $qty > 0)
+			if ($qoh + $qty >= 0)
 				$cost_adjust = true;
 			$qoh = 0;
 		}
-		if ($qoh + $qty != 0)
-			$material_cost = ($qoh * $material_cost + $qty * $price_in_home_currency) /	($qoh + $qty);
+		if ($qoh + $qty > 0)
+			$material_cost 
+= ($qoh * $material_cost + $qty * $price_in_home_currency) /	($qoh + $qty);
 	}	
 	//$material_cost = round2($material_cost, $dec);
 	
-	if ($cost_adjust) // new 2010-02-10
-		adjust_deliveries($stock_id, $material_cost, $date);
+	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");
@@ -89,17 +107,27 @@ function add_grn(&$po)
 
 	$grn = add_grn_batch($po->order_no, $po->supplier_id, $po->reference, $po->Location, $date_);
 
+    $clearing_act = get_company_pref('grn_clearing_act');
+	if ($clearing_act) {	// otherwise GRN clearing account is not used
+	    $total = 0;
+	}
 	foreach ($po->line_items as $line_no => $order_line)
 	{
-
 		if ($order_line->receive_qty != 0 && $order_line->receive_qty != "" && isset($order_line->receive_qty))
 		{
+			$stock_gl_code = get_stock_gl_code($order_line->stock_id);
 
 			/*Update sales_order_details for the new quantity received and the standard cost used for postings to GL and recorded in the stock movements for FIFO/LIFO stocks valuations*/
-			//------------------- update average material cost ------------------------------------------ Joe Hunt Mar-03-2008
+			//------------------- update average material cost and clearing account ----- Joe Hunt Mar-03-2008
 			if (is_inventory_item($order_line->stock_id))
+			{
+				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->price,
 					$order_line->receive_qty, $date_);
+			}		
 			//----------------------------------------------------------------------------------------------------------------
 			if ($order_line->qty_received == 0)
 			{
@@ -111,11 +139,12 @@ function add_grn(&$po)
 			add_or_update_purchase_data($po->supplier_id, $order_line->stock_id, $order_line->price, 
 				$order_line->item_description); 
 
-			/*Need to insert a grn item */
-
+			/*Need to insert a grn item */ // also need to check for over-receive.(within allowance)
+			if ($order_line->receive_qty + $order_line->qty_received > $order_line->quantity)
+				$order_line->quantity = $order_line->receive_qty + $order_line->qty_received;
 			$grn_item = add_grn_detail_item($grn, $order_line->po_detail_rec,
 				$order_line->stock_id, $order_line->item_description,
-				$order_line->standard_cost,	$order_line->receive_qty, $order_line->price);
+				$order_line->standard_cost,	$order_line->receive_qty, $order_line->price, $order_line->quantity);
 
 			$po->line_items[$line_no]->grn_item_id = $grn_item;
 			/* Update location stock records - NB  a po cannot be entered for a service/kit parts done automatically */
@@ -126,6 +155,10 @@ function add_grn(&$po)
 		} /*quantity received is != 0 */
 	} /*end of order_line loop */
 
+	if ($clearing_act && $total != 0.0) {
+		$total += add_gl_trans_supplier(ST_SUPPRECEIVE, $grn, $date_, $clearing_act,
+			0, 0, -$total, null);
+	}
 	$Refs->save(ST_SUPPRECEIVE, $grn, $po->reference);
 
 	add_audit_trail(ST_SUPPRECEIVE, $grn, $date_);
@@ -155,11 +188,12 @@ function add_grn_batch($po_number, $supplier_id, $reference, $location, $date_)
 //-------------------------------------------------------------------------------------------------------------
 
 function add_grn_detail_item($grn_batch_id, $po_detail_item, $item_code, $description, $standard_unit_cost,
-	$quantity_received, $price)
+	$quantity_received, $price, $quantity)
 {
 	$sql = "UPDATE ".TB_PREF."purch_order_details
         SET quantity_received = quantity_received + ".db_escape($quantity_received).",
         std_cost_unit=".db_escape($standard_unit_cost).",
+        quantity_ordered=".db_escape($quantity).",
         act_price=".db_escape($price)."
         WHERE po_detail_item = ".db_escape($po_detail_item);
 
@@ -230,6 +264,7 @@ function get_grn_items($grn_batch_id=0, $supplier_id="", $outstanding_only=false
 {
     $sql = "SELECT ".TB_PREF."grn_batch.*, ".TB_PREF."grn_items.*, "
     	.TB_PREF."purch_order_details.unit_price,"
+    	.TB_PREF."purch_order_details.act_price,"
     	.TB_PREF."purch_order_details.quantity_ordered,"
 		.TB_PREF."purch_order_details.std_cost_unit, units
     	FROM ".TB_PREF."grn_batch, ".TB_PREF."grn_items, "
@@ -295,7 +330,8 @@ function read_grn_items_to_order($grn_batch, &$order)
 
 	 	while ($myrow = db_fetch($result))
 	 	{
-
+	 		if ($myrow['qty_recd'] == 0 && $myrow['quantity_inv'] == 0)
+				continue; // 2011-01-18 Joe Hunt. We will not have empty credited rows.
 		 	if (is_null($myrow["units"]))
 		 	{
 				$units = "";