X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=purchasing%2Fincludes%2Fdb%2Fgrn_db.inc;h=a73efa6fcc3e20a36384adb62991815bd5ce71d2;hb=68dee220a91ccf1725fc3ee86c8967457b749ccb;hp=d80fc0e1c9581d7d04762fa1fd4b5cce00382903;hpb=14bede88ad8adbbd68b4cd422171d3938693d8b0;p=fa-stable.git

diff --git a/purchasing/includes/db/grn_db.inc b/purchasing/includes/db/grn_db.inc
index d80fc0e1..a73efa6f 100644
--- a/purchasing/includes/db/grn_db.inc
+++ b/purchasing/includes/db/grn_db.inc
@@ -10,20 +10,29 @@
     See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
 ***********************************************************************/
 //------------------- update average material cost ------------------------------------------ Joe Hunt Mar-03-2008
-
 function update_average_material_cost($supplier, $stock_id, $price, $qty, $date, $adj_only=false)
 {
+	// probably this function should be optimized
+	// passing transaction cart as argument. This would
+	// save a couple of db calls like get_supplier()
+	
+	$supp = get_supplier($supplier);
 	if ($supplier != null)
-		$currency = get_supplier_currency($supplier);
+		$currency = $supp['curr_code'];
 	else
 		$currency = null;
+
+	if ($supp['tax_included'])
+		$price = get_tax_free_price_for_item($stock_id, $price, $supp['tax_group_id'],
+			$supp['tax_included']);
+
 	$dec = user_price_dec();
-	$price = price_decimal_format($price, $dec);
+	price_decimal_format($price, $dec);
+	$price = round2($price, $dec);
 	if ($currency != null)
 	{
 		$ex_rate = get_exchange_rate_to_home_currency($currency, $date);
 		$price_in_home_currency = $price / $ex_rate;
-		//$price_in_home_currency = to_home_currency($price, $currency, $date);
 	}	
 	else
 		$price_in_home_currency = $price;
@@ -37,24 +46,30 @@ function update_average_material_cost($supplier, $stock_id, $price, $qty, $date,
 		$exclude = ST_CUSTDELIVERY;
 	else
 		$exclude = 0;
-	$qoh = get_qoh_on_date($stock_id, null, $date, $exclude);
+	$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)
-			$material_cost = 0;
-		else
+		if ($qoh > 0)
 			$material_cost = ($qoh * $material_cost + $qty * $price_in_home_currency) /	$qoh;
 	}
-	elseif ($qoh + $qty <= 0)
-		$material_cost = 0;
 	else
 	{
 		if ($qoh < 0)
+		{
+			if ($qoh + $qty > 0)
+				$cost_adjust = true;
 			$qoh = 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);
-
+	//$material_cost = round2($material_cost, $dec);
+	
+	if ($cost_adjust) // new 2010-02-10
+		adjust_deliveries($stock_id, $material_cost, $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");
@@ -63,15 +78,17 @@ function update_average_material_cost($supplier, $stock_id, $price, $qty, $date,
 
 //-------------------------------------------------------------------------------------------------------------
 
-function add_grn(&$po, $date_, $reference, $location)
+function add_grn(&$po)
 {
 	global $Refs;
 
+	$date_ = $po->orig_order_date;
+
 	begin_transaction();
 
-	$grn = add_grn_batch($po->order_no, $po->supplier_id, $reference, $location, $date_);
+	$grn = add_grn_batch($po->order_no, $po->supplier_id, $po->reference, $po->Location, $date_);
 
-	foreach ($po->line_items as $order_line)
+	foreach ($po->line_items as $line_no => $order_line)
 	{
 
 		if ($order_line->receive_qty != 0 && $order_line->receive_qty != "" && isset($order_line->receive_qty))
@@ -98,15 +115,16 @@ function add_grn(&$po, $date_, $reference, $location)
 				$order_line->stock_id, $order_line->item_description,
 				$order_line->standard_cost,	$order_line->receive_qty, $order_line->price);
 
+			$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 */
-            add_stock_move(ST_SUPPRECEIVE, $order_line->stock_id, $grn, $location, $date_, "",
+            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);
 
 		} /*quantity received is != 0 */
 	} /*end of order_line loop */
 
-	$Refs->save(ST_SUPPRECEIVE, $grn, $reference);
+	$Refs->save(ST_SUPPRECEIVE, $grn, $po->reference);
 
 	add_audit_trail(ST_SUPPRECEIVE, $grn, $date_);
 
@@ -282,12 +300,12 @@ function read_grn_items_to_order($grn_batch, &$order)
 				$units = $myrow["units"];
 		 	}
 
-			$order->add_to_order($order->lines_on_order+1, $myrow["item_code"],
+			$order->add_to_order($order->lines_on_order, $myrow["item_code"],
 				1,$myrow["description"], $myrow["unit_price"],$units,
 				sql2date($myrow["delivery_date"]), $myrow["quantity_inv"],
 				$myrow["qty_recd"]);
 
-			$order->line_items[$order->lines_on_order]->po_detail_rec = $myrow["po_detail_item"];
+			$order->line_items[$order->lines_on_order-1]->po_detail_rec = $myrow["po_detail_item"];
 		} /* line po from purchase order details */
   	} //end of checks on returned data set
 }