X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=manufacturing%2Fincludes%2Fdb%2Fwork_orders_quick_db.inc;h=14570f18e36d0df2542b9b34467722d321b1a0b6;hb=a221a215b970c0b50bcbb9647ac7ca6244a8d009;hp=89d8fa47f9454a6034a2cb02a2b187b57262d62c;hpb=f821f29324e963437132a3f6fa7c57fcef5c5f0e;p=fa-stable.git diff --git a/manufacturing/includes/db/work_orders_quick_db.inc b/manufacturing/includes/db/work_orders_quick_db.inc index 89d8fa47..14570f18 100644 --- a/manufacturing/includes/db/work_orders_quick_db.inc +++ b/manufacturing/includes/db/work_orders_quick_db.inc @@ -9,8 +9,10 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the License here . ***********************************************************************/ -//-------------------------------------------------------------------------------------- - +/* + Quick work order entry, $type is either WO_ASSEMBLY, or WO_UNASSEMBLY + All changes in material and manufactured item stock are made during work order entry. +*/ function add_work_order_quick($wo_ref, $loc_code, $units_reqd, $stock_id, $type, $date_, $memo_, $costs, $cr_acc, $labour, $cr_lab_acc) { @@ -36,7 +38,7 @@ function add_work_order_quick($wo_ref, $loc_code, $units_reqd, $stock_id, $type, if (!isset($labour) || ($labour == "")) $labour = 0; add_labour_cost($stock_id, $units_reqd, $date_, $labour); - + $sql = "INSERT INTO ".TB_PREF."workorders (wo_ref, loc_code, units_reqd, units_issued, stock_id, type, additional_costs, date_, released_date, required_by, released, closed) VALUES (".db_escape($wo_ref).", ".db_escape($loc_code).", ".db_escape($units_reqd) @@ -70,7 +72,7 @@ function add_work_order_quick($wo_ref, $loc_code, $units_reqd, $stock_id, $type, add_stock_move(ST_WORKORDER, $bom_item["component"], $woid, $bom_item["loc_code"], $date_, $wo_ref, -$item_quantity, $UnitCost, $UnitCost); } - + // ------------------------------------------------------------------------- //Negative Stock Handling $qoh = get_qoh_on_date($stock_id); @@ -81,7 +83,6 @@ function add_work_order_quick($wo_ref, $loc_code, $units_reqd, $stock_id, $type, $cost_adjust = true; } - //Negative Stock Handling First; Prior to add_stock_move if ($cost_adjust) adjust_deliveries($stock_id, get_standard_cost($stock_id), $date_); @@ -94,7 +95,7 @@ function add_work_order_quick($wo_ref, $loc_code, $units_reqd, $stock_id, $type, // ------------------------------------------------------------------------- - work_order_quick_costs($woid, $stock_id, $units_reqd, $date_, 0, $costs, $cr_acc, $labour, $cr_lab_acc); + work_order_quick_costs($woid, $stock_id, $units_reqd, $date_, $costs, $cr_acc, $labour, $cr_lab_acc); // ------------------------------------------------------------------------- @@ -105,15 +106,15 @@ function add_work_order_quick($wo_ref, $loc_code, $units_reqd, $stock_id, $type, $args->woid = $woid; hook_db_postwrite($args, ST_WORKORDER); + commit_transaction(); return $woid; } //-------------------------------------------------------------------------------------- -function work_order_quick_costs($woid, $stock_id, $units_reqd, $date_, $advanced=0, $costs=0, $cr_acc="", $labour=0, $cr_lab_acc="") +function work_order_quick_costs($woid, $stock_id, $units_reqd, $date_, $costs, $cr_acc, $labour, $cr_lab_acc) { - global $wo_cost_types; $result = get_bom($stock_id); // credit all the components @@ -123,70 +124,39 @@ function work_order_quick_costs($woid, $stock_id, $units_reqd, $date_, $advanced $bom_accounts = get_stock_gl_code($bom_item["component"]); - $bom_cost = $bom_item["ComponentCost"] * $units_reqd; - + $bom_cost = $bom_item["ComponentCost"] * $units_reqd; // ?? * $bom_item["quantity"] + $memo = $bom_item["quantity"] ." * ".$bom_item["description"]; - if ($advanced) - { - $memo = $date_.": ".$memo; - update_wo_requirement_issued($woid, $bom_item['component'], $bom_item["quantity"] * $units_reqd); - // insert a -ve stock move for each item - add_stock_move(ST_MANURECEIVE, $bom_item["component"], $advanced, - $bom_item["loc_code"], $date_, "", -$bom_item["quantity"] * $units_reqd, 0); - } - $total_cost += add_gl_trans_std_cost(ST_WORKORDER, $woid, $date_, $bom_accounts["inventory_account"], 0, 0, + + if (!is_service($bom_accounts["mb_flag"])) + $ivaccount = $bom_accounts["inventory_account"]; + else + $ivaccount = $bom_accounts["assembly_account"]; + $total_cost += add_gl_trans_std_cost(ST_WORKORDER, $woid, $date_, $ivaccount, 0, 0, $memo, -$bom_cost); + } + $stockitem = get_item($stock_id); + // credit additional costs + if ($costs != 0.0) + { + add_wo_costs_journal($woid, $costs, WO_OVERHEAD, $cr_acc, $stockitem["assembly_account"], + $date_, $stockitem["dimension_id"], $stockitem["dimension2_id"]); } - $item_accounts = get_stock_gl_code($stock_id); - if ($advanced) + + if ($labour != 0.0) { - $wo = get_work_order($woid); - // also take the additional issues - // moved to work_order_issues_db.inc - /* - $res = get_additional_issues($woid); - $issue_total = 0; - while ($item = db_fetch($res)) - { - $standard_cost = get_standard_cost($item['stock_id']); - $issue_cost = $standard_cost * $item['qty_issued'] * $units_reqd / $wo['units_reqd']; - $issue = get_stock_gl_code($item['stock_id']); - $stockitem = get_item($item['stock_id']); - $total_cost += add_gl_trans_std_cost(ST_WORKORDER, $woid, $date_, $issue["inventory_account"], 0, 0, - $date_.": "._("Issue of")." ".$stockitem["description"], -$issue_cost); - $issue_total += $issue_cost; - } - if ($issue_total != 0) - add_issue_cost($stock_id, $units_reqd, $date_, $issue_total); - */ - $lcost = get_gl_wo_cost($woid, WO_LABOUR); - add_labour_cost($stock_id, $units_reqd, $date_, $lcost * $units_reqd / $wo['units_reqd']); - $ocost = get_gl_wo_cost($woid, WO_OVERHEAD); - add_overhead_cost($stock_id, $units_reqd, $date_, $ocost * $units_reqd / $wo['units_reqd']); - - } else { // only for quick - // credit additional costs - - if ($costs != 0.0) - { - add_wo_costs_journal($woid, $costs, WO_OVERHEAD, $cr_acc, $item_accounts["assembly_account"], - $date_, $item_accounts["dimension_id"], $item_accounts["dimension2_id"]); - } - if ($labour != 0.0) // only for quick - { - add_wo_costs_journal($woid, $labour, WO_LABOUR, $cr_lab_acc, $item_accounts["assembly_account"], - $date_, $item_accounts["dimension_id"], $item_accounts["dimension2_id"]); - } + add_wo_costs_journal($woid, $labour, WO_LABOUR, $cr_lab_acc, $stockitem["assembly_account"], + $date_, $stockitem["dimension_id"], $stockitem["dimension2_id"]); } + // debit total components $total_cost - $stockitem = get_item($stock_id); $memo = _("Produced")." ".$units_reqd. " * ".$stockitem["description"]; - if ($advanced) - $memo = $date_.": ".$memo; - add_gl_trans_std_cost(ST_WORKORDER, $woid, $date_, $item_accounts["inventory_account"], + + add_gl_trans_std_cost(ST_WORKORDER, $woid, $date_, $stockitem["inventory_account"], 0, 0, $memo, -$total_cost); -} -//-------------------------------------------------------------------------------------- + $UnitWOCost = ($total_cost + $costs + $labour)/$units_reqd; + update_stock_move(ST_WORKORDER, $woid, $stock_id, $UnitWOCost); +}