From d3e645c7d68242c2d081760d84b6c7820604be2f Mon Sep 17 00:00:00 2001 From: Joe Hunt Date: Sat, 27 Jun 2009 14:54:18 +0000 Subject: [PATCH] Corrections to default COAs. --- CHANGELOG.txt | 6 ++++++ sql/alter2.2.sql | 2 +- sql/en_US-demo.sql | 20 +++++++++++--------- sql/en_US-new.sql | 10 ++++++---- 4 files changed, 24 insertions(+), 14 deletions(-) diff --git a/CHANGELOG.txt b/CHANGELOG.txt index e5d7e664..560ec670 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -19,6 +19,12 @@ Legend: ! -> Note $ -> Affected files +27-Jun-2009 Joe Hunt +# Corrections to default COAs. +$ /sql/alter2.2.sql + /sql/en_US-new.sql + /sql/en_US-demo.sql + 26-Jun-2009 Joe Hunt + Added Print of Work Order and GRN Valuation Report # Small bug in company preferences diff --git a/sql/alter2.2.sql b/sql/alter2.2.sql index b6c7735a..ff6a0ad1 100644 --- a/sql/alter2.2.sql +++ b/sql/alter2.2.sql @@ -11,7 +11,7 @@ ALTER TABLE `0_company` DROP COLUMN `purch_exchange_diff_act`; ALTER TABLE `0_company` ADD COLUMN`profit_loss_year_act` VARCHAR(11) NOT NULL DEFAULT '' AFTER `exchange_diff_act`; ALTER TABLE `0_company` ADD COLUMN `time_zone` TINYINT(1) NOT NULL DEFAULT '0'; ALTER TABLE `0_company` CHANGE `grn_act` `bank_charge_act` VARCHAR(11) NOT NULL DEFAULT ''; -#INSERT INTO `0_chart_master` VALUES ('8900', '', 'Profit and Loss this year', '52', '0'); +#INSERT INTO `0_chart_master` VALUES ('9990', '', 'Profit and Loss this year', '52', '0'); UPDATE `0_company` SET `profit_loss_year_act`='9990', `version_id`='2.2' WHERE `coy_code`=1; ALTER TABLE `0_stock_category` DROP COLUMN `stock_act`; diff --git a/sql/en_US-demo.sql b/sql/en_US-demo.sql index ae1c6ac8..c08076a1 100644 --- a/sql/en_US-demo.sql +++ b/sql/en_US-demo.sql @@ -1449,16 +1449,17 @@ CREATE TABLE `0_stock_category` ( `dflt_dim1` int(11) default NULL, `dflt_dim2` int(11) default NULL, `inactive` tinyint(1) NOT NULL default '0', + `dflt_no_sale` tinyint(1) NOT NULL default '0', PRIMARY KEY (`category_id`), UNIQUE KEY `description` (`description`) ) TYPE=MyISAM AUTO_INCREMENT=5 ; ### Data of table `0_stock_category` ### -INSERT INTO `0_stock_category` VALUES ('1', 'Components', '1', 'each', 'B', '4010', '1510', '5010', '5040', '1530', '0', '0', '0'); -INSERT INTO `0_stock_category` VALUES ('2', 'Charges', '1', 'each', 'D', '4010', '1510', '5010', '5040', '1530', '0', '0', '0'); -INSERT INTO `0_stock_category` VALUES ('3', 'Systems', '1', 'each', 'M', '4010', '1510', '5010', '5040', '1530', '0', '0', '0'); -INSERT INTO `0_stock_category` VALUES ('4', 'Services', '1', 'hrs', 'D', '4010', '1510', '5010', '5040', '1530', '0', '0', '0'); +INSERT INTO `0_stock_category` VALUES ('1', 'Components', '1', 'each', 'B', '4010', '1510', '5010', '5040', '1530', '0', '0', '0', '0'); +INSERT INTO `0_stock_category` VALUES ('2', 'Charges', '1', 'each', 'D', '4010', '1510', '5010', '5040', '1530', '0', '0', '0', '0'); +INSERT INTO `0_stock_category` VALUES ('3', 'Systems', '1', 'each', 'M', '4010', '1510', '5010', '5040', '1530', '0', '0', '0', '0'); +INSERT INTO `0_stock_category` VALUES ('4', 'Services', '1', 'hrs', 'D', '4010', '1510', '5010', '5040', '1530', '0', '0', '0', '0'); ### Structure of table `0_stock_master` ### @@ -1486,17 +1487,18 @@ CREATE TABLE `0_stock_master` ( `labour_cost` double NOT NULL default '0', `overhead_cost` double NOT NULL default '0', `inactive` tinyint(1) NOT NULL default '0', + `no_sale` tinyint(1) NOT NULL default '0', PRIMARY KEY (`stock_id`) ) TYPE=InnoDB ; ### Data of table `0_stock_master` ### -INSERT INTO `0_stock_master` VALUES ('102', '1', '1', '17inch VGA Monitor', '', 'ea.', 'B', '4010', '5010', '1510', '5040', '1530', '0', '0', '0', '0', '10', '0', '0', '0'); -INSERT INTO `0_stock_master` VALUES ('103', '1', '1', '32MB VGA Card', '', 'ea.', 'B', '4010', '5010', '1510', '5040', '1530', '0', '0', '0', '0', '11', '0', '0', '0'); -INSERT INTO `0_stock_master` VALUES ('104', '1', '1', '52x CD Drive', '', 'ea.', 'B', '4010', '5010', '1510', '5040', '1530', '0', '0', '0', '0', '12', '0', '0', '0'); -INSERT INTO `0_stock_master` VALUES ('201', '4', '1', 'Assembly Labour', '', 'hrs', 'D', '4010', '5010', '5010', '5040', '1530', '0', '0', '0', '0', '0', '0', '0', '0'); -INSERT INTO `0_stock_master` VALUES ('3400', '3', '1', 'P4 Business System', '', 'ea.', 'M', '4010', '5010', '1540', '5040', '1530', '0', '0', '0', '0', '33', '3.9999999999999', '2', '0'); +INSERT INTO `0_stock_master` VALUES ('102', '1', '1', '17inch VGA Monitor', '', 'ea.', 'B', '4010', '5010', '1510', '5040', '1530', '0', '0', '0', '0', '10', '0', '0', '0', '0'); +INSERT INTO `0_stock_master` VALUES ('103', '1', '1', '32MB VGA Card', '', 'ea.', 'B', '4010', '5010', '1510', '5040', '1530', '0', '0', '0', '0', '11', '0', '0', '0', '0'); +INSERT INTO `0_stock_master` VALUES ('104', '1', '1', '52x CD Drive', '', 'ea.', 'B', '4010', '5010', '1510', '5040', '1530', '0', '0', '0', '0', '12', '0', '0', '0', '0'); +INSERT INTO `0_stock_master` VALUES ('201', '4', '1', 'Assembly Labour', '', 'hrs', 'D', '4010', '5010', '5010', '5040', '1530', '0', '0', '0', '0', '0', '0', '0', '0', '0'); +INSERT INTO `0_stock_master` VALUES ('3400', '3', '1', 'P4 Business System', '', 'ea.', 'M', '4010', '5010', '1540', '5040', '1530', '0', '0', '0', '0', '33', '3.9999999999999', '2', '0', '0'); ### Structure of table `0_stock_moves` ### diff --git a/sql/en_US-new.sql b/sql/en_US-new.sql index 79664e89..596eb544 100644 --- a/sql/en_US-new.sql +++ b/sql/en_US-new.sql @@ -1280,6 +1280,7 @@ CREATE TABLE `0_stock_category` ( `dflt_dim1` int(11) default NULL, `dflt_dim2` int(11) default NULL, `inactive` tinyint(1) NOT NULL default '0', + `dflt_no_sale` tinyint(1) NOT NULL default '0', PRIMARY KEY (`category_id`), UNIQUE KEY `description` (`description`) ) TYPE=MyISAM AUTO_INCREMENT=5 ; @@ -1287,10 +1288,10 @@ CREATE TABLE `0_stock_category` ( ### Data of table `0_stock_category` ### -INSERT INTO `0_stock_category` VALUES ('1', 'Components', '1', 'each', 'B', '4010', '1510', '5010', '5040', '1530', '0', '0', '0'); -INSERT INTO `0_stock_category` VALUES ('2', 'Charges', '1', 'each', 'D', '4010', '1510', '5010', '5040', '1530', '0', '0', '0'); -INSERT INTO `0_stock_category` VALUES ('3', 'Systems', '1', 'each', 'M', '4010', '1510', '5010', '5040', '1530', '0', '0', '0'); -INSERT INTO `0_stock_category` VALUES ('4', 'Services', '1', 'hrs', 'D', '4010', '1510', '5010', '5040', '1530', '0', '0', '0'); +INSERT INTO `0_stock_category` VALUES ('1', 'Components', '1', 'each', 'B', '4010', '1510', '5010', '5040', '1530', '0', '0', '0', '0'); +INSERT INTO `0_stock_category` VALUES ('2', 'Charges', '1', 'each', 'D', '4010', '1510', '5010', '5040', '1530', '0', '0', '0', '0'); +INSERT INTO `0_stock_category` VALUES ('3', 'Systems', '1', 'each', 'M', '4010', '1510', '5010', '5040', '1530', '0', '0', '0', '0'); +INSERT INTO `0_stock_category` VALUES ('4', 'Services', '1', 'hrs', 'D', '4010', '1510', '5010', '5040', '1530', '0', '0', '0', '0'); ### Structure of table `0_stock_master` ### @@ -1318,6 +1319,7 @@ CREATE TABLE `0_stock_master` ( `labour_cost` double NOT NULL default '0', `overhead_cost` double NOT NULL default '0', `inactive` tinyint(1) NOT NULL default '0', + `no_sale` tinyint(1) NOT NULL default '0', PRIMARY KEY (`stock_id`) ) TYPE=InnoDB ; -- 2.30.2