X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=purchasing%2Fincludes%2Fdb%2Fgrn_db.inc;h=1e9f71be23769b860cba371dd26e5ecf891d80bb;hb=19d08aef75bd8960f1f0452303750ed0387fb1b8;hp=59973aacf0990a8192bf833adb4b45b1c2c9c37c;hpb=41aca3e0d2835b49b26656cdf64d8817a288092a;p=fa-stable.git diff --git a/purchasing/includes/db/grn_db.inc b/purchasing/includes/db/grn_db.inc index 59973aac..1e9f71be 100644 --- a/purchasing/includes/db/grn_db.inc +++ b/purchasing/includes/db/grn_db.inc @@ -10,63 +10,84 @@ See the License here . ***********************************************************************/ //------------------- update average material cost ------------------------------------------ Joe Hunt Mar-03-2008 - function update_average_material_cost($supplier, $stock_id, $price, $qty, $date, $adj_only=false) { + //Handle if inventory will become negative + if (is_inventory_item($stock_id)) + handle_negative_inventory($stock_id, $qty, $price, $date); + + // 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 = get_supplier_currency($supplier); + $currency = $supp['curr_code']; else $currency = null; - $dec = user_price_dec(); - price_decimal_format($price, $dec); - $price = round2($price, $dec); + + 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; - //$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); + + $price_in_home_currency_ = $price_in_home_currency; + + $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']; - if ($price > -0.0001 && $price < 0.0001) - return $material_cost; + + //Chaitanya : For Manufactured Items + //IF inventory adjustment is made for manufactured item, the material cost averages and labour, overhead remains as is, but in inventory valuation total standard_cost matters resulting in invalid valuation. + if (!$adj_only && $myrow['mb_flag'] == 'M') //For manufactured items price is adjusted + { + $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 ($price > -0.0001 && $price < 0.0001) commented out by Chaitanya + // 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, null, $date, $exclude); + $qoh = get_qoh_on_date($stock_id); + if ($adj_only) { if ($qoh > 0) - /* - 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) { - if ($qoh + $qty > 0) + if ($qoh + $qty >= 0) $cost_adjust = true; $qoh = 0; - } - $material_cost = ($qoh * $material_cost + $qty * $price_in_home_currency) / ($qoh + $qty); + } + 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); + //$material_cost = round2($material_cost, $dec); + + if ($cost_adjust) // new 2010-02-10 //Chaitanya : 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)." WHERE stock_id=".db_escape($stock_id); db_query($sql,"The cost details for the inventory item could not be updated"); @@ -75,24 +96,38 @@ function update_average_material_cost($supplier, $stock_id, $price, $qty, $date, //------------------------------------------------------------------------------------------------------------- -function add_grn(&$po, $date_, $reference, $location) +function add_grn(&$po) { global $Refs; + $date_ = $po->orig_order_date; + begin_transaction(); + hook_db_prewrite($po, ST_SUPPRECEIVE); - $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) + $clearing_act = get_company_pref('grn_clearing_act'); + if ($clearing_act) { // otherwise GRN clearing account is not used + $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)) { + $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 ------------------------------------------ Joe Hunt Mar-03-2008 - update_average_material_cost($po->supplier_id, $order_line->stock_id, $order_line->price, - $order_line->receive_qty, $date_); + //------------------- update average material cost and clearing account ----- Joe Hunt Mar-03-2008 + 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); + 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) { @@ -104,24 +139,32 @@ function add_grn(&$po, $date_, $reference, $location) 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 */ - + /*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->standard_cost, $order_line->receive_qty, $order_line->price, $order_line->quantity); - /* Update location stock records - NB a po cannot be entered for a service/kit parts */ - 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); + $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, + $po->supplier_id, 1, $order_line->price); } /*quantity received is != 0 */ } /*end of order_line loop */ - $Refs->save(ST_SUPPRECEIVE, $grn, $reference); + if ($clearing_act && $total != 0.0) { + $total += add_gl_trans_supplier(ST_SUPPRECEIVE, $grn, $date_, $clearing_act, + 0, 0, -$total, null); + } + $Refs->save(ST_SUPPRECEIVE, $grn, $po->reference); add_audit_trail(ST_SUPPRECEIVE, $grn, $date_); + $po->trans_no = $grn; + hook_db_postwrite($po, ST_SUPPRECEIVE); commit_transaction(); return $grn; @@ -145,11 +188,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, $price) + $quantity_received, $price, $quantity) { $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); @@ -219,8 +263,10 @@ 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 + .TB_PREF."purch_order_details.unit_price," + .TB_PREF."purch_order_details.act_price," + .TB_PREF."purch_order_details.quantity_ordered," + .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) @@ -284,7 +330,8 @@ function read_grn_items_to_order($grn_batch, &$order) while ($myrow = db_fetch($result)) { - + if ($myrow['qty_recd'] == 0 && $myrow['quantity_inv'] == 0) + continue; // 2011-01-18 Joe Hunt. We will not have empty credited rows. if (is_null($myrow["units"])) { $units = ""; @@ -294,12 +341,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"], - 1,$myrow["description"], $myrow["unit_price"],$units, + $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"]); - $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 } @@ -322,6 +369,7 @@ function read_grn($grn_batch, &$order) if ($result) { + $order->trans_type = ST_SUPPRECEIVE; $order->orig_order_date = sql2date($row["delivery_date"]); $order->location = $row["loc_code"]; $order->reference = $row["reference"]; @@ -374,6 +422,7 @@ function void_grn($grn_batch) return false; begin_transaction(); + hook_db_prevoid(ST_SUPPRECEIVE, $grn_batch); void_bank_trans(ST_SUPPRECEIVE, $grn_batch, true); void_gl_trans(ST_SUPPRECEIVE, $grn_batch, true);