From: Janusz Dobrowolski <janusz@frontaccounting.eu>
Date: Fri, 17 Apr 2015 15:54:42 +0000 (+0200)
Subject: Fixed upgrade procedures (obsolete columns dropped in post_install phase), restored... 
X-Git-Tag: v2.4.2~19^2~199
X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=commitdiff_plain;h=b6ae2ddcd0cbc571edd01157ca1c8d44bbe071ef;p=fa-stable.git

Fixed upgrade procedures (obsolete columns dropped in post_install phase), restored lost line in initial demo sql file.
---

diff --git a/sql/alter2.4.php b/sql/alter2.4.php
index 4fd3563f..768da67b 100644
--- a/sql/alter2.4.php
+++ b/sql/alter2.4.php
@@ -249,10 +249,11 @@ class fa2_4 extends fa_patch {
 		//remove obsolete and temporary columns.
 		// this have to be done here as db_import rearranges alter query order
 		$dropcol = array(
+				'tax_groups' => array('tax_shipping'),
 				'tax_group_items' => array('rate'),
 				'budget_trans' => array('type', 'type_no', 'person_id', 'person_type_id', 'memo_'),
 				'cust_branch' => array('contact_name', 'disable_trans'),
-				'stock_moves' => array('discount_percent',  'person_id'),
+				'stock_moves' => array('discount_percent', 'visible', 'person_id'),
 		);
 
 		foreach($dropcol as $table => $columns)
diff --git a/sql/alter2.4.sql b/sql/alter2.4.sql
index 3f28cd7b..56aa0199 100644
--- a/sql/alter2.4.sql
+++ b/sql/alter2.4.sql
@@ -32,7 +32,6 @@ UPDATE `0_tax_group_items` tgi
 	SET tgi.tax_shipping=1
 	WHERE tgi.rate=(SELECT 0_tax_types.rate FROM 0_tax_types, 0_tax_groups 
 		WHERE tax_shipping=1 AND tgi.tax_group_id=0_tax_groups.id AND tgi.tax_type_id=0_tax_types.id);
-ALTER TABLE `0_tax_groups` DROP COLUMN `tax_shipping`;
 
 ALTER TABLE `0_sales_order_details` ADD KEY `stkcode` (`stk_code`);
 ALTER TABLE `0_purch_order_details` ADD KEY `itemcode` (`item_code`);
@@ -229,7 +228,6 @@ DELETE moves
 	INNER JOIN (SELECT * FROM `0_stock_moves` WHERE `type`=11 AND `qty`<0) writeoffs ON writeoffs.`trans_no`=moves.`trans_no` AND writeoffs.`type`=11
 	WHERE moves.`type`=11;
 
-ALTER TABLE `0_stock_moves` DROP COLUMN `visible`;
 # stock_moves.discount_percent field are obsolete
 
 UPDATE `0_stock_moves` SET
diff --git a/sql/en_US-new.sql b/sql/en_US-new.sql
index 31947a52..39257f71 100644
--- a/sql/en_US-new.sql
+++ b/sql/en_US-new.sql
@@ -1611,6 +1611,7 @@ CREATE TABLE IF NOT EXISTS `0_stock_master` (
 -- Table structure for table `0_stock_moves`
 --
 
+DROP TABLE IF EXISTS `0_stock_moves`;
 CREATE TABLE `0_stock_moves` (
   `trans_id` int(11) NOT NULL AUTO_INCREMENT,
   `trans_no` int(11) NOT NULL DEFAULT '0',