X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=purchasing%2Fincludes%2Fdb%2Fgrn_db.inc;h=886e05fc5f5c2b3cb6082d740a06b0ab0c284172;hb=3178545262f658085cb8a250a2195246e05c8213;hp=7604568f8947b4754bd852d20e99514167a102c1;hpb=f821f29324e963437132a3f6fa7c57fcef5c5f0e;p=fa-stable.git diff --git a/purchasing/includes/db/grn_db.inc b/purchasing/includes/db/grn_db.inc index 7604568f..886e05fc 100644 --- a/purchasing/includes/db/grn_db.inc +++ b/purchasing/includes/db/grn_db.inc @@ -9,7 +9,9 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the License here . ***********************************************************************/ -//------------------- update average material cost ------------------------------------------ Joe Hunt Mar-03-2008 +/* + Update average inventory item cost. +*/ function update_average_material_cost($supplier, $stock_id, $price, $qty, $date, $adj_only=false) { // probably this function should be optimized @@ -23,7 +25,8 @@ function update_average_material_cost($supplier, $stock_id, $price, $qty, $date, $currency = null; if ($supp['tax_included']) - $price = get_tax_free_price_for_item($stock_id, $price, $supp['tax_group_id'], + $price = get_tax_free_price_for_item(ST_SUPPINVOICE, // ? + $stock_id, $price, $supp['tax_group_id'], $supp['tax_included']); if ($currency != null) @@ -36,36 +39,22 @@ function update_average_material_cost($supplier, $stock_id, $price, $qty, $date, $price_in_home_currency_ = $price_in_home_currency; - //Handle if inventory will become negative - //8-OCT-2011 : Skip negative inventory adjustment for case of adjust_only + // Handle if inventory will become negative + // Skip negative inventory adjustment for case of adjust_only if (is_inventory_item($stock_id) && !$adj_only) handle_negative_inventory($stock_id, $qty, $price_in_home_currency, $date); - - $sql = "SELECT mb_flag, material_cost, labour_cost, overhead_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']; - - //Price adjustment for manufactured item - if (!$adj_only && $myrow['mb_flag'] == 'M') - { - $standard_cost = get_standard_cost($stock_id); - //reduce overhead_cost and labour_cost from price as those will remain as is - $price_in_home_currency = $price_in_home_currency - $myrow['labour_cost'] - $myrow['overhead_cost']; - } - if ($adj_only) - $exclude = ST_CUSTDELIVERY; - else - $exclude = 0; - $cost_adjust = false; + $item = get_item($stock_id); + $avg_cost = $item['material_cost']; $qoh = get_qoh_on_date($stock_id); + $cost_adjust = false; + if ($adj_only) { if ($qoh > 0) - $material_cost = ($qoh * $material_cost + $qty * $price_in_home_currency) / $qoh; + $avg_cost = ($qoh * $avg_cost + $qty * $price_in_home_currency) / $qoh; } else { @@ -76,25 +65,29 @@ function update_average_material_cost($supplier, $stock_id, $price, $qty, $date, $qoh = 0; } if ($qoh + $qty > 0) - $material_cost = ($qoh * $material_cost + $qty * $price_in_home_currency) / ($qoh + $qty); + $avg_cost = ($qoh * $avg_cost + $qty * $price_in_home_currency) / ($qoh + $qty); } - if ($cost_adjust) // new 2010-02-10 //Chaitanya : Material_cost replaced with price + if ($cost_adjust) // Material_cost replaced with price adjust_deliveries($stock_id, $price_in_home_currency_, $date); - $sql = "UPDATE ".TB_PREF."stock_master SET material_cost=".db_escape($material_cost)." + + $sql = "UPDATE ".TB_PREF."stock_master SET material_cost=".db_escape($avg_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; + return $avg_cost; } //------------------------------------------------------------------------------------------------------------- - -function add_grn(&$po) +// +// Add or update GRN transaction. +// +function write_grn(&$po) { global $Refs; - $date_ = $po->orig_order_date; + $date_ = $po->tran_date; + $grn = $po->grn_id; begin_transaction(); hook_db_prewrite($po, ST_SUPPRECEIVE); @@ -108,58 +101,68 @@ function add_grn(&$po) } else $po->ex_rate = 1; - $grn = add_grn_batch($po->order_no, $po->supplier_id, $po->reference, $po->Location, $date_, $po->ex_rate); + if(!$grn) + $grn = add_grn_batch($po->order_no, $po->supplier_id, $po->reference, $po->Location, $date_, $po->ex_rate); + else { - $clearing_act = get_company_pref('grn_clearing_act'); - if ($clearing_act) { // otherwise GRN clearing account is not used - $total = 0; + update_grn_batch($grn, $po->reference, $po->Location, $date_); + + void_gl_trans(ST_SUPPRECEIVE, $grn, true); + void_stock_move(ST_SUPPRECEIVE, $grn); + void_trans_tax_details(ST_SUPPRECEIVE, $grn); + delete_comments(ST_SUPPRECEIVE, $grn); } + + $clearing_act = get_company_pref('grn_clearing_act'); + $total = 0; 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->quantity != 0) { $stock_gl_code = get_stock_gl_code($order_line->stock_id); - /*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 and clearing account ----- Joe Hunt Mar-03-2008 + /*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 and clearing account -------------------------------- if (is_inventory_item($order_line->stock_id)) { if ($clearing_act) $total += add_gl_trans_supplier(ST_SUPPRECEIVE, $grn, $date_, $stock_gl_code["inventory_account"], $stock_gl_code['dimension_id'], $stock_gl_code['dimension2_id'], - $order_line->receive_qty * $order_line->taxfree_charge_price($po), $po->supplier_id, '', 0, $order_line->stock_id); - update_average_material_cost($po->supplier_id, $order_line->stock_id, $order_line->price, - $order_line->receive_qty, $date_); + $order_line->taxfree_charge_value($po), $po->supplier_id, '', 0, $order_line->stock_id); + update_average_material_cost($po->supplier_id, $order_line->stock_id, $order_line->price, + $order_line->quantity, $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); + $order_line->unit_cost = get_unit_cost($order_line->stock_id); } - // added 2008-12-08 Joe Hunt. Update the purchase data table + // 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 */ // also need to check for over-receive.(within allowance) - if ($order_line->receive_qty + $order_line->qty_received > $order_line->quantity) - $order_line->quantity = $order_line->receive_qty + $order_line->qty_received; - $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, $order_line->quantity); + if ($order_line->quantity + $order_line->qty_received > $order_line->qty_ordered) + $order_line->qty_ordered = $order_line->quantity + $order_line->qty_received; + + $grn_item = write_grn_item($grn, $order_line->po_detail_rec, + $order_line->stock_id, $order_line->item_description, $order_line->quantity, $order_line->grn_item_id); $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 done automatically */ add_stock_move(ST_SUPPRECEIVE, $order_line->stock_id, $grn, $po->Location, $date_, "", - $order_line->receive_qty, $order_line->standard_cost, $order_line->taxfree_charge_price($po)); + $order_line->quantity, $order_line->unit_cost, $order_line->taxfree_charge_value($po)/$order_line->quantity); } /*quantity received is != 0 */ } /*end of order_line loop */ if ($clearing_act && $total != 0.0) { + $accs = get_supplier_accounts($po->supplier_id); $total += add_gl_trans_supplier(ST_SUPPRECEIVE, $grn, $date_, $clearing_act, - 0, 0, -$total, null); + $accs['dimension_id'], $accs['dimension2_id'], -$total, null); } $Refs->save(ST_SUPPRECEIVE, $grn, $po->reference); @@ -187,26 +190,42 @@ function add_grn_batch($po_number, $supplier_id, $reference, $location, $date_, return db_insert_id(); } -//------------------------------------------------------------------------------------------------------------- +//---------------------------------------------------------------------------------------- -function add_grn_detail_item($grn_batch_id, $po_detail_item, $item_code, $description, $standard_unit_cost, - $quantity_received, $price, $quantity) +function update_grn_batch($grn, $reference, $location, $date_) { - $sql = "UPDATE ".TB_PREF."purch_order_details - SET quantity_received = quantity_received + ".db_escape($quantity_received).", - std_cost_unit=".db_escape($standard_unit_cost).", - quantity_ordered=".db_escape($quantity).", - act_price=".db_escape($price)." - WHERE po_detail_item = ".db_escape($po_detail_item); + $date = date2sql($date_); - 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_batch SET + delivery_date=".db_escape($date).", + reference=".db_escape($reference).", + loc_code=".db_escape($location)." + WHERE id=".db_escape($grn); - $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 batch record could not be updated."); - db_query($sql, "A GRN detail item could not be inserted."); + return db_insert_id(); +} +//------------------------------------------------------------------------------------------------------------- + +function write_grn_item($grn_batch_id, $po_detail_item, $item_code, $description, $quantity_received, $grn_item_id) +{ + if ($grn_item_id) + $sql = "UPDATE ".TB_PREF."grn_items SET qty_recd=".db_escape($quantity_received) + ." WHERE id=".db_escape($grn_item_id); + else + $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 stored."); + + $sql = "UPDATE ".TB_PREF."purch_order_details po, + (SELECT SUM(qty_recd) received FROM ".TB_PREF."grn_items grn WHERE po_detail_item=".db_escape($po_detail_item).") grn + SET po.quantity_received = grn.received + 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 "); return db_insert_id(); } @@ -232,11 +251,13 @@ 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); + $sql = "SELECT grn.*, item.* + FROM ".TB_PREF."grn_batch grn," + .TB_PREF."grn_items item + WHERE item.grn_batch_id=grn.id + AND item.id=".db_escape($entered_grn->id)." + AND item.item_code=".db_escape($entered_grn->item_code); + $result = db_query($sql, "Could not retreive GRNS"); $myrow = db_fetch($result); @@ -264,16 +285,17 @@ function set_grn_item_credited(&$entered_grn, $supplier, $transno, $date) function get_grn_items($grn_batch_id=0, $supplier_id="", $outstanding_only=false, $is_invoiced_only=false, $invoice_no=0, $begin="", $end="") { - $sql = "SELECT grn.*, grn_item.*, + $sql = "SELECT grn.*, grn_item.*, po_item.delivery_date as req_del_date, grn_item.quantity_inv".($invoice_no ? "-invoice_item.quantity" : '')." quantity_inv, po_item.unit_price, po_item.act_price, po_item.quantity_ordered, + po_item.quantity_received, po_item.std_cost_unit, units - FROM ".TB_PREF."grn_batch grn, " - .TB_PREF."purch_order_details po_item, " - .TB_PREF."stock_master stock_item," - .TB_PREF."grn_items grn_item "; + FROM ".TB_PREF."grn_batch grn" + ." INNER JOIN ".TB_PREF."grn_items grn_item ON grn_item.grn_batch_id=grn.id" + ." INNER JOIN ".TB_PREF."purch_order_details po_item ON grn_item.po_detail_item=po_item.po_detail_item" + ." INNER JOIN ".TB_PREF."stock_master stock_item ON stock_item.stock_id=grn_item.item_code"; if ($invoice_no != 0) { $sql .= " LEFT JOIN ".TB_PREF."supp_invoice_items invoice_item ON "; @@ -285,8 +307,8 @@ function get_grn_items($grn_batch_id=0, $supplier_id="", $outstanding_only=false $inv_cond .= " = $invoice_no"; $sql .= "($inv_cond) AND grn_item.id=invoice_item.grn_item_id"; } - $sql .= " WHERE grn_item.grn_batch_id=grn.id - AND grn_item.po_detail_item=po_item.po_detail_item"; + + $sql .= " WHERE grn_item.qty_recd != 0"; if ($outstanding_only) $sql .= " AND (".($invoice_no ? "$inv_cond OR ":'')."grn_item.qty_recd - grn_item.quantity_inv > 0)"; @@ -318,13 +340,14 @@ 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, - ".TB_PREF."purch_order_details.std_cost_unit - 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=".db_escape($grn_item_no); + $sql = "SELECT grn.*, po.unit_price, grn.qty_recd - grn.quantity_inv AS QtyOstdg, + po.std_cost_unit + FROM ".TB_PREF."grn_items grn," + .TB_PREF."purch_order_details po," + .TB_PREF."stock_master item + WHERE grn.po_detail_item=po.po_detail_item + AND item.stock_id=grn.item_code + AND grn.id=".db_escape($grn_item_no); $result = db_query($sql, "could not retreive grn item details"); return db_fetch($result); @@ -339,10 +362,10 @@ function read_grn_items_to_order($grn_batch, &$order) if (db_num_rows($result) > 0) { - while ($myrow = db_fetch($result)) + while ($myrow = db_fetch_assoc($result)) { if ($myrow['qty_recd'] == 0 && $myrow['quantity_inv'] == 0) - continue; // 2011-01-18 Joe Hunt. We will not have empty credited rows. + continue; // We will not have empty credited rows. if (is_null($myrow["units"])) { $units = ""; @@ -354,8 +377,8 @@ function read_grn_items_to_order($grn_batch, &$order) $order->add_to_order($order->lines_on_order, $myrow["item_code"], $myrow["qty_recd"],$myrow["description"], $myrow["unit_price"],$units, - sql2date($myrow["delivery_date"]), $myrow["quantity_inv"], - $myrow["qty_recd"]); + sql2date($myrow["req_del_date"]), $myrow["quantity_inv"], + $myrow["quantity_received"], $myrow["quantity_ordered"], $myrow["id"]); $order->line_items[$order->lines_on_order-1]->po_detail_rec = $myrow["po_detail_item"]; } /* line po from purchase order details */ @@ -382,9 +405,10 @@ function read_grn($grn_batch, &$order) { $order->trans_type = ST_SUPPRECEIVE; - $order->orig_order_date = sql2date($row["delivery_date"]); + $order->tran_date = sql2date($row["delivery_date"]); $order->Location = $row["loc_code"]; $order->reference = $row["reference"]; + $order->grn_id = $grn_batch; read_grn_items_to_order($grn_batch, $order); } @@ -415,8 +439,10 @@ function exists_grn($grn_batch) 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 + $sql = "SELECT inv.id + FROM ".TB_PREF."supp_invoice_items inv," + .TB_PREF."grn_items grn + WHERE inv.grn_item_id=grn.id AND quantity != 0 AND grn_batch_id=".db_escape($grn_batch); $result = db_query($sql, "Cannot query GRNs");