X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=purchasing%2Fincludes%2Fdb%2Fpo_db.inc;h=45810f1da0b9050b430457a06aaf3f0d64cb0370;hb=9a98bb3bc7a94f1a8e47f8dab45a87c8b4212080;hp=fd34fef16f0d605fec0b63dd2018b66972206f0e;hpb=f79fb55ef2dc9405300fe3941941b41667165223;p=fa-stable.git diff --git a/purchasing/includes/db/po_db.inc b/purchasing/includes/db/po_db.inc index fd34fef1..45810f1d 100644 --- a/purchasing/includes/db/po_db.inc +++ b/purchasing/includes/db/po_db.inc @@ -98,21 +98,21 @@ function update_po(&$po_obj) foreach ($po_obj->line_items as $po_line) { $sql = "INSERT INTO ".TB_PREF."purch_order_details (po_detail_item, order_no, item_code, - description, delivery_date, unit_price, quantity_ordered) VALUES (" + description, delivery_date, unit_price, quantity_ordered, quantity_received) VALUES (" .db_escape($po_line->po_detail_rec ? $po_line->po_detail_rec : 0). "," .$po_obj->order_no . "," .db_escape($po_line->stock_id). "," .db_escape($po_line->item_description). ",'" .date2sql($po_line->req_del_date) . "'," .db_escape($po_line->price) . ", " - .db_escape($po_line->quantity) . ")"; - + .db_escape($po_line->quantity) . ", " + .db_escape($po_line->qty_received) . ")"; db_query($sql, "One of the purchase order detail records could not be updated"); } // add_comments(ST_PURCHORDER, $po_obj->order_no, $po_obj->orig_order_date, $po_obj->Comments); - add_audit_trail(ST_PURCHORDER, $po_obj->order_no, $po_obj->orig_order_date, _("Updated.")); + add_audit_trail($po_obj->trans_type, $po_obj->order_no, Today(), _("Updated.")); hook_db_postwrite($po_obj, ST_PURCHORDER); commit_transaction(); @@ -140,7 +140,7 @@ function read_po_header($order_no, &$order) $order->trans_type = ST_PURCHORDER; $order->order_no = $order_no; - + $order->set_supplier($myrow["supplier_id"], $myrow["supp_name"], $myrow["curr_code"], $myrow['tax_group_id'], $myrow["tax_included"], @$myrow["tax_algorithm"]); @@ -269,6 +269,8 @@ function get_sql_for_po_search_completed() AND porder.supplier_id = supplier.supplier_id AND location.loc_code = porder.into_stock_location "; + if (isset($_GET['supplier_id'])) + $sql .= "AND supplier.supplier_id=".@$_GET['supplier_id']." "; if (isset($order_number) && $order_number != "") { $sql .= "AND porder.reference LIKE ".db_escape('%'. $order_number . '%');