X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=purchasing%2Fincludes%2Fdb%2Fpo_db.inc;h=a097db4617c4bb4b63817b7fa34bc9cdda8b31a2;hb=fbf51ab0febfd0885620abcab8738339d156ff45;hp=d401f5e67ca612344195b5bea292938eb908f4d9;hpb=3cf9ab70d79ebd01b13b6cc0c9366ccb5b8c496a;p=fa-stable.git diff --git a/purchasing/includes/db/po_db.inc b/purchasing/includes/db/po_db.inc index d401f5e6..a097db46 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,21 @@ 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, prep_amount) 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_escape($po_obj->prep_amount). ")"; db_query($sql, "The purchase order header record could not be inserted"); @@ -61,6 +67,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 +78,17 @@ 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()).", + prep_amount=". db_escape($po_obj->prep_amount).", + 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 +100,28 @@ 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"); } +//_vd($po_obj->prepayments); + reallocate_payments($po_obj->order_no, ST_PURCHORDER, $po_obj->orig_order_date, $po_obj->get_trans_total(), $po_obj->prepayments); +//_vd($p = get_payments_for($po_obj->order_no, ST_PURCHORDER)); +//_vd(get_supp_trans($p[0]['trans_no_from'], $p[0]['trans_type_from'])); +//exit; + // 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, Today(), _("Updated.")); + hook_db_postwrite($po_obj, ST_PURCHORDER); commit_transaction(); return $po_obj->order_no; @@ -113,8 +131,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,17 +146,23 @@ 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"]; + $order->Comments = nl2br($myrow["comments"]); $order->Location = $myrow["into_stock_location"]; $order->supp_ref = $myrow["requisition_no"]; $order->reference = $myrow["reference"]; $order->delivery_address = $myrow["delivery_address"]; + $order->alloc = $myrow["alloc"]; + $order->prep_amount = $myrow["prep_amount"]; + $order->prepayments = get_payments_for($order_no, ST_PURCHORDER); return true; } @@ -233,7 +258,7 @@ function get_short_info($stock_id) return db_query($sql,"The stock details for " . $stock_id . " could not be retrieved"); } -function get_sql_for_po_search_completed() +function get_sql_for_po_search_completed($supplier_id=ALL_TEXT) { global $order_number, $selected_stock_item;; @@ -255,6 +280,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 . '%'); @@ -276,14 +303,16 @@ function get_sql_for_po_search_completed() { $sql .= " AND line.item_code=".db_escape($selected_stock_item); } - + if ($supplier_id != ALL_TEXT) + $sql .= " AND supplier.supplier_id=".db_escape($supplier_id); + } //end not order number selected $sql .= " GROUP BY porder.order_no"; return $sql; } -function get_sql_for_po_search() +function get_sql_for_po_search($supplier_id=ALL_TEXT) { global $all_items, $order_number, $selected_stock_item;; @@ -329,9 +358,12 @@ function get_sql_for_po_search() { $sql .= " AND line.item_code=".db_escape($selected_stock_item); } + if ($supplier_id != ALL_TEXT) + $sql .= " AND supplier.supplier_id=".db_escape($supplier_id); } //end not order number selected $sql .= " GROUP BY porder.order_no"; return $sql; } + ?> \ No newline at end of file