X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=purchasing%2Fincludes%2Fdb%2Fgrn_db.inc;h=0118fa376629923bcf62476de20e0e732a4a42b4;hb=e28f3fe01f168d761393ce2f10409284eef2adb4;hp=910cf9a6f30af6e43fb2cbb91ddf7b0436cc10f3;hpb=e3f700d1e11788f176bf02c7b9969780e66dc167;p=fa-stable.git

diff --git a/purchasing/includes/db/grn_db.inc b/purchasing/includes/db/grn_db.inc
index 910cf9a6..0118fa37 100644
--- a/purchasing/includes/db/grn_db.inc
+++ b/purchasing/includes/db/grn_db.inc
@@ -1,5 +1,39 @@
 <?php
 
+//------------------- update average material cost ------------------------------------------ Joe Hunt Mar-03-2008
+
+function update_average_material_cost($supplier, $stock_id, $price, $qty, $date, $adj_only)
+{
+	$currency = get_supplier_currency($supplier);
+	if ($currency != null)
+		$price_in_home_currency = to_home_currency($price, $currency, $date);
+	else
+		$price_in_home_currency = $price;
+	$sql = "SELECT material_cost FROM ".TB_PREF."stock_master WHERE stock_id='$stock_id'";
+	$result = db_query($sql);
+	$myrow = db_fetch($result);
+	$material_cost = $myrow['material_cost'];
+	$qoh = get_qoh_on_date($stock_id, null, $date);
+	if ($qoh + $qty <= 0)
+		$material_cost = 0;
+	else
+	{
+		if ($adj_only)
+		{
+			if ($qoh <= 0)
+				$material_cost = 0;
+			else
+				$material_cost = ($qoh * $material_cost + $qty * $price_in_home_currency) /	$qoh;
+		}
+		else
+			$material_cost = ($qoh * $material_cost + $qty * $price_in_home_currency) /	($qoh + $qty);
+	}
+	$sql = "UPDATE ".TB_PREF."stock_master SET material_cost=".db_escape($material_cost)."
+		WHERE stock_id='$stock_id'";
+	db_query($sql,"The cost details for the inventory item could not be updated");
+	return $material_cost;
+}
+
 //-------------------------------------------------------------------------------------------------------------
 
 function add_grn(&$po, $date_, $reference, $location)
@@ -16,6 +50,10 @@ function add_grn(&$po, $date_, $reference, $location)
 
 			/*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($po->supplier_id, $order_line->stock_id, $order_line->price,
+				$order_line->receive_qty, $date_);
+			//----------------------------------------------------------------------------------------------------------------
 			if ($order_line->qty_received == 0)
 			{
 				/*This must be the first receipt of goods against this line */
@@ -23,29 +61,12 @@ function add_grn(&$po, $date_, $reference, $location)
 			   	$order_line->standard_cost = get_standard_cost($order_line->stock_id);
 			}
 
-			//------------------- update average material cost ------------------------------------------ Joe Hunt Mar-03-2008
-			$currency = get_supplier_currency($po->supplier_id);
-			if ($currency != null)
-				$price_in_home_currency = to_home_currency($order_line->price, $currency, $date_);
-			else
-				$price_in_home_currency = $order_line->price;
-			$sql = "SELECT material_cost FROM ".TB_PREF."stock_master WHERE stock_id='$order_line->stock_id'";
-			$result = db_query($sql);
-			$myrow = db_fetch($result);
-			$material_cost = $myrow['material_cost'];
-			$qoh = get_qoh_on_date($order_line->stock_id, null, $date_);
-			$material_cost = ($qoh * $material_cost + $order_line->receive_qty * $price_in_home_currency) /
-				($qoh + $order_line->receive_qty);
-			$sql = "UPDATE ".TB_PREF."stock_master SET material_cost=$material_cost
-				WHERE stock_id='$order_line->stock_id'";
-			db_query($sql,"The cost details for the inventory item could not be updated");
-			//----------------------------------------------------------------------------------------------------------------
 
 			/*Need to insert a grn item */
 
 			$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->standard_cost,	$order_line->receive_qty, $order_line->price);
 
 			/* Update location stock records - NB  a po cannot be entered for a service/kit parts */
 
@@ -56,8 +77,6 @@ function add_grn(&$po, $date_, $reference, $location)
 		} /*quantity received is != 0 */
 	} /*end of order_line loop */
 
-	add_forms_for_sys_type(25, $grn, $location);
-
 	references::save_last($reference, 25);
 
 	commit_transaction();
@@ -72,7 +91,8 @@ function add_grn_batch($po_number, $supplier_id, $reference, $location, $date_)
 	$date = date2sql($date_);
 
 	$sql = "INSERT INTO ".TB_PREF."grn_batch (purch_order_no, delivery_date, supplier_id, reference, loc_code)
-			VALUES ($po_number, '$date', '$supplier_id', '$reference', '$location')";
+			VALUES (".db_escape($po_number).", ".db_escape($date).", "
+			.db_escape($supplier_id).", ".db_escape($reference).", ".db_escape($location).")";
 
 	db_query($sql, "A grn batch record could not be inserted.");
 
@@ -82,17 +102,18 @@ 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)
+	$quantity_received, $price)
 {
 	$sql = "UPDATE ".TB_PREF."purch_order_details
         SET quantity_received = quantity_received + $quantity_received,
-        std_cost_unit=$standard_unit_cost
+        std_cost_unit=$standard_unit_cost,
+        act_price=$price
         WHERE po_detail_item = $po_detail_item";
 
 	db_query($sql, "a purchase order details record could not be updated. This receipt of goods has not been processed ");
 
 	$sql = "INSERT INTO ".TB_PREF."grn_items (grn_batch_id, po_detail_item, item_code, description, qty_recd)
-		VALUES ($grn_batch_id, $po_detail_item, '$item_code', '$description', $quantity_received)";
+		VALUES ($grn_batch_id, $po_detail_item, ".db_escape($item_code).", ".db_escape($description).", $quantity_received)";
 
 	db_query($sql, "A GRN detail item could not be inserted.");