X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=purchasing%2Fincludes%2Fdb%2Fgrn_db.inc;h=00e088e0fbc489aa884ac5216080e0fa79c139b5;hb=90b3d069d96b99671af51726e2953352738abb75;hp=a31bc2ec83665bc9ebe9ff0a3dcfa47c7f96889f;hpb=8ecdfec3e664440856af9b205d37e3327c126cfc;p=fa-stable.git diff --git a/purchasing/includes/db/grn_db.inc b/purchasing/includes/db/grn_db.inc index a31bc2ec..00e088e0 100644 --- a/purchasing/includes/db/grn_db.inc +++ b/purchasing/includes/db/grn_db.inc @@ -13,8 +13,8 @@ function update_average_material_cost($supplier, $stock_id, $price, $qty, $date, $adj_only=false) { //Handle if inventory will become negative - //8-OCT-2011 : Skip negative inventory adjustment for case of adjust_only - if (is_inventory_item($stock_id) && !$adj_only) + //8-OCT-2011 : Skip negative inventory adjustment for case of adjust_only + if (is_inventory_item($stock_id) && !$adj_only) handle_negative_inventory($stock_id, $qty, $price, $date); // probably this function should be optimized @@ -38,7 +38,7 @@ function update_average_material_cost($supplier, $stock_id, $price, $qty, $date, } else $price_in_home_currency = $price; - + $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); @@ -46,19 +46,20 @@ function update_average_material_cost($supplier, $stock_id, $price, $qty, $date, $myrow = db_fetch($result); $material_cost = $myrow['material_cost']; - //Price adjustment for manufactured item - if (!$adj_only && $myrow['mb_flag'] == 'M') + //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; + $qoh = get_qoh_on_date($stock_id); if ($adj_only) @@ -75,10 +76,9 @@ 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); - } - + $material_cost = ($qoh * $material_cost + $qty * $price_in_home_currency) / ($qoh + $qty); + } + 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)." @@ -117,10 +117,10 @@ function add_grn(&$po) 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 * $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_); - } + } //---------------------------------------------------------------------------------------------------------------- if ($order_line->qty_received == 0) { @@ -143,7 +143,7 @@ function add_grn(&$po) /* 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->taxfree_charge_price($po)); + $po->supplier_id, 1, $order_line->taxfree_charge_price($po)); } /*quantity received is != 0 */ } /*end of order_line loop */ @@ -255,41 +255,50 @@ 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 ".TB_PREF."grn_batch.*, ".TB_PREF."grn_items.*, " - .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) - $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 "; + $sql = "SELECT grn.*, grn_item.*, + 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.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 "; + + if ($invoice_no != 0) { + $sql .= " LEFT JOIN ".TB_PREF."supp_invoice_items invoice_item ON "; + + $inv_cond = "invoice_item.supp_trans_type=".ST_SUPPINVOICE." AND invoice_item.supp_trans_no "; + if (is_array($invoice_no)) + $inv_cond .= " IN (".implode(',' , $invoice_no) . ")"; + else + $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"; + + if ($outstanding_only) + $sql .= " AND (".($invoice_no ? "$inv_cond OR ":'')."grn_item.qty_recd - grn_item.quantity_inv > 0)"; + + $sql .= " AND stock_item.stock_id=grn_item.item_code "; if ($begin != "") - $sql .= " AND ".TB_PREF."grn_batch.delivery_date>='".date2sql($begin)."'"; + $sql .= " AND grn.delivery_date>='".date2sql($begin)."'"; if ($end != "") - $sql .= " AND ".TB_PREF."grn_batch.delivery_date<='".date2sql($end)."'"; + $sql .= " AND grn.delivery_date<='".date2sql($end)."'"; if ($grn_batch_id != 0) - $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); + $sql .= " AND grn.id=".db_escape($grn_batch_id) + ." AND grn_item.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 grn_item.quantity_inv > 0"; if ($supplier_id != "") - $sql .= " AND ".TB_PREF."grn_batch.supplier_id =".db_escape($supplier_id); + $sql .= " AND grn.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"; + $sql .= " ORDER BY grn.delivery_date, grn.id, grn_item.id"; return db_query($sql, "Could not retreive GRNS"); }