X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=purchasing%2Fincludes%2Fdb%2Fpo_db.inc;h=45810f1da0b9050b430457a06aaf3f0d64cb0370;hb=9a98bb3bc7a94f1a8e47f8dab45a87c8b4212080;hp=a9cb932718ad7eacf7f3aa02decf55a49d3a6906;hpb=84e2f869630484bd9380e5c30647a483bce14d1e;p=fa-stable.git diff --git a/purchasing/includes/db/po_db.inc b/purchasing/includes/db/po_db.inc index a9cb9327..45810f1d 100644 --- a/purchasing/includes/db/po_db.inc +++ b/purchasing/includes/db/po_db.inc @@ -13,6 +13,7 @@ function delete_po($po) { + hook_db_prevoid($po, ST_PURCHORDER); $sql = "DELETE FROM ".TB_PREF."purch_orders WHERE order_no=".db_escape($po); db_query($sql, "The order header could not be deleted"); @@ -27,16 +28,20 @@ function add_po(&$po_obj) global $Refs; begin_transaction(); + hook_db_prewrite($po_obj, ST_PURCHORDER); /*Insert to purchase order header record */ - $sql = "INSERT INTO ".TB_PREF."purch_orders (supplier_id, Comments, ord_date, reference, requisition_no, into_stock_location, delivery_address) VALUES("; + $sql = "INSERT INTO ".TB_PREF."purch_orders (supplier_id, Comments, ord_date, reference, + requisition_no, into_stock_location, delivery_address, total, tax_included) VALUES("; $sql .= db_escape($po_obj->supplier_id) . "," . db_escape($po_obj->Comments) . ",'" . date2sql($po_obj->orig_order_date) . "', " . db_escape($po_obj->reference) . ", " . db_escape($po_obj->supp_ref) . ", " . db_escape($po_obj->Location) . ", " . - db_escape($po_obj->delivery_address) . ")"; + db_escape($po_obj->delivery_address) . ", " . + db_escape($po_obj->get_trans_total()). ", " . + db_escape($po_obj->tax_included) . ")"; db_query($sql, "The purchase order header record could not be inserted"); @@ -61,6 +66,7 @@ function add_po(&$po_obj) //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); + hook_db_postwrite($po_obj, ST_PURCHORDER); commit_transaction(); return $po_obj->order_no; @@ -71,13 +77,16 @@ function add_po(&$po_obj) function update_po(&$po_obj) { begin_transaction(); + hook_db_prewrite($po_obj, ST_PURCHORDER); /*Update the purchase order header with any changes */ $sql = "UPDATE ".TB_PREF."purch_orders SET Comments=" . db_escape($po_obj->Comments) . ", requisition_no= ". db_escape( $po_obj->supp_ref). ", into_stock_location=" . db_escape($po_obj->Location). ", ord_date='" . date2sql($po_obj->orig_order_date) . "', - delivery_address=" . db_escape($po_obj->delivery_address); + delivery_address=" . db_escape($po_obj->delivery_address).", + total=". db_escape($po_obj->get_trans_total()).", + tax_included=". db_escape($po_obj->tax_included); $sql .= " WHERE order_no = " . $po_obj->order_no; db_query($sql, "The purchase order could not be updated"); @@ -89,21 +98,22 @@ 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($po_obj->trans_type, $po_obj->order_no, $po_obj->document_date, _("Updated.")); + add_audit_trail($po_obj->trans_type, $po_obj->order_no, Today(), _("Updated.")); + hook_db_postwrite($po_obj, ST_PURCHORDER); commit_transaction(); return $po_obj->order_no; @@ -113,8 +123,9 @@ function update_po(&$po_obj) function read_po_header($order_no, &$order) { - $sql = "SELECT ".TB_PREF."purch_orders.*, ".TB_PREF."suppliers.supp_name, - ".TB_PREF."suppliers.curr_code, ".TB_PREF."locations.location_name + $sql = "SELECT ".TB_PREF."purch_orders.*, " + .TB_PREF."suppliers.*, " + .TB_PREF."locations.location_name FROM ".TB_PREF."purch_orders, ".TB_PREF."suppliers, ".TB_PREF."locations WHERE ".TB_PREF."purch_orders.supplier_id = ".TB_PREF."suppliers.supplier_id AND ".TB_PREF."locations.loc_code = into_stock_location @@ -127,10 +138,13 @@ function read_po_header($order_no, &$order) $myrow = db_fetch($result); + $order->trans_type = ST_PURCHORDER; $order->order_no = $order_no; - $order->supplier_id = $myrow["supplier_id"]; - $order->supplier_name = $myrow["supp_name"]; - $order->curr_code = $myrow["curr_code"]; + + $order->set_supplier($myrow["supplier_id"], $myrow["supp_name"], $myrow["curr_code"], + $myrow['tax_group_id'], $myrow["tax_included"], @$myrow["tax_algorithm"]); + + $order->credit = get_current_supp_credit($order->supplier_id); $order->orig_order_date = sql2date($myrow["ord_date"]); $order->Comments = $myrow["comments"]; @@ -186,12 +200,15 @@ function read_po_items($order_no, &$order, $open_items_only=false) $units = $myrow["units"]; } - if ($order->add_to_order($order->lines_on_order+1, $myrow["item_code"], + if ($order->add_to_order($order->lines_on_order, $myrow["item_code"], $myrow["quantity_ordered"],$myrow["description"], $myrow["unit_price"],$units, sql2date($myrow["delivery_date"]), $myrow["qty_invoiced"], $myrow["quantity_received"])) { - $order->line_items[$order->lines_on_order]->po_detail_rec = $myrow["po_detail_item"]; - $order->line_items[$order->lines_on_order]->standard_cost = $myrow["std_cost_unit"]; /*Needed for receiving goods and GL interface */ + $newline = &$order->line_items[$order->lines_on_order-1]; + $newline->po_detail_rec = $myrow["po_detail_item"]; + $newline->standard_cost = $myrow["std_cost_unit"]; /*Needed for receiving goods and GL interface */ + // set for later GRN edition +// $newline->receive_qty = $newline->quantity - $newline->qty_dispatched; } } /* line po from purchase order details */ } //end of checks on returned data set @@ -252,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 . '%');