X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=manufacturing%2Fincludes%2Fdb%2Fwork_orders_db.inc;h=8cee8bd946948b9f6ad0be853034e1a495c4cb97;hb=f0f7c6e724d0b8dfb010c8ee135981376d72d4c5;hp=e39d334c8ba38177d7aae9a4cb7b84e46661a7af;hpb=46c5f7a65a7659a44ae8254c63152074363d3987;p=fa-stable.git diff --git a/manufacturing/includes/db/work_orders_db.inc b/manufacturing/includes/db/work_orders_db.inc index e39d334c..8cee8bd9 100644 --- a/manufacturing/includes/db/work_orders_db.inc +++ b/manufacturing/includes/db/work_orders_db.inc @@ -11,7 +11,8 @@ ***********************************************************************/ //-------------------------------------------------------------------------------------- -function add_material_cost($stock_id, $qty, $date_) +//Chaitanya : Added $advanced Parameter for Advanced Manufacturing +function add_material_cost($stock_id, $qty, $date_, $advanced=false) { $m_cost = 0; $result = get_bom($stock_id); @@ -20,26 +21,46 @@ function add_material_cost($stock_id, $qty, $date_) $standard_cost = get_standard_cost($bom_item['component']); $m_cost += ($bom_item['quantity'] * $standard_cost); } + $bom_cost = $m_cost; + //$dec = user_price_dec(); //price_decimal_format($m_cost, $dec); - $sql = "SELECT material_cost FROM ".TB_PREF."stock_master WHERE stock_id = " + $sql = "SELECT 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']; + + //Chaitanya : Upating material cost without considering labour, overhead costs results in invalid costing + if ($advanced) + { + //reduce overhead_cost and labour_cost from price as those will remain as is + $m_cost = $m_cost - $myrow['labour_cost'] - $myrow['overhead_cost']; + } + //$qoh = get_qoh_on_date($stock_id, null, $date_); $qoh = get_qoh_on_date($stock_id); + $cost_adjust = false; if ($qoh < 0) + { + if ($qoh + $qty >= 0) + $cost_adjust = true; $qoh = 0; + } if ($qoh + $qty != 0) $material_cost = ($qoh * $material_cost + $qty * $m_cost) / ($qoh + $qty); - //$material_cost = round2($material_cost, $dec); - $sql = "UPDATE ".TB_PREF."stock_master SET material_cost=$material_cost - WHERE stock_id=".db_escape($stock_id); + //$material_cost = round2($material_cost, $dec); + + if ($advanced && $cost_adjust) // new 2010-02-10 + adjust_deliveries($stock_id, $bom_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"); } -function add_overhead_cost($stock_id, $qty, $date_, $costs) +//Chaitanya : Added Adjustement Only Parameter +function add_overhead_cost($stock_id, $qty, $date_, $costs, $adj_only=false) { //$dec = user_price_dec(); //price_decimal_format($costs, $dec); @@ -54,15 +75,50 @@ function add_overhead_cost($stock_id, $qty, $date_, $costs) $qoh = get_qoh_on_date($stock_id); if ($qoh < 0) $qoh = 0; - if ($qoh + $qty != 0) - $overhead_cost = ($qoh * $overhead_cost + $qty * $costs) / ($qoh + $qty); + if ($adj_only) + { + if ($qty != 0) + $costs = $qty * $costs; + if ($qoh>0) + $overhead_cost = ($qoh * $overhead_cost + $costs) / $qoh; + else //Chaitanya : Pass JV if qoh is 0/negative + { + global $Refs; + + $id = get_next_trans_no(ST_JOURNAL); + $ref = $Refs->get_next(ST_JOURNAL); + + $stock_gl_code = get_stock_gl_code($stock_id); + $memo = "WO Overhead cost settlement JV for zero/negative respository of ".$stock_id; + //Reverse the inventory effect if $qoh <=0 + add_gl_trans_std_cost(ST_JOURNAL, $id, $date_, + $stock_gl_code["inventory_account"], + $stock_gl_code['dimension_id'], $stock_gl_code['dimension2_id'], $memo, + -$costs); + //GL Posting to inventory adjustment account + add_gl_trans_std_cost(ST_JOURNAL, $id, $date_, + $stock_gl_code["adjustment_account"], + $stock_gl_code['dimension_id'], $stock_gl_code['dimension2_id'], $memo, + $costs); + + add_audit_trail(ST_JOURNAL, $id, $date_); + add_comments(ST_JOURNAL, $id, $date_, $memo); + $Refs->save(ST_JOURNAL, $id, $ref); + } + } + else + { + if ($qoh + $qty != 0) + $overhead_cost = ($qoh * $overhead_cost + $qty * $costs) / ($qoh + $qty); + } //$overhead_cost = round2($overhead_cost, $dec); $sql = "UPDATE ".TB_PREF."stock_master SET overhead_cost=".db_escape($overhead_cost)." WHERE stock_id=".db_escape($stock_id); db_query($sql,"The cost details for the inventory item could not be updated"); } -function add_labour_cost($stock_id, $qty, $date_, $costs) +//Chaitanya : Added Adjustement Only Parameter +function add_labour_cost($stock_id, $qty, $date_, $costs, $adj_only=false) { //$dec = user_price_dec(); //price_decimal_format($costs, $dec); @@ -77,15 +133,50 @@ function add_labour_cost($stock_id, $qty, $date_, $costs) $qoh = get_qoh_on_date($stock_id); if ($qoh < 0) $qoh = 0; - if ($qoh + $qty != 0) - $labour_cost = ($qoh * $labour_cost + $qty * $costs) / ($qoh + $qty); + if ($adj_only) + { + if ($qty != 0) + $costs = $qty * $costs; + if ($qoh>0) + $labour_cost = ($qoh * $labour_cost + $costs) / $qoh; + else //Chaitanya : Pass JV if qoh is 0/negative + { + global $Refs; + + $id = get_next_trans_no(ST_JOURNAL); + $ref = $Refs->get_next(ST_JOURNAL); + + $stock_gl_code = get_stock_gl_code($stock_id); + $memo = "WO labour cost settlement JV for zero/negative respository of ".$stock_id; + //Reverse the inventory effect if $qoh <=0 + add_gl_trans_std_cost(ST_JOURNAL, $id, $date_, + $stock_gl_code["inventory_account"], + $stock_gl_code['dimension_id'], $stock_gl_code['dimension2_id'], $memo, + -$costs); + //GL Posting to inventory adjustment account + add_gl_trans_std_cost(ST_JOURNAL, $id, $date_, + $stock_gl_code["adjustment_account"], + $stock_gl_code['dimension_id'], $stock_gl_code['dimension2_id'], $memo, + $costs); + + add_audit_trail(ST_JOURNAL, $id, $date_); + add_comments(ST_JOURNAL, $id, $date_, $memo); + $Refs->save(ST_JOURNAL, $id, $ref); + } + } + else + { + if ($qoh + $qty != 0) + $labour_cost = ($qoh * $labour_cost + $qty * $costs) / ($qoh + $qty); + } //$labour_cost = round2($labour_cost, $dec); $sql = "UPDATE ".TB_PREF."stock_master SET labour_cost=".db_escape($labour_cost)." WHERE stock_id=".db_escape($stock_id); db_query($sql,"The cost details for the inventory item could not be updated"); } -function add_issue_cost($stock_id, $qty, $date_, $costs) +//Chaitanya : Added Adjustement Only Parameter +function add_issue_cost($stock_id, $qty, $date_, $costs, $adj_only=false) { if ($qty != 0) $costs /= $qty; @@ -100,8 +191,42 @@ function add_issue_cost($stock_id, $qty, $date_, $costs) $qoh = get_qoh_on_date($stock_id); if ($qoh < 0) $qoh = 0; - if ($qoh + $qty != 0) - $material_cost = ($qty * $costs) / ($qoh + $qty); + if ($adj_only) + { + if ($qty != 0) + $costs = $qty * $costs; + if ($qoh>0) + $material_cost = $costs / $qoh; + else //Chaitanya : Pass JV if qoh is 0/negative + { + global $Refs; + + $id = get_next_trans_no(ST_JOURNAL); + $ref = $Refs->get_next(ST_JOURNAL); + + $stock_gl_code = get_stock_gl_code($stock_id); + $memo = "WO Issue settlement JV for zero/negative respository of ".$stock_id; + //Reverse the inventory effect if $qoh <=0 + add_gl_trans_std_cost(ST_JOURNAL, $id, $date_, + $stock_gl_code["inventory_account"], + $stock_gl_code['dimension_id'], $stock_gl_code['dimension2_id'], $memo, + -$costs); + //GL Posting to inventory adjustment account + add_gl_trans_std_cost(ST_JOURNAL, $id, $date_, + $stock_gl_code["adjustment_account"], + $stock_gl_code['dimension_id'], $stock_gl_code['dimension2_id'], $memo, + $costs); + + add_audit_trail(ST_JOURNAL, $id, $date_); + add_comments(ST_JOURNAL, $id, $date_, $memo); + $Refs->save(ST_JOURNAL, $id, $ref); + } + } + else + { + if ($qoh + $qty != 0) + $material_cost = ($qty * $costs) / ($qoh + $qty); + } //$material_cost = round2($material_cost, $dec); $sql = "UPDATE ".TB_PREF."stock_master SET material_cost=material_cost+" .db_escape($material_cost) @@ -124,7 +249,8 @@ function add_work_order($wo_ref, $loc_code, $units_reqd, $stock_id, $args->woid = 0; hook_db_prewrite($args, ST_WORKORDER); - add_material_cost($stock_id, $units_reqd, $date_); + //Chaitanya : Material cost should be added at time of production as per BOM at the time. + //add_material_cost($stock_id, $units_reqd, $date_); $date = date2sql($date_); $required = date2sql($required_by); @@ -161,8 +287,9 @@ function update_work_order($woid, $loc_code, $units_reqd, $stock_id, 'date_', 'required_by', 'memo_'), $args); hook_db_prewrite($args, ST_WORKORDER); - add_material_cost($_POST['old_stk_id'], -$_POST['old_qty'], $date_); - add_material_cost($stock_id, $units_reqd, $date_); + //Chaitanya: Material Cost to be calculated at production + //add_material_cost($_POST['old_stk_id'], -$_POST['old_qty'], $date_); + //add_material_cost($stock_id, $units_reqd, $date_); $date = date2sql($date_); $required = date2sql($required_by); @@ -187,7 +314,8 @@ function delete_work_order($woid) begin_transaction(); hook_db_prevoid(ST_WORKORDER, $woid); - add_material_cost($_POST['stock_id'], -$_POST['quantity'], $_POST['date_']); + //Chaitanya : Cost calculation are affected only at time of production + //add_material_cost($_POST['stock_id'], -$_POST['quantity'], $_POST['date_']); // delete the work order requirements delete_wo_requirements($woid); @@ -317,7 +445,9 @@ function void_work_order($woid) $work_order = get_work_order($woid); if (!($work_order["type"] == WO_ADVANCED)) { - $date = sql2date($work_order['date_']); + //Chaitanya : Removed WO costing from here. Handled in void_stock_move + //Reason - if BOM is changed since WO was executed then add_material_cost will result in incorrect costing as it is based on current BOM for material cost. + /*$date = sql2date($work_order['date_']); $qty = $work_order['units_reqd']; add_material_cost($work_order['stock_id'], -$qty, $date); // remove avg. cost for qty $cost = get_gl_wo_cost($woid, WO_LABOUR); // get the labour cost and reduce avg cost @@ -325,7 +455,7 @@ function void_work_order($woid) add_labour_cost($work_order['stock_id'], -$qty, $date, $cost); $cost = get_gl_wo_cost($woid, WO_OVERHEAD); // get the overhead cost and reduce avg cost if ($cost != 0) - add_overhead_cost($work_order['stock_id'], -$qty, $date, $cost); + add_overhead_cost($work_order['stock_id'], -$qty, $date, $cost);*/ $sql = "UPDATE ".TB_PREF."workorders SET closed=1,units_reqd=0,units_issued=0 WHERE id = " .db_escape($woid); @@ -344,24 +474,52 @@ function void_work_order($woid) { // void everything inside the work order : issues, productions, payments $date = sql2date($work_order['date_']); - add_material_cost($work_order['stock_id'], -$work_order['units_reqd'], $date); // remove avg. cost for qty + + //Chaitanya : Removed WO costing from here. Handled in void_stock_move + //Reason - if BOM is changed since WO was executed then add_material_cost will result in incorrect costing as it is based on current BOM for material cost. + //add_material_cost($work_order['stock_id'], -$work_order['units_reqd'], $date); // remove avg. cost for qty + $result = get_work_order_productions($woid); // check the produced quantity $qty = 0; while ($row = db_fetch($result)) { - $qty += $row['quantity']; + //Chaitanya : Use native function for voiding + void_work_order_produce($row['id']); + + //Post voided entry if not prevoided explicitly + $void_entry = get_voided_entry(ST_MANURECEIVE, $row['id']); + if ($void_entry) + continue; + $memo_ = _("Voiding Work Order Trans # ").$woid; + add_audit_trail(ST_MANURECEIVE, $row['id'], today(), _("Voided.")."\n".$memo_); + add_voided_entry(ST_MANURECEIVE, $row['id'], today(), $memo_); + + /*$qty += $row['quantity']; // clear the production record - $sql = "UPDATE ".TB_PREF."wo_manufacture SET quantity=0 WHERE id=".$$row['id']; + $sql = "UPDATE ".TB_PREF."wo_manufacture SET quantity=0 WHERE id=".$row['id']; db_query($sql, "Cannot void a wo production"); - void_stock_move(ST_MANURECEIVE, $row['id']); // and void the stock moves; + void_stock_move(ST_MANURECEIVE, $row['id']); // and void the stock moves; */ } - $result = get_additional_issues($woid); // check the issued quantities + //Chaitanya : Get all work order issues + //$result = get_additional_issues($woid); // check the issued quantities + $result = get_work_order_issues($woid); $cost = 0; $issue_no = 0; while ($row = db_fetch($result)) { - $std_cost = get_standard_cost($row['stock_id']); + //Chaitanya : Use native function for voiding + void_work_order_issue($row['issue_no']); + + //Post voided entry if not prevoided explicitly + $void_entry = get_voided_entry(ST_MANUISSUE, $row['issue_no']); + if ($void_entry) + continue; + $memo_ = _("Voiding Work Order Trans # ").$woid; + add_audit_trail(ST_MANUISSUE, $row['issue_no'], today(), _("Voided.")."\n".$memo_); + add_voided_entry(ST_MANUISSUE, $row['issue_no'], today(), $memo_); + + /*$std_cost = get_standard_cost($row['stock_id']); $icost = $std_cost * $row['qty_issued']; $cost += $icost; if ($issue_no == 0) @@ -369,19 +527,24 @@ function void_work_order($woid) // void the actual issue items and their quantities $sql = "UPDATE ".TB_PREF."wo_issue_items SET qty_issued = 0 WHERE issue_id=" .db_escape($row['id']); - db_query($sql,"A work order issue item could not be voided"); - } - if ($issue_no != 0) - void_stock_move(ST_MANUISSUE, $issue_no); // and void the stock moves - if ($cost != 0) - add_issue_cost($work_order['stock_id'], -$qty, $date, $cost); - + db_query($sql,"A work order issue item could not be voided");*/ + } + + //Chaitaya : Voiding each issue handles the + //if ($issue_no != 0) + //void_stock_move(ST_MANUISSUE, $issue_no); // and void the stock moves + //if ($cost != 0) + //add_issue_cost($work_order['stock_id'], -$qty, $date, $cost); + + //Chaitanya : Reverse the cost effects on $work_order['stock_id'] as adjustement $cost = get_gl_wo_cost($woid, WO_LABOUR); // get the labour cost and reduce avg cost if ($cost != 0) - add_labour_cost($work_order['stock_id'], -$qty, $date, $cost); + //add_labour_cost($work_order['stock_id'], -$qty, $date, $cost); + add_labour_cost($work_order['stock_id'], 1, $date, -$cost, true); $cost = get_gl_wo_cost($woid, WO_OVERHEAD); // get the overhead cost and reduce avg cost if ($cost != 0) - add_overhead_cost($work_order['stock_id'], -$qty, $date, $cost); + //add_overhead_cost($work_order['stock_id'], -$qty, $date, $cost); + add_overhead_cost($work_order['stock_id'], 1, $date, -$cost, true); $sql = "UPDATE ".TB_PREF."workorders SET closed=1,units_reqd=0,units_issued=0 WHERE id = " .db_escape($woid);