Fixed small issues in upgrade procedures.

diff --git a/admin/includes/fa_patch.class.inc b/admin/includes/fa_patch.class.inc
index 6aa485fe3df6a594286f9267ea0759c7aa0fdc05..c62417b98efa85a4cedb07cb9764802011427602 100644 (file)
--- 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 7fc60b38716106f89dd2fbcb08948fde3e0db8a8..4fd3563f9fc4062e0129eb3493ab1f6e1747340c 100644 (file)
--- 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 669101377bb79d60d9dae4104e6181d35d9fee66..3f28cd7b201cfac55ab0b3aee71915f1caae0f98 100644 (file)
--- 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`;