From a601f3740bb0ce5d13bf1c4cb616f70abb99baae Mon Sep 17 00:00:00 2001 From: Janusz Dobrowolski Date: Sat, 9 Jan 2016 21:19:59 +0100 Subject: [PATCH] Removed redundant global wip_act preference, fixed invalid account used for service BOM items. --- admin/gl_setup.php | 6 +----- includes/data_checks.inc | 5 ----- manufacturing/includes/db/work_order_costing_db.inc | 8 +++++--- manufacturing/includes/db/work_order_issues_db.inc | 8 +++----- .../includes/db/work_order_produce_items_db.inc | 4 ++-- manufacturing/work_order_add_finished.php | 2 -- manufacturing/work_order_issue.php | 1 - sql/alter2.4rc1.php | 12 ++---------- sql/alter2.4rc1.sql | 3 +-- sql/en_US-demo.sql | 1 - sql/en_US-new.sql | 1 - 11 files changed, 14 insertions(+), 37 deletions(-) diff --git a/admin/gl_setup.php b/admin/gl_setup.php index 13d1a332..07f70b7b 100644 --- a/admin/gl_setup.php +++ b/admin/gl_setup.php @@ -83,8 +83,7 @@ if (isset($_POST['submit']) && can_process()) 'no_zero_lines_amount', 'show_po_item_codes', 'accounts_alpha', 'loc_notification', 'print_invoice_no', 'allow_negative_prices', 'print_item_images_on_quote', 'allow_negative_stock'=> 0, 'accumulate_shipping'=> 0, - 'po_over_receive' => 0.0, 'po_over_charge' => 0.0, 'default_credit_limit'=>0.0, - 'wip_act' + 'po_over_receive' => 0.0, 'po_over_charge' => 0.0, 'default_credit_limit'=>0.0 ))); display_notification(_("The general GL setup has been updated.")); @@ -148,7 +147,6 @@ $_POST['allow_negative_prices'] = $myrow['allow_negative_prices']; $_POST['print_item_images_on_quote'] = $myrow['print_item_images_on_quote']; $_POST['default_loss_on_asset_disposal_act'] = $myrow['default_loss_on_asset_disposal_act']; $_POST['depreciation_period'] = $myrow['depreciation_period']; -$_POST['wip_act'] = $myrow['wip_act']; //--------------- @@ -269,8 +267,6 @@ table_section_title(_("Manufacturing Defaults")); text_row(_("Work Order Required By After:"), 'default_workorder_required', $_POST['default_workorder_required'], 6, 6, '', "", _("days")); -gl_all_accounts_list_row(_("Work In Progress Account:"), 'wip_act', $_POST['wip_act']); - //---------------- end_outer_table(1); diff --git a/includes/data_checks.inc b/includes/data_checks.inc index 765a59df..54f9dbb5 100644 --- a/includes/data_checks.inc +++ b/includes/data_checks.inc @@ -685,8 +685,3 @@ function check_sys_pref($name, $msg, $empty = '') display_footer_exit(); } } - -function check_wip_account() -{ - check_sys_pref('wip_act', _("You have to set Work In Progress Account in GL Setup before you can use this function.")); -} diff --git a/manufacturing/includes/db/work_order_costing_db.inc b/manufacturing/includes/db/work_order_costing_db.inc index 3cb605cb..693f0ca1 100644 --- a/manufacturing/includes/db/work_order_costing_db.inc +++ b/manufacturing/includes/db/work_order_costing_db.inc @@ -195,7 +195,8 @@ function add_wo_costs_journal($wo_id, $amount, $cost_type, $cr_acc, $db_acc, $da add_gl_trans_std_cost(ST_JOURNAL, $journal_id, $date, $db_acc, $dim1, $dim2, $wo_cost_types[$cost_type], $amount); - $wip = get_company_pref('wip_act'); + $wo = get_work_order($wo_id); + $wip = $wo['assembly_account']; if ($db_acc != $wip) { @@ -237,7 +238,7 @@ function work_order_production_gl($woid, $stock_id, $quantity, $date_, $rcv_no) if (!is_service($bom_item["mb_flag"])) $ivaccount = $bom_item["inventory_account"]; else - $ivaccount = $bom_item["assembly_account"]; + $ivaccount = $bom_item["cogs_account"]; $memo = $date_.": ".$bom_item["units_req"] ." * ".$bom_item["description"]; @@ -245,7 +246,8 @@ function work_order_production_gl($woid, $stock_id, $quantity, $date_, $rcv_no) $memo, -$bom_item["ComponentCost"] * $bom_item["units_req"] * $quantity); } - add_gl_trans_std_cost(ST_MANURECEIVE, $rcv_no, $date_, get_company_pref('wip_act'), + $wo = get_work_order($woid); + add_gl_trans_std_cost(ST_MANURECEIVE, $rcv_no, $date_, $wo['assembly_account'], 0, 0, $memo, -$total_cost); } diff --git a/manufacturing/includes/db/work_order_issues_db.inc b/manufacturing/includes/db/work_order_issues_db.inc index 4c6b4612..fd89356a 100644 --- a/manufacturing/includes/db/work_order_issues_db.inc +++ b/manufacturing/includes/db/work_order_issues_db.inc @@ -60,7 +60,7 @@ function add_work_order_issue($woid, $ref, $to_work_order, $items, $location, $w if (!is_service($stockitem["mb_flag"])) $ivaccount = $stockitem["inventory_account"]; else - $ivaccount = $stockitem["assembly_account"]; + $ivaccount = $stockitem["cogs_account"]; $total_cost += add_gl_trans_std_cost(ST_MANUISSUE, $number, $date_, $ivaccount, 0, 0, $date_.": "._("Issue of")." ".$stockitem["description"], -$issue_cost); @@ -71,10 +71,8 @@ function add_work_order_issue($woid, $ref, $to_work_order, $items, $location, $w add_issue_cost($wo['stock_id'], $wo['units_reqd'], $date_, $issue_total, true); $stockitem = get_item($wo['stock_id']); - $wip_account = get_company_pref('wip_act'); - if (!$wip_account) // backward compatibility - $wip_account = $stockitem["inventory_account"]; + $wip_account = $stockitem["assembly_account"]; add_gl_trans_std_cost(ST_MANUISSUE, $number, $date_, $wip_account, 0, 0, $date_.": "._("Issue to")." ".$stockitem["description"], -$total_cost); @@ -191,7 +189,7 @@ function void_work_order_issue($type_no) if (!is_service($issue["mb_flag"])) $ivaccount = $issue["inventory_account"]; else - $ivaccount = $issue["assembly_account"]; + $ivaccount = $issue["cogs_account"]; if ($issue_cost != 0) { diff --git a/manufacturing/includes/db/work_order_produce_items_db.inc b/manufacturing/includes/db/work_order_produce_items_db.inc index d4b3832e..fecc34bf 100644 --- a/manufacturing/includes/db/work_order_produce_items_db.inc +++ b/manufacturing/includes/db/work_order_produce_items_db.inc @@ -73,7 +73,7 @@ function work_order_produce($woid, $ref, $quantity, $date_, $memo, $close_wo) $total_cost = $o_cost + $m_cost + $l_cost; - add_gl_trans_std_cost(ST_WORKORDER, $woid, $date_, get_company_pref('wip_act'), + add_gl_trans_std_cost(ST_WORKORDER, $woid, $date_, $product['assembly_account'], 0, 0, $memo, -$total_cost); add_gl_trans_std_cost(ST_WORKORDER, $woid, $date_, $product['inventory_account'], @@ -167,7 +167,7 @@ function void_work_order_produce($type_no) if (!is_service($issue["mb_flag"])) $ivaccount = $issue["inventory_account"]; else - $ivaccount = $issue["assembly_account"]; + $ivaccount = $issue["cogs_account"]; if ($issue_cost != 0) { diff --git a/manufacturing/work_order_add_finished.php b/manufacturing/work_order_add_finished.php index 717faf09..757f304c 100644 --- a/manufacturing/work_order_add_finished.php +++ b/manufacturing/work_order_add_finished.php @@ -27,8 +27,6 @@ if (user_use_date_picker()) $js .= get_js_date_picker(); page(_($help_context = "Produce or Unassemble Finished Items From Work Order"), false, false, "", $js); -check_wip_account(); - if (isset($_GET['trans_no']) && $_GET['trans_no'] != "") { $_POST['selected_id'] = $_GET['trans_no']; diff --git a/manufacturing/work_order_issue.php b/manufacturing/work_order_issue.php index f0505296..025a9125 100644 --- a/manufacturing/work_order_issue.php +++ b/manufacturing/work_order_issue.php @@ -30,7 +30,6 @@ if (user_use_date_picker()) page(_($help_context = "Issue Items to Work Order"), false, false, "", $js); -check_wip_account(); //----------------------------------------------------------------------------------------------- if (isset($_GET['AddedID'])) diff --git a/sql/alter2.4rc1.php b/sql/alter2.4rc1.php index 984acde8..05905658 100644 --- a/sql/alter2.4rc1.php +++ b/sql/alter2.4rc1.php @@ -33,10 +33,6 @@ class fa2_4rc1 extends fa_patch { table_section_title(_("Fixed Assets Defaults")); gl_all_accounts_list_row(_("Loss On Asset Disposal Account:"), 'default_loss_on_asset_disposal_act', '5660', true, false, _("None (will be set later)")); - - table_section_title(_("Manufacturing")); - gl_all_accounts_list_row(_("Work In Progress Account:"), 'wip_act', '1530', - true, false, _("None (will be set later)")); end_row(); end_table(); br(); @@ -47,7 +43,6 @@ class fa2_4rc1 extends fa_patch { */ function prepare() { - $this->wip_account = get_post('wip_act'); $this->fixed_disposal_act = get_post('default_loss_on_asset_disposal_act'); return true; } @@ -69,9 +64,7 @@ class fa2_4rc1 extends fa_patch { $pref = $this->companies[$company]['tbpref']; if ($result) - if (!db_query("UPDATE ".$pref."sys_prefs SET value=".db_escape($this->wip_act) - ." WHERE name='wip_act'") - || !db_query("UPDATE ".$pref."sys_prefs SET value=".db_escape($this->fixed_disposal_act) + if (!db_query("UPDATE ".$pref."sys_prefs SET value=".db_escape($this->fixed_disposal_act) ." WHERE name='default_loss_on_asset_disposal_act'") ) return $this->log_error(sprintf(_("Cannot update sys prefs setting:\n%s"), db_error_msg($db))); @@ -92,8 +85,7 @@ class fa2_4rc1 extends fa_patch { 'default_loss_on_asset_disposal_act', 'depreciation_period', 'use_manufacturing', - 'use_fixed_assets', - 'wip_act')"); + 'use_fixed_assets')"); } } diff --git a/sql/alter2.4rc1.sql b/sql/alter2.4rc1.sql index a2f3e6f2..e4a3fb24 100644 --- a/sql/alter2.4rc1.sql +++ b/sql/alter2.4rc1.sql @@ -23,8 +23,7 @@ INSERT IGNORE INTO `0_sys_prefs` VALUES ('default_loss_on_asset_disposal_act', 'glsetup.items', 'varchar', '15', '5660'), ('depreciation_period', 'glsetup.company', 'tinyint', '1', '1'), ('use_manufacturing','setup.company', 'tinyint', 1, '1'), - ('use_fixed_assets','setup.company', 'tinyint', 1, '1'), - ('wip_act', 'glsetup.manuf', 'varchar', '15', ''); + ('use_fixed_assets','setup.company', 'tinyint', 1, '1'); ALTER TABLE `0_wo_issue_items` ADD COLUMN `unit_cost` double NOT NULL default '0' AFTER `qty_issued`; ALTER TABLE `0_wo_requirements` CHANGE COLUMN `std_cost` `unit_cost` double NOT NULL default '0'; diff --git a/sql/en_US-demo.sql b/sql/en_US-demo.sql index 769477f8..c9bf6dab 100644 --- a/sql/en_US-demo.sql +++ b/sql/en_US-demo.sql @@ -2173,7 +2173,6 @@ INSERT INTO `0_sys_prefs` VALUES ('default_loss_on_asset_disposal_act', 'glsetup INSERT INTO `0_sys_prefs` VALUES ('depreciation_period', 'glsetup.company', 'tinyint', '1', '1'); INSERT INTO `0_sys_prefs` VALUES ('use_manufacturing','setup.company', 'tinyint', 1, '1'); INSERT INTO `0_sys_prefs` VALUES ('use_fixed_assets','setup.company', 'tinyint', 1, '1'); -INSERT INTO `0_sys_prefs` VALUES ('wip_act', 'glsetup.manuf', 'varchar', '15', '1530'); -- -------------------------------------------------------- diff --git a/sql/en_US-new.sql b/sql/en_US-new.sql index 41e7a4db..6984dfb0 100644 --- a/sql/en_US-new.sql +++ b/sql/en_US-new.sql @@ -1896,7 +1896,6 @@ INSERT INTO `0_sys_prefs` VALUES ('default_loss_on_asset_disposal_act', 'glsetup INSERT INTO `0_sys_prefs` VALUES ('depreciation_period', 'glsetup.company', 'tinyint', '1', '1'); INSERT INTO `0_sys_prefs` VALUES ('use_manufacturing','setup.company', 'tinyint', 1, '1'); INSERT INTO `0_sys_prefs` VALUES ('use_fixed_assets','setup.company', 'tinyint', 1, '1'); -INSERT INTO `0_sys_prefs` VALUES ('wip_act', 'glsetup.manuf', 'varchar', '15', '1530'); -- -------------------------------------------------------- -- 2.30.2