X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=manufacturing%2Fincludes%2Fdb%2Fwork_orders_quick_db.inc;h=455f918e0b43b68e4a5cf597ce5ff55694f15faf;hb=80dd97a37f674cc3691fa04af4c29607067566b2;hp=0c7a18d6172c2a7e58d796f2c5de034ec8507926;hpb=818719f38b8327cdca616d58b13913dbd174d96a;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 0c7a18d6..455f918e 100644 --- a/manufacturing/includes/db/work_orders_quick_db.inc +++ b/manufacturing/includes/db/work_orders_quick_db.inc @@ -1,34 +1,40 @@ . + See the License here . ***********************************************************************/ //-------------------------------------------------------------------------------------- -function add_work_order_quick($wo_ref, $loc_code, $units_reqd, $stock_id, $type, $date_, $additional_costs, $memo_) +function add_work_order_quick($wo_ref, $loc_code, $units_reqd, $stock_id, $type, $date_, $memo_, $costs, $cr_acc, $labour, $cr_lab_acc) { + global $Refs; + begin_transaction(); // if unassembling, reverse the stock movements - if ($type == wo_types::unassemble()) + if ($type == WO_UNASSEMBLY) $units_reqd = -$units_reqd; add_material_cost($stock_id, $units_reqd, $date_); $date = date2sql($date_); - if (!isset($additional_costs) || ($additional_costs == "")) - $additional_costs = 0; - + if (!isset($costs) || ($costs == "")) + $costs = 0; + add_overhead_cost($stock_id, $units_reqd, $date_, $costs); + 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).", $units_reqd, $units_reqd, '$stock_id', - $type, $additional_costs, '$date', '$date', '$date', 1, 1)"; + $type, $costs, '$date', '$date', '$date', 1, 1)"; db_query($sql, "could not add work order"); $woid = db_insert_id(); @@ -53,7 +59,7 @@ function add_work_order_quick($wo_ref, $loc_code, $units_reqd, $stock_id, $type, db_query($sql, "The work order requirements could not be added"); // insert a -ve stock move for each item - add_stock_move(systypes::work_order(), $bom_item["component"], $woid, + add_stock_move(ST_WORKORDER, $bom_item["component"], $woid, $bom_item["loc_code"], $date_, $wo_ref, -$item_quantity, 0); } @@ -61,27 +67,28 @@ function add_work_order_quick($wo_ref, $loc_code, $units_reqd, $stock_id, $type, // ------------------------------------------------------------------------- // insert a +ve stock move for the item being manufactured - add_stock_move(systypes::work_order(), $stock_id, $woid, $loc_code, $date_, + add_stock_move(ST_WORKORDER, $stock_id, $woid, $loc_code, $date_, $wo_ref, $units_reqd, 0); // ------------------------------------------------------------------------- - work_order_quick_costs($woid, $stock_id, $units_reqd, $date_, $additional_costs); + work_order_quick_costs($woid, $stock_id, $units_reqd, $date_, false, $costs, $cr_acc, $labour, $cr_lab_acc); // ------------------------------------------------------------------------- - add_comments(systypes::work_order(), $woid, $date_, $memo_); - - references::save_last($wo_ref, systypes::work_order()); + add_comments(ST_WORKORDER, $woid, $date_, $memo_); + $Refs->save(ST_WORKORDER, $woid, $wo_ref); + add_audit_trail(ST_WORKORDER, $woid, $date_,_("Quick production.")); commit_transaction(); return $woid; } //-------------------------------------------------------------------------------------- -function work_order_quick_costs($woid, $stock_id, $units_reqd, $date_, $additional_costs, $advanced=false) +function work_order_quick_costs($woid, $stock_id, $units_reqd, $date_, $advanced=false, $costs=0, $cr_acc="", $labour=0, $cr_lab_acc="") { + global $wo_cost_types; $result = get_bom($stock_id); // credit all the components @@ -91,42 +98,83 @@ function work_order_quick_costs($woid, $stock_id, $units_reqd, $date_, $addition $bom_accounts = get_stock_gl_code($bom_item["component"]); - $bom_cost = $bom_item["standard_cost"] * $bom_item["quantity"] * $units_reqd; + $bom_cost = $bom_item["ComponentCost"] * $units_reqd; if ($advanced) { // insert a -ve stock move for each item - add_stock_move(systypes::work_order(), $bom_item["component"], $woid, + add_stock_move(ST_WORKORDER, $bom_item["component"], $woid, $bom_item["loc_code"], $date_, "", -$bom_item["quantity"] * $units_reqd, 0); } - add_gl_trans_std_cost(systypes::work_order(), $woid, $date_, $bom_accounts["inventory_account"], 0, 0, + $total_cost += add_gl_trans_std_cost(ST_WORKORDER, $woid, $date_, $bom_accounts["inventory_account"], 0, 0, null, -$bom_cost); - $total_cost += $bom_cost; } if ($advanced) { // also take the additional issues $res = get_additional_issues($woid); + $wo = get_work_order($woid); + $issue_total = 0; while ($item = db_fetch($res)) { $standard_cost = get_standard_cost($item['stock_id']); - $issue_cost = $standard_cost * $item['qty_issued']; + $issue_cost = $standard_cost * $item['qty_issued'] * $units_reqd / $wo['units_reqd']; $issue = get_stock_gl_code($item['stock_id']); - add_gl_trans_std_cost(systypes::work_order(), $woid, $date_, $issue["inventory_account"], 0, 0, + $total_cost += add_gl_trans_std_cost(ST_WORKORDER, $woid, $date_, $issue["inventory_account"], 0, 0, null, -$issue_cost); - $total_cost += $issue_cost; + $issue_total += $issue_cost; } + if ($issue_total != 0) + add_issue_cost($stock_id, $units_reqd, $date_, $issue_total); + $result = get_gl_wo_cost_trans($woid, WO_LABOUR); + $lcost = 0; + while ($row = db_fetch($result)) + $lcost += -$row['amount']; + add_labour_cost($stock_id, $units_reqd, $date_, $lcost * $units_reqd / $wo['units_reqd']); + $result = get_gl_wo_cost_trans($woid, WO_OVERHEAD); + $ocost = 0; + while ($row = db_fetch($result)) + $ocost += -$row['amount']; + add_overhead_cost($stock_id, $units_reqd, $date_, $ocost * $units_reqd / $wo['units_reqd']); } // credit additional costs $item_accounts = get_stock_gl_code($stock_id); - add_gl_trans_std_cost(systypes::work_order(), $woid, $date_, $item_accounts["assembly_account"], - $item_accounts["dimension_id"], $item_accounts["dimension2_id"], null, -$additional_costs); - - // debit total components + additional - $total_cost += $additional_costs; - add_gl_trans_std_cost(systypes::work_order(), $woid, $date_, $item_accounts["inventory_account"], - 0, 0, null, $total_cost); + if ($costs != 0.0) + { + add_gl_trans_std_cost(ST_WORKORDER, $woid, $date_, $cr_acc, + 0, 0, $wo_cost_types[WO_OVERHEAD], -$costs, PT_WORKORDER, WO_OVERHEAD); + $is_bank_to = is_bank_account($cr_acc); + if ($is_bank_to) + { + add_bank_trans(ST_WORKORDER, $woid, $is_bank_to, "", + $date_, -$costs, PT_WORKORDER, WO_OVERHEAD, get_company_currency(), + "Cannot insert a destination bank transaction"); + } + + add_gl_trans_std_cost(ST_WORKORDER, $woid, $date_, $item_accounts["assembly_account"], + $item_accounts["dimension_id"], $item_accounts["dimension2_id"], $wo_cost_types[WO_OVERHEAD], $costs, + PT_WORKORDER, WO_OVERHEAD); + } + if ($labour != 0.0) + { + add_gl_trans_std_cost(ST_WORKORDER, $woid, $date_, $cr_lab_acc, + 0, 0, $wo_cost_types[WO_LABOUR], -$labour, PT_WORKORDER, WO_LABOUR); + $is_bank_to = is_bank_account($cr_lab_acc); + if ($is_bank_to) + { + add_bank_trans(ST_WORKORDER, $woid, $is_bank_to, "", + $date_, -$labour, PT_WORKORDER, WO_LABOUR, get_company_currency(), + "Cannot insert a destination bank transaction"); + } + + add_gl_trans_std_cost(ST_WORKORDER, $woid, $date_, $item_accounts["assembly_account"], + $item_accounts["dimension_id"], $item_accounts["dimension2_id"], $wo_cost_types[WO_LABOUR], $labour, + PT_WORKORDER, WO_LABOUR); + } + // debit total components $total_cost + add_gl_trans_std_cost(ST_WORKORDER, $woid, $date_, $item_accounts["inventory_account"], + 0, 0, null, -$total_cost); } //--------------------------------------------------------------------------------------