X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=purchasing%2Fincludes%2Fdb%2Fgrn_db.inc;h=a73efa6fcc3e20a36384adb62991815bd5ce71d2;hb=90533b5a9a1a5e337b657e3e3fc251149d489fab;hp=88cab62e602184295d54b92301134e49931df150;hpb=735b37b5d5be8650936a76a670b0aaa9c16dbf0e;p=fa-stable.git diff --git a/purchasing/includes/db/grn_db.inc b/purchasing/includes/db/grn_db.inc index 88cab62e..a73efa6f 100644 --- a/purchasing/includes/db/grn_db.inc +++ b/purchasing/includes/db/grn_db.inc @@ -1,67 +1,132 @@ . +***********************************************************************/ +//------------------- update average material cost ------------------------------------------ Joe Hunt Mar-03-2008 +function update_average_material_cost($supplier, $stock_id, $price, $qty, $date, $adj_only=false) +{ + // probably this function should be optimized + // passing transaction cart as argument. This would + // save a couple of db calls like get_supplier() + + $supp = get_supplier($supplier); + if ($supplier != null) + $currency = $supp['curr_code']; + else + $currency = null; + + if ($supp['tax_included']) + $price = get_tax_free_price_for_item($stock_id, $price, $supp['tax_group_id'], + $supp['tax_included']); + + $dec = user_price_dec(); + price_decimal_format($price, $dec); + $price = round2($price, $dec); + if ($currency != null) + { + $ex_rate = get_exchange_rate_to_home_currency($currency, $date); + $price_in_home_currency = $price / $ex_rate; + } + 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; + $cost_adjust = false; + //$qoh = get_qoh_on_date($stock_id, null, $date, $exclude); + $qoh = get_qoh_on_date($stock_id); + + if ($adj_only) + { + if ($qoh > 0) + $material_cost = ($qoh * $material_cost + $qty * $price_in_home_currency) / $qoh; + } + else + { + if ($qoh < 0) + { + if ($qoh + $qty > 0) + $cost_adjust = true; + $qoh = 0; + } + if ($qoh + $qty != 0) + $material_cost = ($qoh * $material_cost + $qty * $price_in_home_currency) / ($qoh + $qty); + } + //$material_cost = round2($material_cost, $dec); + + if ($cost_adjust) // new 2010-02-10 + adjust_deliveries($stock_id, $material_cost, $date); + $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_); + $grn = add_grn_batch($po->order_no, $po->supplier_id, $po->reference, $po->Location, $date_); - foreach ($po->line_items as $order_line) + foreach ($po->line_items as $line_no => $order_line) { 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*/ - + //------------------- 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); } - - //------------------- update average material cost ------------------------------------------ Joe Hunt Mar-03-2008 - $currency = get_supplier_currency($po->supplier_id); - if ($currency != null) - $price_in_home_currency = to_home_currency($order_line->price, $currency, $date_); - else - $price_in_home_currency = $order_line->price; - $sql = "SELECT material_cost FROM ".TB_PREF."stock_master WHERE stock_id='$order_line->stock_id'"; - $result = db_query($sql); - $myrow = db_fetch($result); - $material_cost = $myrow['material_cost']; - $qoh = get_qoh_on_date($order_line->stock_id, null, $date_); - if ($qoh + $order_line->receive_qty <= 0) - $material_cost = 0; - else - $material_cost = ($qoh * $material_cost + $order_line->receive_qty * $price_in_home_currency) / - ($qoh + $order_line->receive_qty); - $sql = "UPDATE ".TB_PREF."stock_master SET material_cost=$material_cost - WHERE stock_id='$order_line->stock_id'"; - db_query($sql,"The cost details for the inventory item could not be updated"); - //---------------------------------------------------------------------------------------------------------------- + // 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); + $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); } /*quantity received is != 0 */ } /*end of order_line loop */ - add_forms_for_sys_type(25, $grn, $location); + $Refs->save(ST_SUPPRECEIVE, $grn, $po->reference); - references::save_last($reference, 25); + add_audit_trail(ST_SUPPRECEIVE, $grn, $date_); commit_transaction(); @@ -75,7 +140,8 @@ 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')"; + 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."); @@ -85,17 +151,20 @@ function add_grn_batch($po_number, $supplier_id, $reference, $location, $date_) //------------------------------------------------------------------------------------------------------------- function add_grn_detail_item($grn_batch_id, $po_detail_item, $item_code, $description, $standard_unit_cost, - $quantity_received) + $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"; + 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)"; + 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."); @@ -103,19 +172,80 @@ function add_grn_detail_item($grn_batch_id, $po_detail_item, $item_code, $descri } //---------------------------------------------------------------------------------------- +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_items($grn_batch_id=0, $supplier_id="", $outstanding_only=false, - $is_invoiced_only=false) +function get_grn_batch($grn) { - $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 + $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.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=".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 "); + + //$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"; + 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"; @@ -124,7 +254,7 @@ function get_grn_items($grn_batch_id=0, $supplier_id="", $outstanding_only=false $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"; @@ -143,7 +273,7 @@ function get_grn_item_detail($grn_item_no) 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); @@ -170,12 +300,12 @@ function read_grn_items_to_order($grn_batch, &$order) $units = $myrow["units"]; } - $order->add_to_order($order->lines_on_order+1, $myrow["item_code"], + $order->add_to_order($order->lines_on_order, $myrow["item_code"], 1,$myrow["description"], $myrow["unit_price"],$units, sql2date($myrow["delivery_date"]), $myrow["quantity_inv"], $myrow["qty_recd"]); - $order->line_items[$order->lines_on_order]->po_detail_rec = $myrow["po_detail_item"]; + $order->line_items[$order->lines_on_order-1]->po_detail_rec = $myrow["po_detail_item"]; } /* line po from purchase order details */ } //end of checks on returned data set } @@ -186,7 +316,7 @@ 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"; + $sql= "SELECT * FROM ".TB_PREF."grn_batch WHERE id=".db_escape($grn_batch); $result = db_query($sql, "The grn sent is not valid"); @@ -212,7 +342,7 @@ 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"); } @@ -221,7 +351,7 @@ function get_po_grns($po_number) function exists_grn($grn_batch) { - $sql = "SELECT id FROM ".TB_PREF."grn_batch WHERE id=$grn_batch"; + $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); @@ -234,7 +364,7 @@ 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); @@ -251,8 +381,8 @@ function void_grn($grn_batch) 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); @@ -273,12 +403,12 @@ function void_grn($grn_batch) // 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"; + 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();