X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=purchasing%2Fincludes%2Fdb%2Fpo_db.inc;h=308e937ab632d8e6af59e2d50e4a8298951c2c1a;hb=d7bad8234ae701d84e132bb57b19814badd8b6c9;hp=ee2b7d8e38575b0a2dc92f737c88799cd6b3f51c;hpb=8ea6c4dd0d9b31b3456d012b0c94339b801bee0c;p=fa-stable.git diff --git a/purchasing/includes/db/po_db.inc b/purchasing/includes/db/po_db.inc index ee2b7d8e..308e937a 100644 --- a/purchasing/includes/db/po_db.inc +++ b/purchasing/includes/db/po_db.inc @@ -46,16 +46,13 @@ function add_po(&$po_obj) /*Insert the purchase order detail records */ foreach ($po_obj->line_items as $po_line) { - if ($po_line->Deleted == false) - { - $sql = "INSERT INTO ".TB_PREF."purch_order_details (order_no, item_code, description, delivery_date, unit_price, quantity_ordered) VALUES ("; - $sql .= $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_query($sql, "One of the purchase order detail records could not be inserted"); - } + $sql = "INSERT INTO ".TB_PREF."purch_order_details (order_no, item_code, description, delivery_date, unit_price, quantity_ordered) VALUES ("; + $sql .= $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_query($sql, "One of the purchase order detail records could not be inserted"); } $Refs->save(ST_PURCHORDER, $po_obj->order_no, $po_obj->reference); @@ -83,43 +80,29 @@ function update_po(&$po_obj) $sql .= " WHERE order_no = " . $po_obj->order_no; db_query($sql, "The purchase order could not be updated"); + $sql = "DELETE FROM ".TB_PREF."purch_order_details WHERE order_no=" + .db_escape($po_obj->order_no); + db_query($sql, "could not delete old purch order details"); + /*Now Update the purchase order detail records */ foreach ($po_obj->line_items as $po_line) { - - if ($po_line->Deleted==True) - { - // Sherifoz 21.06.03 Handle deleting existing lines - if ($po_line->po_detail_rec!='') - { - $sql = "DELETE FROM ".TB_PREF."purch_order_details WHERE po_detail_item=".db_escape($po_line->po_detail_rec); - db_query($sql, "could not query purch order details"); - } - } - else if ($po_line->po_detail_rec == '') - { - // Sherifoz 21.06.03 Handle adding new lines vs. updating. if no key(po_detail_rec) then it's a new line - $sql = "INSERT INTO ".TB_PREF."purch_order_details (order_no, item_code, description, delivery_date, unit_price, quantity_ordered) VALUES ("; - $sql .= $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) . ")"; - } - else - { - $sql = "UPDATE ".TB_PREF."purch_order_details SET item_code=".db_escape($po_line->stock_id).", - description =" . db_escape($po_line->item_description). ", - delivery_date ='" . date2sql($po_line->req_del_date) . "', - unit_price=".db_escape($po_line->price).", - quantity_ordered=".db_escape($po_line->quantity) . " - WHERE po_detail_item=".db_escape($po_line->po_detail_rec); - } + $sql = "INSERT INTO ".TB_PREF."purch_order_details (po_detail_item, order_no, item_code, + description, delivery_date, unit_price, quantity_ordered) 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_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_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.")); commit_transaction(); return $po_obj->order_no; @@ -183,10 +166,8 @@ function read_po_items($order_no, &$order, $open_items_only=false) if (db_num_rows($result) > 0) { - while ($myrow = db_fetch($result)) { - $data = get_purchase_data($order->supplier_id, $myrow['item_code']); if ($data !== false) { @@ -227,5 +208,126 @@ function read_po($order_no, &$order, $open_items_only=false) //---------------------------------------------------------------------------------------- +function get_po_items($order_no) +{ + $sql = "SELECT item_code, quantity_ordered, quantity_received, qty_invoiced + FROM ".TB_PREF."purch_order_details + WHERE order_no=".db_escape($order_no) + ." ORDER BY po_detail_item"; + + $result = db_query($sql, "could not query purch order details"); + check_db_error("Could not check that the details of the purchase order had not been changed by another user ", $sql); + return $result; +} +//---------------------------------------------------------------------------------------- + +function get_short_info($stock_id) +{ + $sql = "SELECT description, units, mb_flag + FROM ".TB_PREF."stock_master WHERE stock_id = ".db_escape($stock_id); + + return db_query($sql,"The stock details for " . $stock_id . " could not be retrieved"); +} + +function get_sql_for_po_search_completed() +{ + global $order_number, $selected_stock_item;; + + $sql = "SELECT + porder.order_no, + porder.reference, + supplier.supp_name, + location.location_name, + porder.requisition_no, + porder.ord_date, + supplier.curr_code, + Sum(line.unit_price*line.quantity_ordered) AS OrderValue, + porder.into_stock_location + FROM ".TB_PREF."purch_orders as porder, " + .TB_PREF."purch_order_details as line, " + .TB_PREF."suppliers as supplier, " + .TB_PREF."locations as location + WHERE porder.order_no = line.order_no + AND porder.supplier_id = supplier.supplier_id + AND location.loc_code = porder.into_stock_location "; + + if (isset($order_number) && $order_number != "") + { + $sql .= "AND porder.reference LIKE ".db_escape('%'. $order_number . '%'); + } + else + { + + $data_after = date2sql($_POST['OrdersAfterDate']); + $date_before = date2sql($_POST['OrdersToDate']); + + $sql .= " AND porder.ord_date >= '$data_after'"; + $sql .= " AND porder.ord_date <= '$date_before'"; + + if (isset($_POST['StockLocation']) && $_POST['StockLocation'] != ALL_TEXT) + { + $sql .= " AND porder.into_stock_location = ".db_escape($_POST['StockLocation']); + } + if (isset($selected_stock_item)) + { + $sql .= " AND line.item_code=".db_escape($selected_stock_item); + } + + } //end not order number selected + + $sql .= " GROUP BY porder.order_no"; + return $sql; +} + +function get_sql_for_po_search() +{ + global $all_items, $order_number, $selected_stock_item;; + + $sql = "SELECT + porder.order_no, + porder.reference, + supplier.supp_name, + location.location_name, + porder.requisition_no, + porder.ord_date, + supplier.curr_code, + Sum(line.unit_price*line.quantity_ordered) AS OrderValue, + Sum(line.delivery_date < '". date2sql(Today()) ."' + AND (line.quantity_ordered > line.quantity_received)) As OverDue + FROM " + .TB_PREF."purch_orders as porder, " + .TB_PREF."purch_order_details as line, " + .TB_PREF."suppliers as supplier, " + .TB_PREF."locations as location + WHERE porder.order_no = line.order_no + AND porder.supplier_id = supplier.supplier_id + AND location.loc_code = porder.into_stock_location + AND (line.quantity_ordered > line.quantity_received) "; + + if (isset($order_number) && $order_number != "") + { + $sql .= "AND porder.reference LIKE ".db_escape('%'. $order_number . '%'); + } + else + { + $data_after = date2sql($_POST['OrdersAfterDate']); + $data_before = date2sql($_POST['OrdersToDate']); + + $sql .= " AND porder.ord_date >= '$data_after'"; + $sql .= " AND porder.ord_date <= '$data_before'"; + + if (isset($_POST['StockLocation']) && $_POST['StockLocation'] != $all_items) + { + $sql .= " AND porder.into_stock_location = ".db_escape($_POST['StockLocation']); + } + + if (isset($selected_stock_item)) + { + $sql .= " AND line.item_code=".db_escape($selected_stock_item); + } + } //end not order number selected + $sql .= " GROUP BY porder.order_no"; + return $sql; +} ?> \ No newline at end of file