X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=purchasing%2Fincludes%2Fdb%2Fgrn_db.inc;h=d3cee3398e5a1e45c872df53caa53fc24579e9be;hb=bff9e81e76c1110fea3a047220c0b158db11f825;hp=065b2c7d04fa0162df19529e402d9282c09d5fa4;hpb=24249d8ad52650e78e342a114d67f048efb9aed4;p=fa-stable.git diff --git a/purchasing/includes/db/grn_db.inc b/purchasing/includes/db/grn_db.inc index 065b2c7d..d3cee339 100644 --- a/purchasing/includes/db/grn_db.inc +++ b/purchasing/includes/db/grn_db.inc @@ -255,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, @@ -346,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"];