X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=manufacturing%2Fincludes%2Fdb%2Fwork_order_produce_items_db.inc;h=cdbd81c0a500d1448aac12ca1c70b09923758919;hb=d907208297556310cc7c51fcb9086869c880ab2d;hp=9ce682b38ec35fd85acc1d997aebde6f35b1cee0;hpb=50d1a68af70dfcadbb3896798e8211881457e3fa;p=fa-stable.git diff --git a/manufacturing/includes/db/work_order_produce_items_db.inc b/manufacturing/includes/db/work_order_produce_items_db.inc index 9ce682b3..cdbd81c0 100644 --- a/manufacturing/includes/db/work_order_produce_items_db.inc +++ b/manufacturing/includes/db/work_order_produce_items_db.inc @@ -9,14 +9,15 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the License here . ***********************************************************************/ -function work_order_produce($woid, $ref, $quantity, $date_, $memo_, $close_wo) +function work_order_produce($woid, $ref, $quantity, $date_, $memo, $close_wo) { global $Refs; +// FIXME: support for WO_UNASSEMBLY case begin_transaction(); $args = func_get_args(); - $args = (object)array_combine(array('woid', 'ref', 'quantity', 'date_', 'memo_','close_wo'), + $args = (object)array_combine(array('woid', 'ref', 'quantity', 'date_', 'memo','close_wo'), $args); $args->trans_no = 0; hook_db_prewrite($args, ST_MANURECEIVE); @@ -35,10 +36,10 @@ function work_order_produce($woid, $ref, $quantity, $date_, $memo_, $close_wo) // ------------------------------------------------------------------------- // insert -ve and update averaged component unit cost for BOM usage (in wo_requirements) - work_order_receive_costs($woid, $product["stock_id"], $quantity, $date_, $id); + work_order_production_gl($woid, $product["stock_id"], $quantity, $date_, $id); // update wo quantity and close wo if requested (or finished) - $closed = work_order_update_finished_quantity($woid, $quantity, $date_, $close_wo); + $closed = work_order_update_finished_quantity($woid, $quantity, $close_wo); // unit_cost is known when WO is finished, then generate +ve for all items if ($closed) @@ -70,19 +71,25 @@ function work_order_produce($woid, $ref, $quantity, $date_, $memo_, $close_wo) $o_cost = get_gl_wo_cost($woid, WO_OVERHEAD); $l_cost += get_gl_wo_cost($woid, WO_LABOUR); - $unit_cost = ($o_cost+$m_cost+$l_cost)/($product['units_issued']+$quantity); + $total_cost = $o_cost + $m_cost + $l_cost; + add_gl_trans_std_cost(ST_WORKORDER, $woid, $date_, $product['wip_account'], + 0, 0, $memo, -$total_cost); + + add_gl_trans_std_cost(ST_WORKORDER, $woid, $date_, $product['inventory_account'], + 0, 0, $memo, $total_cost); + + $unit_cost = $total_cost/($product['units_issued']+$quantity); + + // first update material cost update_material_cost($product['stock_id'], $product['units_issued']+$quantity, $unit_cost, $date_); - // FIXME: ? -// update_labour_cost(stock_id, qty, unit_cost); -// update_overheads_cost(stock_id, qty, unit_cost); add_stock_move(ST_WORKORDER, $product["stock_id"], $woid, $product["loc_code"], $date_, $ref, $product['units_issued']+$quantity, $unit_cost); } - if ($memo_) - add_comments(ST_MANURECEIVE, $id, $date_, $memo_); + if ($memo) + add_comments(ST_MANURECEIVE, $id, $date_, $memo); $Refs->save(ST_MANURECEIVE, $id, $ref); add_audit_trail(ST_MANURECEIVE, $id, $date_, _("Production.")); @@ -93,45 +100,11 @@ function work_order_produce($woid, $ref, $quantity, $date_, $memo_, $close_wo) commit_transaction(); } -/* - Process component usage: generate and post stock move, update average component cost. -*/ -function work_order_receive_costs($woid, $stock_id, $quantity, $date_, $rcv_no) -{ - $result = get_wo_requirements($woid); - - // credit all the components - $total_cost = 0; - while ($bom_item = db_fetch($result)) - { - - $bom_cost = $bom_item["ComponentCost"] * $quantity; - - update_wo_requirement_issued($bom_item['id'], $bom_item["units_req"] * $quantity, $bom_item["ComponentCost"]); - - // insert a -ve stock move for each item - add_stock_move(ST_MANURECEIVE, $bom_item["stock_id"], $rcv_no, - $bom_item["loc_code"], $date_, "", -$bom_item["units_req"] * $quantity, $bom_item["ComponentCost"], 0); - - if (!is_service($bom_item["mb_flag"])) - $ivaccount = $bom_item["inventory_account"]; - else - $ivaccount = $bom_item["assembly_account"]; - - $memo = $date_.": ".$bom_item["units_req"] ." * ".$bom_item["description"]; - $total_cost += add_gl_trans_std_cost(ST_WORKORDER, $woid, $date_, $ivaccount, 0, 0, - $memo, -$bom_cost); - } - - add_gl_trans_std_cost(ST_WORKORDER, $woid, $date_, get_company_pref('wip_act'), - 0, 0, $memo, -$total_cost); -} - //-------------------------------------------------------------------------------------------- function get_work_order_produce($id) { - $sql = "SELECT prod.*, wo.stock_id, item.description AS StockDescription + $sql = "SELECT prod.*, wo.stock_id, item.description AS StockDescription, wo.closed FROM ".TB_PREF."wo_manufacture prod," .TB_PREF."workorders wo," .TB_PREF."stock_master item @@ -162,6 +135,14 @@ function exists_work_order_produce($id) return (db_num_rows($result) > 0); } +//-------------------------------------------------------------------------------------- + +function check_void_wo_production($prod_no) +{ + $prod = get_work_order_produce($prod_no); + return $prod['closed'] ? $prod['workorder_id'] : 0; +} + //-------------------------------------------------------------------------------------------- function void_work_order_produce($type_no) @@ -172,44 +153,22 @@ function void_work_order_produce($type_no) // Skip processing already voided entry i.e. explicitly voided $void_entry = get_voided_entry(ST_MANURECEIVE, $type_no); if ($void_entry) - return; - - $row = get_work_order_produce($type_no); - - // deduct the quantity of this production from the parent work order - work_order_update_finished_quantity($row["workorder_id"], -$row["quantity"]); + return; - // void any related gl trans + $prod = get_work_order_produce($type_no); - $woid = $row["workorder_id"]; - $date_ = sql2date($row["date_"]); - - $result = get_stock_moves(ST_MANURECEIVE, $type_no); - while ($myrow = db_fetch($result)) - { - $issue_cost = $myrow["qty"]*$myrow["standard_cost"]; - $issue = get_stock_gl_code($myrow["stock_id"]); - $stockitem = get_item($myrow["stock_id"]); + if (work_order_is_closed($prod['workorder_id'])) + return; - // Compatibility for Service Items - if (!is_service($issue["mb_flag"])) - $ivaccount = $issue["inventory_account"]; - else - $ivaccount = $issue["assembly_account"]; + // deduct the quantity of this production from the parent work order + work_order_update_finished_quantity($prod["workorder_id"], -$prod["quantity"]); - if ($issue_cost != 0) - { - add_gl_trans_std_cost(ST_WORKORDER, $woid, $date_, $ivaccount, 0, 0, - $date_.": "._("Reversed the production ")." ".$stockitem["description"], - -$issue_cost); - } - } // clear the production record $sql = "UPDATE ".TB_PREF."wo_manufacture SET quantity=0 WHERE id=".db_escape($type_no); db_query($sql, "Cannot void a wo production"); - // Shifted below - // void all related stock moves + void_gl_trans(ST_MANURECEIVE, $type_no); + void_stock_move(ST_MANURECEIVE, $type_no); commit_transaction();