X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sql%2Falter2.4rc1.sql;h=d71a92dc6986b2e1fd58c8aad1f7b702b4812f71;hb=9481e23e6d03f39f7d9e745f86bd1be5f703b96d;hp=b220d62ad76a268d602ef473549775c06effe06b;hpb=a221a215b970c0b50bcbb9647ac7ca6244a8d009;p=fa-stable.git

diff --git a/sql/alter2.4rc1.sql b/sql/alter2.4rc1.sql
index b220d62a..d71a92dc 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`;
@@ -23,10 +24,28 @@ 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');
 
+# 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';
+
+UPDATE `0_wo_issue_items` i, `0_stock_moves` m
+	SET i.unit_cost=m.standard_cost
+	WHERE i.unit_cost=0 AND i.stock_id=m.stock_id AND m.trans_no=i.issue_id AND m.`type`=28 AND m.qty=-i.qty_issued;
+
+UPDATE `0_wo_requirements` r, `0_stock_moves` m
+	SET r.unit_cost=m.standard_cost
+	WHERE r.unit_cost=0 AND r.stock_id=m.stock_id AND m.trans_no=r.workorder_id AND m.`type`=26 AND m.qty=-r.units_issued;
+
+UPDATE `0_bank_trans` SET person_id=trans_no WHERE person_type_id=26;
+
+ALTER TABLE `0_budget_trans` CHANGE `counter` `id` int(11) NOT NULL AUTO_INCREMENT;
+ALTER TABLE `0_sys_prefs` CHANGE `value` `value` text NOT NULL default '';