From: Janusz Dobrowolski <janusz@frontaccounting.eu>
Date: Fri, 17 Apr 2015 08:00:27 +0000 (+0200)
Subject: Fixed small issues in upgrade procedures.
X-Git-Tag: v2.4.2~19^2~201
X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=commitdiff_plain;h=01b608e906fb9c86b129d3086fcb0a2258ef08e2;p=fa-stable.git

Fixed small issues in upgrade procedures.
---

diff --git a/admin/includes/fa_patch.class.inc b/admin/includes/fa_patch.class.inc
index 6aa485fe..c62417b9 100644
--- a/admin/includes/fa_patch.class.inc
+++ b/admin/includes/fa_patch.class.inc
@@ -24,7 +24,7 @@ class fa_patch {
 	var $backup;				// pre-upgrade backup filename
 
 	var $errors = array();
-	var	$ma_upgrade_time = 300;
+	var	$max_upgrade_time = 300;
 
 	function fa_patch()
 	{
@@ -63,7 +63,7 @@ class fa_patch {
 			foreach($exts as $ext)
 				if ($ext['name'] == $ins['name'] && (!check_src_ext_version($ins['version']))) {
 					$mods[$key]['active'] = false;
-					$this->log_error(sprintf(_("Uncompatible extension '%s' disabled for company %d."), $ins['name'], $this->cur_company));
+					$this->log_error(sprintf(_("Uncompatible extension '%s' disabled for company %d."), $ins['name'], $this->cur_company), 'Notice');
 					$fixed = true;
 					continue 2;
 				}
diff --git a/sql/alter2.4.php b/sql/alter2.4.php
index 7fc60b38..4fd3563f 100644
--- a/sql/alter2.4.php
+++ b/sql/alter2.4.php
@@ -252,6 +252,7 @@ class fa2_4 extends fa_patch {
 				'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'),
 		);
 
 		foreach($dropcol as $table => $columns)
diff --git a/sql/alter2.4.sql b/sql/alter2.4.sql
index 66910137..3f28cd7b 100644
--- a/sql/alter2.4.sql
+++ b/sql/alter2.4.sql
@@ -234,9 +234,6 @@ ALTER TABLE `0_stock_moves` DROP COLUMN `visible`;
 
 UPDATE `0_stock_moves` SET
 	price = price*(1-discount_percent);
-ALTER TABLE `0_stock_moves` DROP COLUMN `discount_percent`;
-
-ALTER TABLE `0_stock_moves` DROP COLUMN `person_id`;
 
 DROP TABLE IF EXISTS `0_movement_types`;