From dfb5670c0eb599ea0df7a9148a2864feec324e74 Mon Sep 17 00:00:00 2001 From: Janusz Dobrowolski Date: Sun, 10 Jan 2016 10:45:45 +0100 Subject: [PATCH] Manufacturing: assembly account renamed to WIP account. --- admin/gl_setup.php | 6 +++--- gl/includes/db/gl_db_accounts.inc | 2 +- includes/db/inventory_db.inc | 2 +- inventory/includes/db/items_category_db.inc | 10 ++++----- inventory/includes/db/items_db.inc | 10 ++++----- inventory/manage/item_categories.php | 16 +++++++------- inventory/manage/items.php | 12 +++++------ .../includes/db/work_order_costing_db.inc | 8 +++---- .../includes/db/work_order_issues_db.inc | 2 +- .../db/work_order_produce_items_db.inc | 2 +- manufacturing/includes/db/work_orders_db.inc | 2 +- sql/alter2.4.sql | 21 ++++++++++++++----- sql/alter2.4rc1.sql | 6 ++++++ sql/en_US-demo.sql | 6 +++--- sql/en_US-new.sql | 6 +++--- 15 files changed, 64 insertions(+), 47 deletions(-) diff --git a/admin/gl_setup.php b/admin/gl_setup.php index 07f70b7b..a015395e 100644 --- a/admin/gl_setup.php +++ b/admin/gl_setup.php @@ -77,7 +77,7 @@ if (isset($_POST['submit']) && can_process()) 'debtors_act', 'pyt_discount_act', 'creditors_act', 'freight_act', 'deferred_income_act', 'exchange_diff_act', 'bank_charge_act', 'default_sales_act', 'default_sales_discount_act', 'default_prompt_payment_act', 'default_inventory_act', 'default_cogs_act', 'depreciation_period', - 'default_loss_on_asset_disposal_act', 'default_adj_act', 'default_inv_sales_act', 'default_assembly_act', 'legal_text', + 'default_loss_on_asset_disposal_act', 'default_adj_act', 'default_inv_sales_act', 'default_wip_act', 'legal_text', 'past_due_days', 'default_workorder_required', 'default_dim_required', 'default_receival_required', 'default_delivery_required', 'default_quote_valid_days', 'grn_clearing_act', 'tax_algorithm', 'no_zero_lines_amount', 'show_po_item_codes', 'accounts_alpha', 'loc_notification', 'print_invoice_no', @@ -119,7 +119,7 @@ $_POST['default_inventory_act'] = $myrow["default_inventory_act"]; $_POST['default_cogs_act'] = $myrow["default_cogs_act"]; $_POST['default_adj_act'] = $myrow["default_adj_act"]; $_POST['default_inv_sales_act'] = $myrow['default_inv_sales_act']; -$_POST['default_assembly_act'] = $myrow['default_assembly_act']; +$_POST['default_wip_act'] = $myrow['default_wip_act']; $_POST['allow_negative_stock'] = $myrow['allow_negative_stock']; @@ -251,7 +251,7 @@ gl_all_accounts_list_row(_("C.O.G.S. Account:"), 'default_cogs_act', $_POST['def gl_all_accounts_list_row(_("Inventory Adjustments Account:"), 'default_adj_act', $_POST['default_adj_act']); -gl_all_accounts_list_row(_("Item Assembly Costs Account:"), 'default_assembly_act', $_POST['default_assembly_act']); +gl_all_accounts_list_row(_("WIP Account:"), 'default_wip_act', $_POST['default_wip_act']); //---------------- diff --git a/gl/includes/db/gl_db_accounts.inc b/gl/includes/db/gl_db_accounts.inc index 3244b176..6ee99382 100644 --- a/gl/includes/db/gl_db_accounts.inc +++ b/gl/includes/db/gl_db_accounts.inc @@ -111,7 +111,7 @@ function gl_account_in_company_defaults($acc) OR name='default_cogs_act' OR name='default_adj_act' OR name='default_inv_sales_act' - OR name='default_assembly_act') AND value=".db_escape($acc); + OR name='default_wip_act') AND value=".db_escape($acc); $result = db_query($sql,"Couldn't test for default company GL codes"); $myrow = db_fetch_row($result); diff --git a/includes/db/inventory_db.inc b/includes/db/inventory_db.inc index 19f54f2b..55e3b687 100644 --- a/includes/db/inventory_db.inc +++ b/includes/db/inventory_db.inc @@ -317,7 +317,7 @@ function get_stock_gl_code($stock_id) { /*Gets the GL Codes relevant to the item account */ $sql = "SELECT mb_flag, inventory_account, cogs_account, - adjustment_account, sales_account, assembly_account, dimension_id, dimension2_id FROM + adjustment_account, sales_account, wip_account, dimension_id, dimension2_id FROM ".TB_PREF."stock_master WHERE stock_id = ".db_escape($stock_id); $get = db_query($sql,"retreive stock gl code"); diff --git a/inventory/includes/db/items_category_db.inc b/inventory/includes/db/items_category_db.inc index 3c643d52..8b6d872a 100644 --- a/inventory/includes/db/items_category_db.inc +++ b/inventory/includes/db/items_category_db.inc @@ -10,12 +10,12 @@ See the License here . ***********************************************************************/ function add_item_category($description, $tax_type_id, $sales_account, - $cogs_account, $inventory_account, $adjustment_account, $assembly_account, + $cogs_account, $inventory_account, $adjustment_account, $wip_account, $units, $mb_flag, $dim1, $dim2, $no_sale, $no_purchase) { $sql = "INSERT INTO ".TB_PREF."stock_category (description, dflt_tax_type, dflt_units, dflt_mb_flag, dflt_sales_act, dflt_cogs_act, - dflt_inventory_act, dflt_adjustment_act, dflt_assembly_act, + dflt_inventory_act, dflt_adjustment_act, dflt_wip_act, dflt_dim1, dflt_dim2, dflt_no_sale, dflt_no_purchase) VALUES (" .db_escape($description)."," @@ -26,7 +26,7 @@ function add_item_category($description, $tax_type_id, $sales_account, .db_escape($cogs_account)."," .db_escape($inventory_account)."," .db_escape($adjustment_account)."," - .db_escape($assembly_account)."," + .db_escape($wip_account)."," .db_escape($dim1)."," .db_escape($dim2)."," .db_escape($no_sale)."," @@ -37,7 +37,7 @@ function add_item_category($description, $tax_type_id, $sales_account, function update_item_category($id, $description, $tax_type_id, $sales_account, $cogs_account, $inventory_account, $adjustment_account, - $assembly_account, $units, $mb_flag, $dim1, $dim2, $no_sale, $no_purchase) + $wip_account, $units, $mb_flag, $dim1, $dim2, $no_sale, $no_purchase) { $sql = "UPDATE ".TB_PREF."stock_category SET " @@ -49,7 +49,7 @@ function update_item_category($id, $description, $tax_type_id, ."dflt_cogs_act = ".db_escape($cogs_account)."," ."dflt_inventory_act = ".db_escape($inventory_account)."," ."dflt_adjustment_act = ".db_escape($adjustment_account)."," - ."dflt_assembly_act = ".db_escape($assembly_account)."," + ."dflt_wip_act = ".db_escape($wip_account)."," ."dflt_dim1 = ".db_escape($dim1)."," ."dflt_dim2 = ".db_escape($dim2)."," ."dflt_no_sale = ".db_escape($no_sale)."," diff --git a/inventory/includes/db/items_db.inc b/inventory/includes/db/items_db.inc index 4c23ee07..df28cfee 100644 --- a/inventory/includes/db/items_db.inc +++ b/inventory/includes/db/items_db.inc @@ -11,7 +11,7 @@ ***********************************************************************/ function update_item($stock_id, $description, $long_description, $category_id, $tax_type_id, $units='', $mb_flag='', $sales_account, $inventory_account, - $cogs_account, $adjustment_account, $assembly_account, $dimension_id, + $cogs_account, $adjustment_account, $wip_account, $dimension_id, $dimension2_id, $no_sale, $editable, $no_purchase, $depreciation_method = 'D', $depreciation_rate=100, $depreciation_factor=1, $depreciation_start=null, $fa_class_id=null) @@ -23,7 +23,7 @@ function update_item($stock_id, $description, $long_description, $category_id, inventory_account=".db_escape($inventory_account).", cogs_account=".db_escape($cogs_account).", adjustment_account=".db_escape($adjustment_account).", - assembly_account=".db_escape($assembly_account).", + wip_account=".db_escape($wip_account).", dimension_id=".db_escape($dimension_id).", dimension2_id=".db_escape($dimension2_id).", tax_type_id=".db_escape($tax_type_id).", @@ -55,21 +55,21 @@ function update_item($stock_id, $description, $long_description, $category_id, function add_item($stock_id, $description, $long_description, $category_id, $tax_type_id, $units, $mb_flag, $sales_account, $inventory_account, - $cogs_account, $adjustment_account, $assembly_account, $dimension_id, + $cogs_account, $adjustment_account, $wip_account, $dimension_id, $dimension2_id, $no_sale, $editable, $no_purchase, $depreciation_method='D', $depreciation_rate=100, $depreciation_factor=1, $depreciation_start=null, $fa_class_id=null) { $sql = "INSERT INTO ".TB_PREF."stock_master (stock_id, description, long_description, category_id, tax_type_id, units, mb_flag, sales_account, inventory_account, cogs_account, - adjustment_account, assembly_account, dimension_id, dimension2_id, no_sale, no_purchase, editable, + adjustment_account, wip_account, dimension_id, dimension2_id, no_sale, no_purchase, editable, depreciation_method, depreciation_rate, depreciation_factor, depreciation_start, depreciation_date, fa_class_id) VALUES (".db_escape($stock_id).", ".db_escape($description).", ".db_escape($long_description).", ".db_escape($category_id).", ".db_escape($tax_type_id).", " .db_escape($units).", ".db_escape($mb_flag).", ".db_escape($sales_account).", ".db_escape($inventory_account) .", ".db_escape($cogs_account).",".db_escape($adjustment_account) - .", ".db_escape($assembly_account).", " + .", ".db_escape($wip_account).", " .db_escape($dimension_id).", ".db_escape($dimension2_id)."," .db_escape($no_sale)."," .db_escape($no_purchase)."," diff --git a/inventory/manage/item_categories.php b/inventory/manage/item_categories.php index cd39e498..136c0a80 100644 --- a/inventory/manage/item_categories.php +++ b/inventory/manage/item_categories.php @@ -55,7 +55,7 @@ if ($Mode=='ADD_ITEM' || $Mode=='UPDATE_ITEM') update_item_category($selected_id, $_POST['description'], $_POST['tax_type_id'], $_POST['sales_account'], $_POST['cogs_account'], $_POST['inventory_account'], - $_POST['adjustment_account'], $_POST['assembly_account'], + $_POST['adjustment_account'], $_POST['wip_account'], $_POST['units'], $_POST['mb_flag'], $_POST['dim1'], $_POST['dim2'], check_value('no_sale'), check_value('no_purchase')); display_notification(_('Selected item category has been updated')); @@ -65,7 +65,7 @@ if ($Mode=='ADD_ITEM' || $Mode=='UPDATE_ITEM') add_item_category($_POST['description'], $_POST['tax_type_id'], $_POST['sales_account'], $_POST['cogs_account'], $_POST['inventory_account'], - $_POST['adjustment_account'], $_POST['assembly_account'], + $_POST['adjustment_account'], $_POST['wip_account'], $_POST['units'], $_POST['mb_flag'], $_POST['dim1'], $_POST['dim2'], check_value('no_sale'), check_value('no_purchase')); display_notification(_('New item category has been added')); @@ -142,7 +142,7 @@ while ($myrow = db_fetch($result)) label_cell($myrow["dflt_cogs_act"], "align=center"); label_cell($myrow["dflt_adjustment_act"], "align=center"); if (!$fixed_asset) - label_cell($myrow["dflt_assembly_act"], "align=center"); + label_cell($myrow["dflt_wip_act"], "align=center"); inactive_control_cell($myrow["category_id"], $myrow["inactive"], 'stock_category', 'category_id'); edit_button_cell("Edit".$myrow["category_id"], _("Edit")); delete_button_cell("Delete".$myrow["category_id"], _("Delete")); @@ -170,7 +170,7 @@ if ($selected_id != -1) $_POST['cogs_account'] = $myrow["dflt_cogs_act"]; $_POST['inventory_account'] = $myrow["dflt_inventory_act"]; $_POST['adjustment_account'] = $myrow["dflt_adjustment_act"]; - $_POST['assembly_account'] = $myrow["dflt_assembly_act"]; + $_POST['wip_account'] = $myrow["dflt_wip_act"]; $_POST['units'] = $myrow["dflt_units"]; $_POST['mb_flag'] = $myrow["dflt_mb_flag"]; $_POST['dim1'] = $myrow["dflt_dim1"]; @@ -200,8 +200,8 @@ if ($selected_id != -1) if (get_post('adjustment_account') == "") $_POST['adjustment_account'] = $company_record["default_adj_act"]; - if (get_post('assembly_account') == "") - $_POST['assembly_account'] = $company_record["default_assembly_act"]; + if (get_post('wip_account') == "") + $_POST['wip_account'] = $company_record["default_wip_act"]; } @@ -248,9 +248,9 @@ else } if (is_manufactured($_POST['mb_flag'])) - gl_all_accounts_list_row(_("Item Assembly Costs Account:"), 'assembly_account', $_POST['assembly_account']); + gl_all_accounts_list_row(_("Item Assembly Costs Account:"), 'wip_account', $_POST['wip_account']); else - hidden('assembly_account', $_POST['assembly_account']); + hidden('wip_account', $_POST['wip_account']); $dim = get_company_pref('use_dimension'); if ($dim >= 1) diff --git a/inventory/manage/items.php b/inventory/manage/items.php index 21e2ab7a..07cfcfcd 100644 --- a/inventory/manage/items.php +++ b/inventory/manage/items.php @@ -224,7 +224,7 @@ if (isset($_POST['addupdate'])) $_POST['tax_type_id'], get_post('units'), get_post('fixed_asset') ? 'F' : get_post('mb_flag'), $_POST['sales_account'], $_POST['inventory_account'], $_POST['cogs_account'], - $_POST['adjustment_account'], $_POST['assembly_account'], + $_POST['adjustment_account'], $_POST['wip_account'], $_POST['dimension_id'], $_POST['dimension2_id'], check_value('no_sale'), check_value('editable'), check_value('no_purchase'), get_post('depreciation_method'), input_num('depreciation_rate'), input_num('depreciation_factor'), get_post('depreciation_start'), @@ -245,7 +245,7 @@ if (isset($_POST['addupdate'])) $_POST['long_description'], $_POST['category_id'], $_POST['tax_type_id'], $_POST['units'], get_post('fixed_asset') ? 'F' : get_post('mb_flag'), $_POST['sales_account'], $_POST['inventory_account'], $_POST['cogs_account'], - $_POST['adjustment_account'], $_POST['assembly_account'], + $_POST['adjustment_account'], $_POST['wip_account'], $_POST['dimension_id'], $_POST['dimension2_id'], check_value('no_sale'), check_value('editable'), check_value('no_purchase'), get_post('depreciation_method'), input_num('depreciation_rate'), input_num('depreciation_factor'), get_post('depreciation_start'), @@ -348,7 +348,7 @@ function item_settings(&$stock_id, $new_item) $_POST['inventory_account'] = $myrow['inventory_account']; $_POST['cogs_account'] = $myrow['cogs_account']; $_POST['adjustment_account'] = $myrow['adjustment_account']; - $_POST['assembly_account'] = $myrow['assembly_account']; + $_POST['wip_account'] = $myrow['wip_account']; $_POST['dimension_id'] = $myrow['dimension_id']; $_POST['dimension2_id'] = $myrow['dimension2_id']; $_POST['no_sale'] = $myrow['no_sale']; @@ -380,7 +380,7 @@ function item_settings(&$stock_id, $new_item) $_POST['cogs_account'] = $category_record["dflt_cogs_act"]; $_POST['sales_account'] = $category_record["dflt_sales_act"]; $_POST['adjustment_account'] = $category_record["dflt_adjustment_act"]; - $_POST['assembly_account'] = $category_record["dflt_assembly_act"]; + $_POST['wip_account'] = $category_record["dflt_wip_act"]; $_POST['dimension_id'] = $category_record["dflt_dim1"]; $_POST['dimension2_id'] = $category_record["dflt_dim2"]; $_POST['no_sale'] = $category_record["dflt_no_sale"]; @@ -487,9 +487,9 @@ function item_settings(&$stock_id, $new_item) if (is_manufactured($_POST['mb_flag'])) - gl_all_accounts_list_row(_("Item Assembly Costs Account:"), 'assembly_account', $_POST['assembly_account']); + gl_all_accounts_list_row(_("WIP Account:"), 'wip_account', $_POST['wip_account']); else - hidden('assembly_account', $_POST['assembly_account']); + hidden('wip_account', $_POST['wip_account']); table_section_title(_("Other")); diff --git a/manufacturing/includes/db/work_order_costing_db.inc b/manufacturing/includes/db/work_order_costing_db.inc index 8992f87d..845b6300 100644 --- a/manufacturing/includes/db/work_order_costing_db.inc +++ b/manufacturing/includes/db/work_order_costing_db.inc @@ -144,7 +144,7 @@ function add_issue_cost($stock_id, $qty, $date_, $costs, $adj_only=false) -$costs); //GL Posting to inventory adjustment account add_gl_trans_std_cost(ST_JOURNAL, $id, $date_, - $stock_gl_code["assembly_account"], + $stock_gl_code["wip_account"], $stock_gl_code['dimension_id'], $stock_gl_code['dimension2_id'], $memo, $costs); @@ -195,11 +195,11 @@ function add_wo_costs_journal($wo_id, $amount, $cost_type, $cr_acc, $date, $dim1 } add_journal(ST_JOURNAL, $journal_id, $amount, $date, get_company_currency(), $ref); - add_gl_trans_std_cost(ST_JOURNAL, $journal_id, $date, $wo['assembly_account'], + add_gl_trans_std_cost(ST_JOURNAL, $journal_id, $date, $wo['wip_account'], $dim1, $dim2, $wo_cost_types[$cost_type], $amount); $wo = get_work_order($wo_id); - $wip = $wo['assembly_account']; + $wip = $wo['wip_account']; $Refs->save(ST_JOURNAL, $journal_id, $ref); @@ -241,7 +241,7 @@ function work_order_production_gl($woid, $stock_id, $quantity, $date_, $rcv_no) } $wo = get_work_order($woid); - add_gl_trans_std_cost(ST_MANURECEIVE, $rcv_no, $date_, $wo['assembly_account'], + add_gl_trans_std_cost(ST_MANURECEIVE, $rcv_no, $date_, $wo['wip_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 fd89356a..d61e3fc2 100644 --- a/manufacturing/includes/db/work_order_issues_db.inc +++ b/manufacturing/includes/db/work_order_issues_db.inc @@ -72,7 +72,7 @@ function add_work_order_issue($woid, $ref, $to_work_order, $items, $location, $w $stockitem = get_item($wo['stock_id']); - $wip_account = $stockitem["assembly_account"]; + $wip_account = $stockitem["wip_account"]; add_gl_trans_std_cost(ST_MANUISSUE, $number, $date_, $wip_account, 0, 0, $date_.": "._("Issue to")." ".$stockitem["description"], -$total_cost); diff --git a/manufacturing/includes/db/work_order_produce_items_db.inc b/manufacturing/includes/db/work_order_produce_items_db.inc index fecc34bf..d5494451 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_, $product['assembly_account'], + 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'], diff --git a/manufacturing/includes/db/work_orders_db.inc b/manufacturing/includes/db/work_orders_db.inc index 94bc5170..48288367 100644 --- a/manufacturing/includes/db/work_orders_db.inc +++ b/manufacturing/includes/db/work_orders_db.inc @@ -121,7 +121,7 @@ function delete_work_order($woid, $stock_id, $qty, $date) function get_work_order($woid, $allow_null=false) { $sql = "SELECT wo.*,st.description As StockItemName,l.location_name, - l.delivery_address,l.email, l.contact, st.inventory_account, st.assembly_account + l.delivery_address,l.email, l.contact, st.inventory_account, st.wip_account FROM ".TB_PREF."workorders wo, " .TB_PREF."stock_master st, " .TB_PREF."locations l diff --git a/sql/alter2.4.sql b/sql/alter2.4.sql index e8389310..5babed89 100644 --- a/sql/alter2.4.sql +++ b/sql/alter2.4.sql @@ -256,7 +256,7 @@ ALTER TABLE `0_cust_branch` DROP KEY `branch_code`; ALTER TABLE `0_supp_trans` DROP KEY `SupplierID_2`; ALTER TABLE `0_supp_trans` DROP KEY `type`; -# RC1 +# new fixed assets module ALTER TABLE `0_locations` ADD COLUMN `fixed_asset` tinyint(1) NOT NULL DEFAULT '0' after `contact`; DROP TABLE IF EXISTS `0_stock_fa_class`; @@ -278,8 +278,19 @@ ALTER TABLE `0_stock_master` ADD COLUMN `depreciation_date` date NOT NULL DEFAUL ALTER TABLE `0_stock_master` ADD COLUMN `fa_class_id` varchar(20) NOT NULL DEFAULT '' AFTER `depreciation_date`; ALTER TABLE `0_stock_master` CHANGE `actual_cost` `purchase_cost` double NOT NULL default 0; -INSERT INTO `0_sys_prefs` VALUES ('default_loss_on_asset_disposal_act', 'glsetup.items', 'varchar', '15', '5660'); -INSERT INTO `0_sys_prefs` VALUES ('depreciation_period', 'glsetup.company', 'tinyint', '1', '1'); +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'); + +# manufacturing rewrite +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'; + +ALTER TABLE `0_stock_master` DROP COLUMN `last_cost`; +UPDATE `0_stock_master` SET `material_cost`=`material_cost`+`labour_cost`+`overhead_cost`; -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'); +ALTER TABLE `0_stock_master` CHANGE COLUMN `assembly_account` `wip_account` VARCHAR(15) NOT NULL default ''; +ALTER TABLE `0_stock_category` CHANGE COLUMN `dflt_assembly_act` `dflt_wip_act` VARCHAR(15) NOT NULL default ''; +UPDATE `0_sys_prefs` SET `name`='default_wip_act' WHERE `name`='default_assembly_act'; diff --git a/sql/alter2.4rc1.sql b/sql/alter2.4rc1.sql index e4a3fb24..5a1fdab8 100644 --- a/sql/alter2.4rc1.sql +++ b/sql/alter2.4rc1.sql @@ -1,3 +1,4 @@ +# new fixed assets module ALTER TABLE `0_locations` ADD COLUMN `fixed_asset` tinyint(1) NOT NULL DEFAULT '0' after `contact`; DROP TABLE IF EXISTS `0_stock_fa_class`; @@ -25,8 +26,13 @@ INSERT IGNORE INTO `0_sys_prefs` VALUES ('use_manufacturing','setup.company', 'tinyint', 1, '1'), ('use_fixed_assets','setup.company', 'tinyint', 1, '1'); +# manufacturing rewrite 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'; ALTER TABLE `0_stock_master` DROP COLUMN `last_cost`; UPDATE `0_stock_master` SET `material_cost`=`material_cost`+`labour_cost`+`overhead_cost`; + +ALTER TABLE `0_stock_master` CHANGE COLUMN `assembly_account` `wip_account` VARCHAR(15) NOT NULL default ''; +ALTER TABLE `0_stock_category` CHANGE COLUMN `dflt_assembly_act` `dflt_wip_act` VARCHAR(15) NOT NULL default ''; +UPDATE `0_sys_prefs` SET `name`='default_wip_act' WHERE `name`='default_assembly_act'; diff --git a/sql/en_US-demo.sql b/sql/en_US-demo.sql index c9bf6dab..f56d47c9 100644 --- a/sql/en_US-demo.sql +++ b/sql/en_US-demo.sql @@ -1818,7 +1818,7 @@ CREATE TABLE IF NOT EXISTS `0_stock_category` ( `dflt_cogs_act` varchar(15) NOT NULL DEFAULT '', `dflt_inventory_act` varchar(15) NOT NULL DEFAULT '', `dflt_adjustment_act` varchar(15) NOT NULL DEFAULT '', - `dflt_assembly_act` varchar(15) NOT NULL DEFAULT '', + `dflt_wip_act` varchar(15) NOT NULL DEFAULT '', `dflt_dim1` int(11) DEFAULT NULL, `dflt_dim2` int(11) DEFAULT NULL, `inactive` tinyint(1) NOT NULL DEFAULT '0', @@ -1873,7 +1873,7 @@ CREATE TABLE IF NOT EXISTS `0_stock_master` ( `cogs_account` varchar(15) NOT NULL DEFAULT '', `inventory_account` varchar(15) NOT NULL DEFAULT '', `adjustment_account` varchar(15) NOT NULL DEFAULT '', - `assembly_account` varchar(15) NOT NULL DEFAULT '', + `wip_account` varchar(15) NOT NULL DEFAULT '', `dimension_id` int(11) DEFAULT NULL, `dimension2_id` int(11) DEFAULT NULL, `purchase_cost` double NOT NULL DEFAULT '0', @@ -2152,7 +2152,7 @@ INSERT INTO `0_sys_prefs` VALUES ('default_inventory_act', 'glsetup.items', 'var INSERT INTO `0_sys_prefs` VALUES ('default_cogs_act', 'glsetup.items', 'varchar', 15, '5010'); INSERT INTO `0_sys_prefs` VALUES ('default_adj_act', 'glsetup.items', 'varchar', 15, '5040'); INSERT INTO `0_sys_prefs` VALUES ('default_inv_sales_act', 'glsetup.items', 'varchar', 15, '4010'); -INSERT INTO `0_sys_prefs` VALUES ('default_assembly_act', 'glsetup.items', 'varchar', 15, '1530'); +INSERT INTO `0_sys_prefs` VALUES ('default_wip_act', 'glsetup.items', 'varchar', 15, '1530'); INSERT INTO `0_sys_prefs` VALUES ('default_workorder_required', 'glsetup.manuf', 'int', 11, '20'); INSERT INTO `0_sys_prefs` VALUES ('version_id', 'system', 'varchar', 11, '2.4.1'); INSERT INTO `0_sys_prefs` VALUES ('auto_curr_reval', 'setup.company', 'smallint', 6, '1'); diff --git a/sql/en_US-new.sql b/sql/en_US-new.sql index 6984dfb0..aa97ac69 100644 --- a/sql/en_US-new.sql +++ b/sql/en_US-new.sql @@ -1575,7 +1575,7 @@ CREATE TABLE IF NOT EXISTS `0_stock_category` ( `dflt_cogs_act` varchar(15) NOT NULL default '', `dflt_inventory_act` varchar(15) NOT NULL default '', `dflt_adjustment_act` varchar(15) NOT NULL default '', - `dflt_assembly_act` varchar(15) NOT NULL default '', + `dflt_wip_act` varchar(15) NOT NULL default '', `dflt_dim1` int(11) default NULL, `dflt_dim2` int(11) default NULL, `inactive` tinyint(1) NOT NULL default '0', @@ -1630,7 +1630,7 @@ CREATE TABLE IF NOT EXISTS `0_stock_master` ( `cogs_account` varchar(15) NOT NULL default '', `inventory_account` varchar(15) NOT NULL default '', `adjustment_account` varchar(15) NOT NULL default '', - `assembly_account` varchar(15) NOT NULL default '', + `wip_account` varchar(15) NOT NULL default '', `dimension_id` int(11) default NULL, `dimension2_id` int(11) default NULL, `purchase_cost` double NOT NULL default '0', @@ -1875,7 +1875,7 @@ INSERT INTO `0_sys_prefs` VALUES ('default_inventory_act', 'glsetup.items', 'var INSERT INTO `0_sys_prefs` VALUES ('default_cogs_act', 'glsetup.items', 'varchar', 15, '5010'); INSERT INTO `0_sys_prefs` VALUES ('default_adj_act', 'glsetup.items', 'varchar', 15, '5040'); INSERT INTO `0_sys_prefs` VALUES ('default_inv_sales_act', 'glsetup.items', 'varchar', 15, '4010'); -INSERT INTO `0_sys_prefs` VALUES ('default_assembly_act', 'glsetup.items', 'varchar', 15, '1530'); +INSERT INTO `0_sys_prefs` VALUES ('default_wip_act', 'glsetup.items', 'varchar', 15, '1530'); INSERT INTO `0_sys_prefs` VALUES ('default_workorder_required', 'glsetup.manuf', 'int', 11, '20'); INSERT INTO `0_sys_prefs` VALUES ('version_id', 'system', 'varchar', 11, '2.4.1'); INSERT INTO `0_sys_prefs` VALUES ('auto_curr_reval', 'setup.company', 'smallint', 6, '1'); -- 2.30.2