X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=manufacturing%2Fincludes%2Fdb%2Fwork_orders_db.inc;h=3ed8126da9e2e80b703aa6546655de289dad7e48;hb=17b390efcf904072b02ec866b2a427490471a260;hp=a79c2574dab6e626556bc66d3ffb9a610fb71d3c;hpb=b98bcfb9b2964cd6eb71190ca69f71eb447d8cf0;p=fa-stable.git diff --git a/manufacturing/includes/db/work_orders_db.inc b/manufacturing/includes/db/work_orders_db.inc index a79c2574..3ed8126d 100644 --- a/manufacturing/includes/db/work_orders_db.inc +++ b/manufacturing/includes/db/work_orders_db.inc @@ -9,210 +9,6 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the License here . ***********************************************************************/ -//-------------------------------------------------------------------------------------- - -function add_material_cost($stock_id, $qty, $date_, $advanced=false) -{ - $m_cost = 0; - $result = get_bom($stock_id); - while ($bom_item = db_fetch($result)) - { - $standard_cost = get_standard_cost($bom_item['component']); - $m_cost += ($bom_item['quantity'] * $standard_cost); - } - $bom_cost = $m_cost; - - $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']; - - 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); - $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); - - 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, $adj_only=false) -{ - if ($qty != 0) - $costs /= $qty; - $sql = "SELECT overhead_cost FROM ".TB_PREF."stock_master WHERE stock_id = " - .db_escape($stock_id); - $result = db_query($sql); - $myrow = db_fetch($result); - $overhead_cost = $myrow['overhead_cost']; - $qoh = get_qoh_on_date($stock_id); - if ($qoh < 0) - $qoh = 0; - if ($adj_only) - { - if ($qty != 0) - $costs = $qty * $costs; - if ($qoh>0) - $overhead_cost = ($qoh * $overhead_cost + $costs) / $qoh; - else // Journal Entry 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); - } - $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, $adj_only=false) -{ - if ($qty != 0) - $costs /= $qty; - $sql = "SELECT labour_cost FROM ".TB_PREF."stock_master WHERE stock_id = " - .db_escape($stock_id); - $result = db_query($sql); - $myrow = db_fetch($result); - $labour_cost = $myrow['labour_cost']; - $qoh = get_qoh_on_date($stock_id); - if ($qoh < 0) - $qoh = 0; - if ($adj_only) - { - if ($qty != 0) - $costs = $qty * $costs; - if ($qoh>0) - $labour_cost = ($qoh * $labour_cost + $costs) / $qoh; - else // Journal Entry 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); - } - $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, $adj_only=false) -{ - if ($qty != 0) - $costs /= $qty; - $sql = "SELECT material_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']; - $qoh = get_qoh_on_date($stock_id); - if ($qoh < 0) - $qoh = 0; - if ($adj_only) - { - if ($qty != 0) - $costs = $qty * $costs; - if ($qoh>0) - $material_cost = $costs / $qoh; - else // Journal Entry 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); - } - $sql = "UPDATE ".TB_PREF."stock_master SET material_cost=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_work_order($wo_ref, $loc_code, $units_reqd, $stock_id, $type, $date_, $required_by, $memo_, $costs, $cr_acc, $labour, $cr_lab_acc) { @@ -228,6 +24,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_); + $date = date2sql($date_); $required = date2sql($required_by); @@ -255,7 +53,7 @@ function add_work_order($wo_ref, $loc_code, $units_reqd, $stock_id, //-------------------------------------------------------------------------------------- function update_work_order($woid, $loc_code, $units_reqd, $stock_id, - $date_, $required_by, $memo_) + $date_, $required_by, $memo_, $old_stock_id, $old_qty) { begin_transaction(); $args = func_get_args(); @@ -263,6 +61,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($old_stock_id, -$old_qty, $date_); + add_material_cost($stock_id, $units_reqd, $date_); + $date = date2sql($date_); $required = date2sql($required_by); @@ -281,11 +82,13 @@ function update_work_order($woid, $loc_code, $units_reqd, $stock_id, commit_transaction(); } -function delete_work_order($woid) +function delete_work_order($woid, $stock_id, $qty, $date) { begin_transaction(); hook_db_prevoid(ST_WORKORDER, $woid); + add_material_cost($stock_id, -$qty, $date); + // delete the work order requirements delete_wo_requirements($woid); @@ -294,7 +97,7 @@ function delete_work_order($woid) db_query($sql,"The work order could not be deleted"); delete_comments(ST_WORKORDER, $woid); - add_audit_trail(ST_WORKORDER, $woid, $_POST['date_'], _("Canceled.")); + add_audit_trail(ST_WORKORDER, $woid, $date, _("Canceled.")); commit_transaction(); } @@ -370,7 +173,7 @@ function release_work_order($woid, $releaseDate, $memo_) create_wo_requirements($woid, $stock_id); add_comments(ST_WORKORDER, $woid, $releaseDate, $memo_); - add_audit_trail(ST_WORKORDER, $woid, $releaseDate,_("Released.")); + add_audit_trail(ST_WORKORDER, $woid, sql2date($myrow['date_']), _("Released.")); commit_transaction(); } @@ -414,6 +217,16 @@ function void_work_order($woid) $work_order = get_work_order($woid); if (!($work_order["type"] == WO_ADVANCED)) { + $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 + if ($cost != 0) + 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); + $sql = "UPDATE ".TB_PREF."workorders SET closed=1,units_reqd=0,units_issued=0 WHERE id = " .db_escape($woid); db_query($sql, "The work order couldn't be voided"); @@ -421,8 +234,7 @@ function void_work_order($woid) // void all related stock moves void_stock_move(ST_WORKORDER, $woid); - // void any related bank/gl trans - void_bank_trans(ST_WORKORDER, $woid, true); + void_wo_costing($woid); // clear the requirements units received void_wo_requirements($woid); @@ -431,47 +243,44 @@ 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 $result = get_work_order_productions($woid); // check the produced quantity $qty = 0; while ($row = db_fetch($result)) { - 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']; + db_query($sql, "Cannot void a wo production"); - $result = get_work_order_issues($woid); + void_stock_move(ST_MANURECEIVE, $row['id']); // and void the stock moves; + } + $result = get_additional_issues($woid); // check the issued quantities $cost = 0; $issue_no = 0; while ($row = db_fetch($result)) { - 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) + $issue_no = $row['issue_no']; + // 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); - //Adust avg labour cost - $cost = get_gl_wo_cost($woid, WO_LABOUR); + $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'], 1, $date, -$cost, true); - - //Adust avg overhead cost - $cost = get_gl_wo_cost($woid, WO_OVERHEAD); + 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'], 1, $date, -$cost, true); + 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); @@ -480,8 +289,7 @@ function void_work_order($woid) // void all related stock moves void_stock_move(ST_WORKORDER, $woid); - // void any related bank/gl trans - void_bank_trans(ST_WORKORDER, $woid, true); + void_wo_costing($wo); // clear the requirements units received void_wo_requirements($woid); @@ -489,7 +297,7 @@ function void_work_order($woid) commit_transaction(); } -function get_sql_for_work_orders($outstanding_only, $all_items) +function get_sql_for_work_orders($outstanding_only, $stock_id, $location = ALL_TEXT, $oredr_no='', $order_ref = '', $overdue = false) { $sql = "SELECT workorder.id, @@ -519,22 +327,27 @@ function get_sql_for_work_orders($outstanding_only, $all_items) $sql .= " AND workorder.closed=0"; } - if (isset($_POST['StockLocation']) && $_POST['StockLocation'] != $all_items) + if ($location != ALL_TEXT) + { + $sql .= " AND workorder.loc_code=".db_escape($location); + } + + if ($order_no != '') { - $sql .= " AND workorder.loc_code=".db_escape($_POST['StockLocation']); + $sql .= " AND workorder.id LIKE ".db_escape('%'.$order_no.'%'); } - if (isset($_POST['OrderNumber']) && $_POST['OrderNumber'] != "") + if ($order_ref != '') { - $sql .= " AND workorder.wo_ref LIKE ".db_escape('%'.$_POST['OrderNumber'].'%'); + $sql .= " AND workorder.wo_ref LIKE ".db_escape('%'.$order_ref.'%'); } - if (isset($_POST['SelectedStockItem']) && $_POST['SelectedStockItem'] != $all_items) + if ($stock_id != ALL_TEXT) { - $sql .= " AND workorder.stock_id=".db_escape($_POST['SelectedStockItem']); + $sql .= " AND workorder.stock_id=".db_escape($stock_id); } - if (check_value('OverdueOnly')) + if ($overdue) { $Today = date2sql(Today()); @@ -543,7 +356,7 @@ function get_sql_for_work_orders($outstanding_only, $all_items) return $sql; } -function get_sql_for_where_used() +function get_sql_for_where_used($stock_id) { $sql = "SELECT bom.parent, @@ -558,8 +371,8 @@ function get_sql_for_where_used() WHERE bom.parent = parent.stock_id AND bom.workcentre_added = workcentre.id AND bom.loc_code = location.loc_code - AND bom.component=".db_escape($_POST['stock_id']); - return $sql; + AND bom.component=".db_escape($stock_id); + return $sql; } //-------------------------------------------------------------------------------------- function get_gl_wo_cost($woid, $cost_type) @@ -571,4 +384,3 @@ function get_gl_wo_cost($woid, $cost_type) return $cost; } -?> \ No newline at end of file