X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=purchasing%2Fincludes%2Fdb%2Fgrn_db.inc;h=d3cee3398e5a1e45c872df53caa53fc24579e9be;hb=f478231ee53d429047979736dafda1db9e6fcd72;hp=90d84eb47818e56ab027bebaf94ff559b6c51889;hpb=43ad91751a494b2572eb64441248aa3a87f0141e;p=fa-stable.git

diff --git a/purchasing/includes/db/grn_db.inc b/purchasing/includes/db/grn_db.inc
index 90d84eb4..d3cee339 100644
--- a/purchasing/includes/db/grn_db.inc
+++ b/purchasing/includes/db/grn_db.inc
@@ -41,18 +41,11 @@ function update_average_material_cost($supplier, $stock_id, $price, $qty, $date,
     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);
+	$sql = "SELECT mb_flag, material_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') 
-	{
-		//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'];
-	}
-
 	$cost_adjust = false;
 
 	$qoh = get_qoh_on_date($stock_id);
@@ -132,7 +125,7 @@ function add_grn(&$po)
 			{
 				/*This must be the first receipt of goods against this line */
 			   	/*Need to get the standard cost as it is now so we can process GL jorunals later*/
-			   	$order_line->standard_cost = get_standard_cost($order_line->stock_id);
+			   	$order_line->standard_cost = get_unit_cost($order_line->stock_id);
 			}
 			// Update the purchase data table
 			add_or_update_purchase_data($po->supplier_id, $order_line->stock_id, $order_line->price, 
@@ -148,15 +141,15 @@ function add_grn(&$po)
 			$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 */
 			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->taxfree_charge_value($po)/$order_line->receive_qty);
+			 	$order_line->receive_qty, $order_line->standard_cost, $order_line->taxfree_charge_value($po)/$order_line->receive_qty);		
 
 		} /*quantity received is != 0 */
 	} /*end of order_line loop */
 
 	if ($clearing_act && $total != 0.0) {
+		$accs = get_supplier_accounts($po->supplier_id);
 		$total += add_gl_trans_supplier(ST_SUPPRECEIVE, $grn, $date_, $clearing_act,
-			0, 0, -$total, null);
+			$accs['dimension_id'], $accs['dimension2_id'], -$total, null);
 	}
 	$Refs->save(ST_SUPPRECEIVE, $grn, $po->reference);
 
@@ -262,7 +255,7 @@ function set_grn_item_credited(&$entered_grn, $supplier, $transno, $date)
 function get_grn_items($grn_batch_id=0, $supplier_id="", $outstanding_only=false,
 	$is_invoiced_only=false, $invoice_no=0, $begin="", $end="")
 {
-    $sql = "SELECT grn.*, grn_item.*,
+    $sql = "SELECT grn.*, grn_item.*, po_item.delivery_date as req_del_date,
 		grn_item.quantity_inv".($invoice_no ? "-invoice_item.quantity" : '')."  quantity_inv,
     	po_item.unit_price,
     	po_item.act_price,
@@ -353,7 +346,7 @@ function read_grn_items_to_order($grn_batch, &$order)
 
 			$order->add_to_order($order->lines_on_order, $myrow["item_code"],
 				$myrow["qty_recd"],$myrow["description"], $myrow["unit_price"],$units,
-				sql2date($myrow["delivery_date"]), $myrow["quantity_inv"],
+				sql2date($myrow["req_del_date"]), $myrow["quantity_inv"],
 				$myrow["qty_recd"]);
 
 			$order->line_items[$order->lines_on_order-1]->po_detail_rec = $myrow["po_detail_item"];