X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=purchasing%2Fincludes%2Fdb%2Fgrn_db.inc;h=d3cee3398e5a1e45c872df53caa53fc24579e9be;hb=72998423b6010dfd9a07025f836eef56736a7037;hp=832787d05fac080a0af86845073070bb17e10ce6;hpb=2778621096dd6e321f75f9587a6c18b6e50669ef;p=fa-stable.git

diff --git a/purchasing/includes/db/grn_db.inc b/purchasing/includes/db/grn_db.inc
index 832787d0..d3cee339 100644
--- a/purchasing/includes/db/grn_db.inc
+++ b/purchasing/includes/db/grn_db.inc
@@ -140,9 +140,6 @@ 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);
 			add_stock_move(ST_SUPPRECEIVE, $order_line->stock_id, $grn, $po->Location, $date_, "",
 			 	$order_line->receive_qty, $order_line->standard_cost, $order_line->taxfree_charge_value($po)/$order_line->receive_qty);		
 
@@ -150,8 +147,9 @@ function add_grn(&$po)
 	} /*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);
 
@@ -257,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,
@@ -348,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"];