X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=purchasing%2Fincludes%2Fdb%2Fgrn_db.inc;h=54134532d0c134afb54455d79ff4174321e7a09c;hb=84e2f869630484bd9380e5c30647a483bce14d1e;hp=b6738fe0041306ee26c9f5f5cb9b2cc9c26784cd;hpb=da8311619dd73feae101d246a1957b972e00cbd2;p=fa-stable.git diff --git a/purchasing/includes/db/grn_db.inc b/purchasing/includes/db/grn_db.inc index b6738fe0..54134532 100644 --- a/purchasing/includes/db/grn_db.inc +++ b/purchasing/includes/db/grn_db.inc @@ -1,49 +1,120 @@ . +***********************************************************************/ +//------------------- update average material cost ------------------------------------------ Joe Hunt Mar-03-2008 + +function update_average_material_cost($supplier, $stock_id, $price, $qty, $date, $adj_only=false) +{ + if ($supplier != null) + $currency = get_supplier_currency($supplier); + else + $currency = null; + $dec = user_price_dec(); + $price = price_decimal_format($price, $dec); + if ($currency != null) + { + $ex_rate = get_exchange_rate_to_home_currency($currency, $date); + $price_in_home_currency = $price / $ex_rate; + //$price_in_home_currency = to_home_currency($price, $currency, $date); + } + else + $price_in_home_currency = $price; + $sql = "SELECT material_cost FROM ".TB_PREF."stock_master WHERE stock_id=".db_escape($stock_id); + $result = db_query($sql); + $myrow = db_fetch($result); + $material_cost = $myrow['material_cost']; + if ($price > -0.0001 && $price < 0.0001) + return $material_cost; + if ($adj_only) + $exclude = ST_CUSTDELIVERY; + else + $exclude = 0; + $qoh = get_qoh_on_date($stock_id, null, $date, $exclude); + if ($adj_only) + { + if ($qoh <= 0) + $material_cost = 0; + else + $material_cost = ($qoh * $material_cost + $qty * $price_in_home_currency) / $qoh; + } + elseif ($qoh + $qty <= 0) + $material_cost = 0; + else + { + if ($qoh < 0) + $qoh = 0; + $material_cost = ($qoh * $material_cost + $qty * $price_in_home_currency) / ($qoh + $qty); + } + $material_cost = round2($material_cost, $dec); + + $sql = "UPDATE ".TB_PREF."stock_master SET material_cost=".db_escape($material_cost)." + WHERE stock_id=".db_escape($stock_id); + db_query($sql,"The cost details for the inventory item could not be updated"); + return $material_cost; +} //------------------------------------------------------------------------------------------------------------- -function add_grn(&$po, $date_, $reference, $location) +function add_grn(&$po) { + global $Refs; + + $date_ = $po->orig_order_date; + begin_transaction(); - - $grn = add_grn_batch($po->order_no, $po->supplier_id, $reference, $location, $date_); - - foreach ($po->line_items as $order_line) + + $grn = add_grn_batch($po->order_no, $po->supplier_id, $po->reference, $po->Location, $date_); + + foreach ($po->line_items as $line_no => $order_line) { - if ($order_line->receive_qty != 0 && $order_line->receive_qty != "" && isset($order_line->receive_qty)) + if ($order_line->receive_qty != 0 && $order_line->receive_qty != "" && isset($order_line->receive_qty)) { - - /*Update sales_order_details for the new quantity received and the standard cost used for postings to GL and recorded in the stock movements for FIFO/LIFO stocks valuations*/ - if ($order_line->qty_received == 0) - { + /*Update sales_order_details for the new quantity received and the standard cost used for postings to GL and recorded in the stock movements for FIFO/LIFO stocks valuations*/ + //------------------- update average material cost ------------------------------------------ Joe Hunt Mar-03-2008 + update_average_material_cost($po->supplier_id, $order_line->stock_id, $order_line->price, + $order_line->receive_qty, $date_); + //---------------------------------------------------------------------------------------------------------------- + if ($order_line->qty_received == 0) + { /*This must be the first receipt of goods against this line */ - /*Need to get the standard cost as it is now so we can process GL jorunals later*/ - $order_line->standard_cost = get_standard_cost($order_line->stock_id); + /*Need to get the standard cost as it is now so we can process GL jorunals later*/ + $order_line->standard_cost = get_standard_cost($order_line->stock_id); } + // added 2008-12-08 Joe Hunt. Update the purchase data table + add_or_update_purchase_data($po->supplier_id, $order_line->stock_id, $order_line->price, + $order_line->item_description); /*Need to insert a grn item */ - - $grn_item = add_grn_detail_item($grn, $order_line->po_detail_rec, - $order_line->stock_id, $order_line->item_description, - $order_line->standard_cost, $order_line->receive_qty); + $grn_item = add_grn_detail_item($grn, $order_line->po_detail_rec, + $order_line->stock_id, $order_line->item_description, + $order_line->standard_cost, $order_line->receive_qty, $order_line->price); + + $po->line_items[$line_no]->grn_item_id = $grn_item; /* Update location stock records - NB a po cannot be entered for a service/kit parts */ - - add_stock_move(25, $order_line->stock_id, $grn, $location, $date_, "", + add_stock_move(ST_SUPPRECEIVE, $order_line->stock_id, $grn, $po->Location, $date_, "", $order_line->receive_qty, $order_line->standard_cost, - $po->supplier_id, 1, $order_line->price); - + $po->supplier_id, 1, $order_line->price); + } /*quantity received is != 0 */ } /*end of order_line loop */ - - add_forms_for_sys_type(25, $grn, $location); - - references::save_last($reference, 25); - + + $Refs->save(ST_SUPPRECEIVE, $grn, $po->reference); + + add_audit_trail(ST_SUPPRECEIVE, $grn, $date_); + commit_transaction(); - + return $grn; } @@ -52,61 +123,126 @@ function add_grn(&$po, $date_, $reference, $location) function add_grn_batch($po_number, $supplier_id, $reference, $location, $date_) { $date = date2sql($date_); - - $sql = "INSERT INTO ".TB_PREF."grn_batch (purch_order_no, delivery_date, supplier_id, reference, loc_code) - VALUES ($po_number, '$date', '$supplier_id', '$reference', '$location')"; + + $sql = "INSERT INTO ".TB_PREF."grn_batch (purch_order_no, delivery_date, supplier_id, reference, loc_code) + VALUES (".db_escape($po_number).", ".db_escape($date).", " + .db_escape($supplier_id).", ".db_escape($reference).", ".db_escape($location).")"; db_query($sql, "A grn batch record could not be inserted."); - - return db_insert_id(); + + return db_insert_id(); } //------------------------------------------------------------------------------------------------------------- -function add_grn_detail_item($grn_batch_id, $po_detail_item, $item_code, $description, $standard_unit_cost, - $quantity_received) +function add_grn_detail_item($grn_batch_id, $po_detail_item, $item_code, $description, $standard_unit_cost, + $quantity_received, $price) { - $sql = "UPDATE ".TB_PREF."purch_order_details - SET quantity_received = quantity_received + $quantity_received, - std_cost_unit=$standard_unit_cost - WHERE po_detail_item = $po_detail_item"; - + $sql = "UPDATE ".TB_PREF."purch_order_details + SET quantity_received = quantity_received + ".db_escape($quantity_received).", + std_cost_unit=".db_escape($standard_unit_cost).", + act_price=".db_escape($price)." + WHERE po_detail_item = ".db_escape($po_detail_item); + db_query($sql, "a purchase order details record could not be updated. This receipt of goods has not been processed "); - - $sql = "INSERT INTO ".TB_PREF."grn_items (grn_batch_id, po_detail_item, item_code, description, qty_recd) - VALUES ($grn_batch_id, $po_detail_item, '$item_code', '$description', $quantity_received)"; + + $sql = "INSERT INTO ".TB_PREF."grn_items (grn_batch_id, po_detail_item, item_code, description, qty_recd) + VALUES (".db_escape($grn_batch_id).", " + .db_escape($po_detail_item).", ".db_escape($item_code).", ".db_escape($description) + .", ".db_escape($quantity_received).")"; db_query($sql, "A GRN detail item could not be inserted."); - + return db_insert_id(); } //---------------------------------------------------------------------------------------- +function get_grn_batch_from_item($item) +{ + $sql = "SELECT grn_batch_id FROM ".TB_PREF."grn_items WHERE id=".db_escape($item); + $result = db_query($sql, "Could not retreive GRN batch id"); + $row = db_fetch_row($result); + return $row[0]; +} + +function get_grn_batch($grn) +{ + $sql = "SELECT * FROM ".TB_PREF."grn_batch WHERE id=".db_escape($grn); + $result = db_query($sql, "Could not retreive GRN batch id"); + return db_fetch($result); +} + +function set_grn_item_credited(&$entered_grn, $supplier, $transno, $date) +{ + $mcost = update_average_material_cost($supplier, $entered_grn->item_code, + $entered_grn->chg_price, $entered_grn->this_quantity_inv, $date); + + $sql = "SELECT ".TB_PREF."grn_batch.*, ".TB_PREF."grn_items.* + FROM ".TB_PREF."grn_batch, ".TB_PREF."grn_items + WHERE ".TB_PREF."grn_items.grn_batch_id=".TB_PREF."grn_batch.id + AND ".TB_PREF."grn_items.id=".db_escape($entered_grn->id)." + AND ".TB_PREF."grn_items.item_code=".db_escape($entered_grn->item_code); + $result = db_query($sql, "Could not retreive GRNS"); + $myrow = db_fetch($result); + + $sql = "UPDATE ".TB_PREF."purch_order_details + SET quantity_received = quantity_received + " + .db_escape($entered_grn->this_quantity_inv).", + quantity_ordered = quantity_ordered + " + .db_escape($entered_grn->this_quantity_inv).", + qty_invoiced = qty_invoiced + ".db_escape($entered_grn->this_quantity_inv).", + std_cost_unit=".db_escape($mcost).", + act_price=".db_escape($entered_grn->chg_price)." + WHERE po_detail_item = ".$myrow["po_detail_item"]; + db_query($sql, "a purchase order details record could not be updated. This receipt of goods has not been processed "); -function get_grn_items($grn_batch_id=0, $supplier_id="", $outstanding_only=false, - $is_invoiced_only=false) + //$sql = "UPDATE ".TB_PREF."grn_items SET qty_recd=0, quantity_inv=0 WHERE id=$entered_grn->id"; + $sql = "UPDATE ".TB_PREF."grn_items SET qty_recd=qty_recd+".db_escape($entered_grn->this_quantity_inv) + .",quantity_inv=quantity_inv+".db_escape($entered_grn->this_quantity_inv) + ." WHERE id=".db_escape($entered_grn->id); + db_query($sql); + + add_stock_move(ST_SUPPCREDIT, $entered_grn->item_code, $transno, $myrow['loc_code'], $date, "", + $entered_grn->this_quantity_inv, $mcost, $supplier, 1, $entered_grn->chg_price); +} + +function get_grn_items($grn_batch_id=0, $supplier_id="", $outstanding_only=false, + $is_invoiced_only=false, $invoice_no=0, $begin="", $end="") { - $sql = "SELECT ".TB_PREF."grn_batch.*, ".TB_PREF."grn_items.*, ".TB_PREF."purch_order_details.unit_price, - ".TB_PREF."purch_order_details.std_cost_unit, units - FROM ".TB_PREF."grn_batch, ".TB_PREF."grn_items, ".TB_PREF."purch_order_details, ".TB_PREF."stock_master - WHERE ".TB_PREF."grn_items.grn_batch_id=".TB_PREF."grn_batch.id - AND ".TB_PREF."grn_items.po_detail_item=".TB_PREF."purch_order_details.po_detail_item - AND ".TB_PREF."stock_master.stock_id=".TB_PREF."grn_items.item_code "; - + $sql = "SELECT ".TB_PREF."grn_batch.*, ".TB_PREF."grn_items.*, " + .TB_PREF."purch_order_details.unit_price, + ".TB_PREF."purch_order_details.std_cost_unit, units + FROM ".TB_PREF."grn_batch, ".TB_PREF."grn_items, " + .TB_PREF."purch_order_details, ".TB_PREF."stock_master"; + if ($invoice_no != 0) + $sql .= ", ".TB_PREF."supp_invoice_items"; + $sql .= " WHERE ".TB_PREF."grn_items.grn_batch_id=".TB_PREF."grn_batch.id + AND ".TB_PREF."grn_items.po_detail_item=".TB_PREF."purch_order_details.po_detail_item"; + if ($invoice_no != 0) + $sql .= " AND ".TB_PREF."supp_invoice_items.supp_trans_type=".ST_SUPPINVOICE." AND + ".TB_PREF."supp_invoice_items.supp_trans_no=$invoice_no AND + ".TB_PREF."grn_items.id=".TB_PREF."supp_invoice_items.grn_item_id"; + $sql .= " AND ".TB_PREF."stock_master.stock_id=".TB_PREF."grn_items.item_code "; + + if ($begin != "") + $sql .= " AND ".TB_PREF."grn_batch.delivery_date>='".date2sql($begin)."'"; + if ($end != "") + $sql .= " AND ".TB_PREF."grn_batch.delivery_date<='".date2sql($end)."'"; if ($grn_batch_id != 0) - $sql .= " AND ".TB_PREF."grn_batch.id=$grn_batch_id AND ".TB_PREF."grn_items.grn_batch_id=$grn_batch_id "; - + $sql .= " AND ".TB_PREF."grn_batch.id=".db_escape($grn_batch_id) + ." AND ".TB_PREF."grn_items.grn_batch_id=".db_escape($grn_batch_id); + if ($is_invoiced_only) $sql .= " AND ".TB_PREF."grn_items.quantity_inv > 0"; - + if ($outstanding_only) - $sql .= " AND ".TB_PREF."grn_items.qty_recd - ".TB_PREF."grn_items.quantity_inv > 0"; - + $sql .= " AND ".TB_PREF."grn_items.qty_recd - ".TB_PREF."grn_items.quantity_inv > 0"; + if ($supplier_id != "") - $sql .= " AND ".TB_PREF."grn_batch.supplier_id ='$supplier_id' "; - + $sql .= " AND ".TB_PREF."grn_batch.supplier_id =".db_escape($supplier_id); + $sql .= " ORDER BY ".TB_PREF."grn_batch.delivery_date, ".TB_PREF."grn_batch.id, ".TB_PREF."grn_items.id"; - + return db_query($sql, "Could not retreive GRNS"); } @@ -116,42 +252,42 @@ function get_grn_items($grn_batch_id=0, $supplier_id="", $outstanding_only=false function get_grn_item_detail($grn_item_no) { - $sql = "SELECT ".TB_PREF."grn_items.*, ".TB_PREF."purch_order_details.unit_price, - ".TB_PREF."grn_items.qty_recd - ".TB_PREF."grn_items.quantity_inv AS QtyOstdg, + $sql = "SELECT ".TB_PREF."grn_items.*, ".TB_PREF."purch_order_details.unit_price, + ".TB_PREF."grn_items.qty_recd - ".TB_PREF."grn_items.quantity_inv AS QtyOstdg, ".TB_PREF."purch_order_details.std_cost_unit - FROM ".TB_PREF."grn_items, ".TB_PREF."purch_order_details, ".TB_PREF."stock_master + FROM ".TB_PREF."grn_items, ".TB_PREF."purch_order_details, ".TB_PREF."stock_master WHERE ".TB_PREF."grn_items.po_detail_item=".TB_PREF."purch_order_details.po_detail_item AND ".TB_PREF."stock_master.stock_id=".TB_PREF."grn_items.item_code - AND ".TB_PREF."grn_items.id=$grn_item_no"; - + AND ".TB_PREF."grn_items.id=".db_escape($grn_item_no); + $result = db_query($sql, "could not retreive grn item details"); return db_fetch($result); -} - -//---------------------------------------------------------------------------------------- +} + +//---------------------------------------------------------------------------------------- function read_grn_items_to_order($grn_batch, &$order) { - $result = get_grn_items($grn_batch); + $result = get_grn_items($grn_batch); - if (db_num_rows($result) > 0) + if (db_num_rows($result) > 0) { - while ($myrow = db_fetch($result)) + while ($myrow = db_fetch($result)) { if (is_null($myrow["units"])) { $units = ""; - } - else + } + else { $units = $myrow["units"]; } - $order->add_to_order($order->lines_on_order+1, $myrow["item_code"], + $order->add_to_order($order->lines_on_order+1, $myrow["item_code"], 1,$myrow["description"], $myrow["unit_price"],$units, - sql2date($myrow["delivery_date"]), $myrow["quantity_inv"], + sql2date($myrow["delivery_date"]), $myrow["quantity_inv"], $myrow["qty_recd"]); $order->line_items[$order->lines_on_order]->po_detail_rec = $myrow["po_detail_item"]; @@ -165,24 +301,24 @@ function read_grn_items_to_order($grn_batch, &$order) function read_grn($grn_batch, &$order) { - $sql= "SELECT * FROM ".TB_PREF."grn_batch WHERE id=$grn_batch"; - - $result = db_query($sql, "The grn sent is not valid"); + $sql= "SELECT * FROM ".TB_PREF."grn_batch WHERE id=".db_escape($grn_batch); + + $result = db_query($sql, "The grn sent is not valid"); + + $row = db_fetch($result); + $po_number = $row["purch_order_no"]; - $row = db_fetch($result); - $po_number = $row["purch_order_no"]; - $result = read_po_header($po_number, $order); - - if ($result) + + if ($result) { - + $order->orig_order_date = sql2date($row["delivery_date"]); $order->location = $row["loc_code"]; - $order->reference = $row["reference"]; - + $order->reference = $row["reference"]; + read_grn_items_to_order($grn_batch, $order); - } + } } //---------------------------------------------------------------------------------------------------------- @@ -191,8 +327,8 @@ function read_grn($grn_batch, &$order) function get_po_grns($po_number) { - $sql = "SELECT * FROM ".TB_PREF."grn_batch WHERE purch_order_no=$po_number"; - + $sql = "SELECT * FROM ".TB_PREF."grn_batch WHERE purch_order_no=".db_escape($po_number); + return db_query($sql, "The grns for the po $po_number could not be retreived"); } @@ -200,10 +336,10 @@ function get_po_grns($po_number) function exists_grn($grn_batch) { - $sql = "SELECT id FROM ".TB_PREF."grn_batch WHERE id=$grn_batch"; - $result = db_query($sql, "Cannot retreive a grn"); - - return (db_num_rows($result) > 0); + $sql = "SELECT id FROM ".TB_PREF."grn_batch WHERE id=".db_escape($grn_batch); + $result = db_query($sql, "Cannot retreive a grn"); + + return (db_num_rows($result) > 0); } //---------------------------------------------------------------------------------------------------------- @@ -213,10 +349,10 @@ function exists_grn_on_invoices($grn_batch) $sql = "SELECT ".TB_PREF."supp_invoice_items.id FROM ".TB_PREF."supp_invoice_items,".TB_PREF."grn_items WHERE ".TB_PREF."supp_invoice_items.grn_item_id=".TB_PREF."grn_items.id AND quantity != 0 - AND grn_batch_id=$grn_batch"; + AND grn_batch_id=".db_escape($grn_batch); $result = db_query($sql, "Cannot query GRNs"); - - return (db_num_rows($result) > 0); + + return (db_num_rows($result) > 0); } //---------------------------------------------------------------------------------------------------------- @@ -227,40 +363,40 @@ function void_grn($grn_batch) // can't be voided if (exists_grn_on_invoices($grn_batch)) return false; - + begin_transaction(); - - void_bank_trans(25, $grn_batch, true); - void_gl_trans(25, $grn_batch, true); - + + void_bank_trans(ST_SUPPRECEIVE, $grn_batch, true); + void_gl_trans(ST_SUPPRECEIVE, $grn_batch, true); + // clear the quantities of the grn items in the POs and invoices $result = get_grn_items($grn_batch); - - if (db_num_rows($result) > 0) + + if (db_num_rows($result) > 0) { - - while ($myrow = db_fetch($result)) + + while ($myrow = db_fetch($result)) { - - $sql = "UPDATE ".TB_PREF."purch_order_details - SET quantity_received = quantity_received - " . $myrow["qty_recd"] . " + + $sql = "UPDATE ".TB_PREF."purch_order_details + SET quantity_received = quantity_received - " . $myrow["qty_recd"] . " WHERE po_detail_item = " . $myrow["po_detail_item"]; - + db_query($sql, "a purchase order details record could not be voided."); } - } - - // clear the quantities in the grn items - $sql = "UPDATE ".TB_PREF."grn_items SET qty_recd=0, quantity_inv=0 - WHERE grn_batch_id=$grn_batch"; - - db_query($sql, "A grn detail item could not be voided."); - + } + + // clear the quantities in the grn items + $sql = "UPDATE ".TB_PREF."grn_items SET qty_recd=0, quantity_inv=0 + WHERE grn_batch_id=".db_escape($grn_batch); + + db_query($sql, "A grn detail item could not be voided."); + // clear the stock move items - void_stock_move(25, $grn_batch); - + void_stock_move(ST_SUPPRECEIVE, $grn_batch); + commit_transaction(); - + return true; }