From: Janusz Dobrowolski <janusz@frontaccounting.eu>
Date: Tue, 8 Dec 2015 10:40:34 +0000 (+0100)
Subject: Fixed consistency in sql init/upgrade files.
X-Git-Tag: v2.4.2~19^2~110
X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=commitdiff_plain;h=152583a6363ba2fb6cdfcbe75bd5c50e735e613f;p=fa-stable.git

Fixed consistency in sql init/upgrade files.
---

diff --git a/sql/alter2.4rc1.sql b/sql/alter2.4rc1.sql
index c72c81f7..7755fae7 100644
--- a/sql/alter2.4rc1.sql
+++ b/sql/alter2.4rc1.sql
@@ -13,7 +13,7 @@ CREATE TABLE `0_stock_fa_class` (
 
 ALTER TABLE `0_stock_master` ADD COLUMN `depreciation_method` char(1) NOT NULL DEFAULT 'D' AFTER `editable`;
 ALTER TABLE `0_stock_master` ADD COLUMN `depreciation_rate` double NOT NULL DEFAULT '0' AFTER `depreciation_method`;
-ALTER TABLE `0_stock_master` ADD COLUMN `depreciation_factor` double NOT NULL DEFAULT '0' AFTER `depreciation_par`;
+ALTER TABLE `0_stock_master` ADD COLUMN `depreciation_factor` double NOT NULL DEFAULT '0' AFTER `depreciation_rate`;
 ALTER TABLE `0_stock_master` ADD COLUMN `depreciation_start` date NOT NULL DEFAULT '0000-00-00' AFTER `depreciation_factor`;
 ALTER TABLE `0_stock_master` ADD COLUMN `depreciation_date` date NOT NULL DEFAULT '0000-00-00' AFTER `depreciation_start`;
 ALTER TABLE `0_stock_master` ADD COLUMN `fa_class_id` varchar(20) NOT NULL DEFAULT '' AFTER `depreciation_date`;
diff --git a/sql/en_US-demo.sql b/sql/en_US-demo.sql
index 309a9c46..8bff858e 100644
--- a/sql/en_US-demo.sql
+++ b/sql/en_US-demo.sql
@@ -1848,7 +1848,6 @@ CREATE TABLE `0_stock_fa_class` (
   `parent_id` varchar(20) NOT NULL DEFAULT '',
   `description` varchar(200) NOT NULL DEFAULT '',
   `long_description` tinytext NOT NULL,
-  `depreciation_method` char(1) NOT NULL DEFAULT 'D',
   `depreciation_rate` double NOT NULL DEFAULT '0',
   `inactive` tinyint(1) NOT NULL DEFAULT '0',
   PRIMARY KEY (`fa_class_id`)
diff --git a/sql/en_US-new.sql b/sql/en_US-new.sql
index 3794400b..12da1901 100644
--- a/sql/en_US-new.sql
+++ b/sql/en_US-new.sql
@@ -1606,7 +1606,6 @@ CREATE TABLE `0_stock_fa_class` (
   `parent_id` varchar(20) NOT NULL DEFAULT '',
   `description` varchar(200) NOT NULL DEFAULT '',
   `long_description` tinytext NOT NULL,
-  `depreciation_method` char(1) NOT NULL DEFAULT 'D',
   `depreciation_rate` double NOT NULL DEFAULT '0',
   `inactive` tinyint(1) NOT NULL DEFAULT '0',
   PRIMARY KEY (`fa_class_id`)