X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=purchasing%2Fincludes%2Fdb%2Fgrn_db.inc;h=07c53190804aa7a64c70381b405adc70fd25b5f4;hb=ddadb47f2620ce6902ad4694ce6512568862ba05;hp=90b5528af8cd89fde575b010ede2f18e5cd7bb96;hpb=5928cc0bb4164cfd1dfc77f279f6b12d7806294f;p=fa-stable.git diff --git a/purchasing/includes/db/grn_db.inc b/purchasing/includes/db/grn_db.inc index 90b5528a..07c53190 100644 --- a/purchasing/includes/db/grn_db.inc +++ b/purchasing/includes/db/grn_db.inc @@ -1,9 +1,60 @@ . +***********************************************************************/ +//------------------- 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; + if ($currency != null) + $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='$stock_id'"; + $result = db_query($sql); + $myrow = db_fetch($result); + $material_cost = $myrow['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 + $material_cost = ($qoh * $material_cost + $qty * $price_in_home_currency) / ($qoh + $qty); + + $sql = "UPDATE ".TB_PREF."stock_master SET material_cost=".db_escape($material_cost)." + WHERE stock_id='$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) { + global $Refs; + begin_transaction(); $grn = add_grn_batch($po->order_no, $po->supplier_id, $reference, $location, $date_); @@ -16,50 +67,37 @@ function add_grn(&$po, $date_, $reference, $location) /*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=".db_escape($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); /* 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, $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 */ - references::save_last($reference, 25); + $Refs->save(ST_SUPPRECEIVE, $grn, $reference); + + add_audit_trail(ST_SUPPRECEIVE, $grn, $date_); commit_transaction(); @@ -84,11 +122,12 @@ 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 + std_cost_unit=$standard_unit_cost, + act_price=$price WHERE po_detail_item = $po_detail_item"; db_query($sql, "a purchase order details record could not be updated. This receipt of goods has not been processed "); @@ -102,17 +141,72 @@ 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=$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=$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=$entered_grn->id + AND ".TB_PREF."grn_items.item_code='$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 + $entered_grn->this_quantity_inv, + quantity_ordered = quantity_ordered + $entered_grn->this_quantity_inv, + qty_invoiced = qty_invoiced + $entered_grn->this_quantity_inv, + std_cost_unit=$mcost, + act_price=$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+$entered_grn->this_quantity_inv, + quantity_inv=quantity_inv+$entered_grn->this_quantity_inv WHERE id=$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) + $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 "; - + 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 "; @@ -250,8 +344,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); @@ -277,7 +371,7 @@ function void_grn($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();