diff --git a/htdocs/install/mysql/migration/3.7.0-3.8.0.sql b/htdocs/install/mysql/migration/3.7.0-3.8.0.sql
index 9669fe89e54..5fcf6725e9d 100755
--- a/htdocs/install/mysql/migration/3.7.0-3.8.0.sql
+++ b/htdocs/install/mysql/migration/3.7.0-3.8.0.sql
@@ -156,12 +156,12 @@ ALTER TABLE llx_facturedet ADD COLUMN situation_percent real;
 ALTER TABLE llx_facturedet ADD COLUMN fk_prev_id integer;
 
 -- Convert SMTP config to main entity, so new entities don't get the old values
-UPDATE llx_const SET entity = __ENCRYPT('1')__ WHERE __DECRYPT('entity')__ = 0 AND __DECRYPT('name')__ = "MAIN_MAIL_SENDMODE";
-UPDATE llx_const SET entity = __ENCRYPT('1')__ WHERE __DECRYPT('entity')__ = 0 AND __DECRYPT('name')__ = "MAIN_MAIL_SMTP_PORT";
-UPDATE llx_const SET entity = __ENCRYPT('1')__ WHERE __DECRYPT('entity')__ = 0 AND __DECRYPT('name')__ = "MAIN_MAIL_SMTP_SERVER";
-UPDATE llx_const SET entity = __ENCRYPT('1')__ WHERE __DECRYPT('entity')__ = 0 AND __DECRYPT('name')__ = "MAIN_MAIL_SMTPS_ID";
-UPDATE llx_const SET entity = __ENCRYPT('1')__ WHERE __DECRYPT('entity')__ = 0 AND __DECRYPT('name')__ = "MAIN_MAIL_SMTPS_PW";
-UPDATE llx_const SET entity = __ENCRYPT('1')__ WHERE __DECRYPT('entity')__ = 0 AND __DECRYPT('name')__ = "MAIN_MAIL_EMAIL_TLS";
+UPDATE llx_const SET entity = __ENCRYPT('1')__ WHERE __DECRYPT('entity')__ = 0 AND __DECRYPT('name')__ = 'MAIN_MAIL_SENDMODE';
+UPDATE llx_const SET entity = __ENCRYPT('1')__ WHERE __DECRYPT('entity')__ = 0 AND __DECRYPT('name')__ = 'MAIN_MAIL_SMTP_PORT';
+UPDATE llx_const SET entity = __ENCRYPT('1')__ WHERE __DECRYPT('entity')__ = 0 AND __DECRYPT('name')__ = 'MAIN_MAIL_SMTP_SERVER';
+UPDATE llx_const SET entity = __ENCRYPT('1')__ WHERE __DECRYPT('entity')__ = 0 AND __DECRYPT('name')__ = 'MAIN_MAIL_SMTPS_ID';
+UPDATE llx_const SET entity = __ENCRYPT('1')__ WHERE __DECRYPT('entity')__ = 0 AND __DECRYPT('name')__ = 'MAIN_MAIL_SMTPS_PW';
+UPDATE llx_const SET entity = __ENCRYPT('1')__ WHERE __DECRYPT('entity')__ = 0 AND __DECRYPT('name')__ = 'MAIN_MAIL_EMAIL_TLS';
 
 -- This option with this value is not compatible with 3.8. Value must be set to 'mutiselect', 'select2'...
 DELETE from llx_const where name = 'MAIN_USE_JQUERY_MULTISELECT' and value = '1';
diff --git a/htdocs/install/mysql/migration/3.8.0-3.9.0.sql b/htdocs/install/mysql/migration/3.8.0-3.9.0.sql
index d747d5098f5..03ff8c76d93 100644
--- a/htdocs/install/mysql/migration/3.8.0-3.9.0.sql
+++ b/htdocs/install/mysql/migration/3.8.0-3.9.0.sql
@@ -292,7 +292,7 @@ create table llx_budget_lines
 (
   rowid			integer AUTO_INCREMENT PRIMARY KEY,
   fk_budget     integer NOT NULL,
-  fk_project_ids	varchar(255) NOT NULL,		-- List of project ids related to this budget. If budget is dedicated to projects not yet started, we recommand to create a project "Projects to come".
+  fk_project_ids	varchar(255) NOT NULL,		-- List of project ids related to this budget. If budget is dedicated to projects not yet started, we recommand to create a project 'Projects to come'.
   amount		double(24,8) NOT NULL,
   datec         datetime,
   tms           timestamp,
@@ -600,7 +600,7 @@ ALTER TABLE llx_holiday ADD INDEX idx_holiday_entity (entity);
 
 -- Fix Argentina provences
 INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('2326', 2305, '', 0, 'MISIONES', 'Misiones', 1);
-UPDATE llx_c_departements SET ncc = "FORMOSA", nom = "Formosa" WHERE nom = "Formosa Misiones";
+UPDATE llx_c_departements SET ncc = 'FORMOSA', nom = 'Formosa' WHERE nom = 'Formosa Misiones';
 
 -- MALTA VATS (id country=148)
 INSERT INTO llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) VALUES (1481,  148, '18','0','VAT standard rate',1);
diff --git a/htdocs/install/mysql/migration/3.9.0-4.0.0.sql b/htdocs/install/mysql/migration/3.9.0-4.0.0.sql
index f66d03a917a..bb603d83aec 100644
--- a/htdocs/install/mysql/migration/3.9.0-4.0.0.sql
+++ b/htdocs/install/mysql/migration/3.9.0-4.0.0.sql
@@ -393,9 +393,9 @@ CREATE TABLE llx_c_accounting_category (
 
 ALTER TABLE llx_c_accounting_category ADD UNIQUE INDEX uk_c_accounting_category(code);
 
-INSERT INTO llx_c_accounting_category (rowid, code, label, range_account, sens, category_type, formula, position, fk_country, active) VALUES (  1,'VTE',"Ventes de marchandises", '707xxx', 0, 0, '', '10', 1, 1);
-INSERT INTO llx_c_accounting_category (rowid, code, label, range_account, sens, category_type, formula, position, fk_country, active) VALUES (  2,'MAR',"Coût d'achats marchandises vendues", '603xxx | 607xxx | 609xxx', 0, 0, '', '20', 1, 1);
-INSERT INTO llx_c_accounting_category (rowid, code, label, range_account, sens, category_type, formula, position, fk_country, active) VALUES (  3,'MARGE',"Marge commerciale", '', 0, 1, '1 + 2', '30', 1, 1);
+INSERT INTO llx_c_accounting_category (rowid, code, label, range_account, sens, category_type, formula, position, fk_country, active) VALUES (  1,'VTE','Ventes de marchandises', '707xxx', 0, 0, '', '10', 1, 1);
+INSERT INTO llx_c_accounting_category (rowid, code, label, range_account, sens, category_type, formula, position, fk_country, active) VALUES (  2,'MAR','Coût d'achats marchandises vendues', '603xxx | 607xxx | 609xxx', 0, 0, '', '20', 1, 1);
+INSERT INTO llx_c_accounting_category (rowid, code, label, range_account, sens, category_type, formula, position, fk_country, active) VALUES (  3,'MARGE','Marge commerciale', '', 0, 1, '1 + 2', '30', 1, 1);
 
 UPDATE llx_accounting_account SET account_parent = '0' WHERE account_parent = '';
 -- VMYSQL4.1 ALTER TABLE llx_accounting_account MODIFY COLUMN account_parent varchar(32) DEFAULT '0';
diff --git a/htdocs/install/upgrade2.php b/htdocs/install/upgrade2.php
index 6beeb7ca7b2..79b6df8d14f 100644
--- a/htdocs/install/upgrade2.php
+++ b/htdocs/install/upgrade2.php
@@ -184,6 +184,7 @@ if (! GETPOST('action','aZ09') || preg_match('/upgrade/i',GETPOST('action','aZ09
         // dans la 4eme colonne, le texte 'OK' si fait ou 'AlreadyDone' si rien n'est fait ou 'Error'
 
         $versiontoarray=explode('.',$versionto);
+        $versionranarray=explode('.',DOL_VERSION);
 
         $afterversionarray=explode('.','2.0.0');
         $beforeversionarray=explode('.','2.7.9');
@@ -245,12 +246,6 @@ if (! GETPOST('action','aZ09') || preg_match('/upgrade/i',GETPOST('action','aZ09
             migrate_directories($db,$langs,$conf,'/compta','/banque');
 
             migrate_directories($db,$langs,$conf,'/societe','/mycompany');
-
-            // Reload modules
-            migrate_reload_modules($db,$langs,$conf);
-
-            // Reload menus
-            migrate_reload_menu($db,$langs,$conf,$versionto);
         }
 
         // Script for VX (X<2.8) -> V2.8
@@ -278,12 +273,6 @@ if (! GETPOST('action','aZ09') || preg_match('/upgrade/i',GETPOST('action','aZ09
             migrate_project_user_resp($db,$langs,$conf);
 
             migrate_project_task_actors($db,$langs,$conf);
-
-            // Reload modules
-            migrate_reload_modules($db,$langs,$conf);
-
-            // Reload menus
-            migrate_reload_menu($db,$langs,$conf,$versionto);
         }
 
         // Script for VX (X<2.9) -> V2.9
@@ -298,12 +287,6 @@ if (! GETPOST('action','aZ09') || preg_match('/upgrade/i',GETPOST('action','aZ09
             migrate_shipping_delivery($db,$langs,$conf);
 
             migrate_shipping_delivery2($db,$langs,$conf);
-
-            // Reload modules
-            migrate_reload_modules($db,$langs,$conf);
-
-            // Reload menus
-            migrate_reload_menu($db,$langs,$conf,$versionto);
         }
 
         // Script for VX (X<3.0) -> V3.0
@@ -311,11 +294,7 @@ if (! GETPOST('action','aZ09') || preg_match('/upgrade/i',GETPOST('action','aZ09
         $beforeversionarray=explode('.','3.0.9');
         if (versioncompare($versiontoarray,$afterversionarray) >= 0 && versioncompare($versiontoarray,$beforeversionarray) <= 0)
         {
-            // Reload modules
-            migrate_reload_modules($db,$langs,$conf);
-
-            // Reload menus
-            migrate_reload_menu($db,$langs,$conf,$versionto);
+            // No particular code
         }
 
         // Script for VX (X<3.1) -> V3.1
@@ -326,12 +305,6 @@ if (! GETPOST('action','aZ09') || preg_match('/upgrade/i',GETPOST('action','aZ09
             migrate_directories($db,$langs,$conf,'/rss','/externalrss');
 
             migrate_actioncomm_element($db,$langs,$conf);
-
-            // Reload modules
-            migrate_reload_modules($db,$langs,$conf);
-
-            // Reload menus
-            migrate_reload_menu($db,$langs,$conf,$versionto);
         }
 
         // Script for VX (X<3.2) -> V3.2
@@ -344,12 +317,6 @@ if (! GETPOST('action','aZ09') || preg_match('/upgrade/i',GETPOST('action','aZ09
         	migrate_mode_reglement($db,$langs,$conf);
 
         	migrate_clean_association($db,$langs,$conf);
-
-            // Reload modules
-            migrate_reload_modules($db,$langs,$conf);
-
-            // Reload menus
-            migrate_reload_menu($db,$langs,$conf,$versionto);
         }
 
         // Script for VX (X<3.3) -> V3.3
@@ -376,29 +343,7 @@ if (! GETPOST('action','aZ09') || preg_match('/upgrade/i',GETPOST('action','aZ09
         $beforeversionarray=explode('.','3.8.9');
         if (versioncompare($versiontoarray,$afterversionarray) >= 0 && versioncompare($versiontoarray,$beforeversionarray) <= 0)
         {
-        	// Reload modules (this must be always and only into last targeted version)
-			$listofmodule=array(
-				    	'MAIN_MODULE_AGENDA'=>'newboxdefonly',
-						'MAIN_MODULE_BARCODE'=>'newboxdefonly',
-						'MAIN_MODULE_CRON'=>'newboxdefonly',
-				    	'MAIN_MODULE_COMMANDE'=>'newboxdefonly',
-				    	'MAIN_MODULE_DEPLACEMENT'=>'newboxdefonly',
-				    	'MAIN_MODULE_DON'=>'newboxdefonly',
-				    	'MAIN_MODULE_ECM'=>'newboxdefonly',
-				    	'MAIN_MODULE_FACTURE'=>'newboxdefonly',
-				    	'MAIN_MODULE_FOURNISSEUR'=>'newboxdefonly',
-						'MAIN_MODULE_HOLIDAY'=>'newboxdefonly',
-						'MAIN_MODULE_OPENSURVEY'=>'newboxdefonly',
-						'MAIN_MODULE_PAYBOX'=>'newboxdefonly',
-						'MAIN_MODULE_PRODUIT'=>'newboxdefonly',
-						'MAIN_MODULE_SOCIETE'=>'newboxdefonly',
-				    	'MAIN_MODULE_SERVICE'=>'newboxdefonly',
-						'MAIN_MODULE_USER'=>'newboxdefonly'
-			);
-        	migrate_reload_modules($db,$langs,$conf,$listofmodule);
-
-        	// Reload menus (this must be always and only into last targeted version)
-        	migrate_reload_menu($db,$langs,$conf,$versionto);
+        	// No particular code
         }
 
         // Scripts for last version
@@ -419,19 +364,6 @@ if (! GETPOST('action','aZ09') || preg_match('/upgrade/i',GETPOST('action','aZ09
 
             // Migrate to add entity value into llx_societe_remise_except
             migrate_remise_except_entity($db,$langs,$conf);
-
-            // Reload modules (this must be always and only into last targeted version)
-            $listofmodule=array(
-                'MAIN_MODULE_ACCOUNTING'=>'newboxdefonly',
-                'MAIN_MODULE_BARCODE'=>'newboxdefonly',
-                'MAIN_MODULE_CRON'=>'newboxdefonly',
-                'MAIN_MODULE_FACTURE'=>'newboxdefonly',
-                'MAIN_MODULE_PRINTING'=>'newboxdefonly',
-            );
-            migrate_reload_modules($db,$langs,$conf,$listofmodule);
-
-            // Reload menus (this must be always and only into last targeted version)
-            migrate_reload_menu($db,$langs,$conf,$versionto);
         }
 
         // Scripts for last version
@@ -439,17 +371,43 @@ if (! GETPOST('action','aZ09') || preg_match('/upgrade/i',GETPOST('action','aZ09
         $beforeversionarray=explode('.','6.0.9');
         if (versioncompare($versiontoarray,$afterversionarray) >= 0 && versioncompare($versiontoarray,$beforeversionarray) <= 0)
         {
-            // Reload modules (this must be always and only into last targeted version)
-            $listofmodule=array(
-                'MAIN_MODULE_USER'=>'newboxdefonly',
-            );
-            migrate_reload_modules($db,$langs,$conf,$listofmodule);
-
-            // Reload menus (this must be always and only into last targeted version)
-            migrate_reload_menu($db,$langs,$conf,$versionto);
+            // No particular code
         }
     }
 
+    // Code executed only if migrate is LAST ONE. Must always be done.
+    if (versioncompare($versiontoarray,$versionranarray) >= 0 || versioncompare($versiontoarray,$versionranarray) <= -3)
+    {
+        // Reload modules (this must be always done and only into last targeted version, because code to reload module may need table structure of last version)
+        $listofmodule=array(
+            'MAIN_MODULE_AGENDA'=>'newboxdefonly',
+            'MAIN_MODULE_BARCODE'=>'newboxdefonly',
+            'MAIN_MODULE_CRON'=>'newboxdefonly',
+            'MAIN_MODULE_COMMANDE'=>'newboxdefonly',
+            'MAIN_MODULE_DEPLACEMENT'=>'newboxdefonly',
+            'MAIN_MODULE_DON'=>'newboxdefonly',
+            'MAIN_MODULE_ECM'=>'newboxdefonly',
+            'MAIN_MODULE_FACTURE'=>'newboxdefonly',
+            'MAIN_MODULE_FOURNISSEUR'=>'newboxdefonly',
+            'MAIN_MODULE_HOLIDAY'=>'newboxdefonly',
+            'MAIN_MODULE_OPENSURVEY'=>'newboxdefonly',
+            'MAIN_MODULE_PAYBOX'=>'newboxdefonly',
+            'MAIN_MODULE_PRODUIT'=>'newboxdefonly',
+            'MAIN_MODULE_SOCIETE'=>'newboxdefonly',
+            'MAIN_MODULE_SERVICE'=>'newboxdefonly',
+            'MAIN_MODULE_USER'=>'newboxdefonly',
+            'MAIN_MODULE_ACCOUNTING'=>'newboxdefonly',
+            'MAIN_MODULE_BARCODE'=>'newboxdefonly',
+            'MAIN_MODULE_CRON'=>'newboxdefonly',
+            'MAIN_MODULE_PRINTING'=>'newboxdefonly',
+
+            'MAIN_MODULE_USER'=>'newboxdefonly',        //This one must be always done and only into last targeted version)
+        );
+        migrate_reload_modules($db,$langs,$conf,$listofmodule);
+
+        // Reload menus (this must be always and only into last targeted version)
+        migrate_reload_menu($db,$langs,$conf,$versionto);
+    }
 
     // Can force activation of some module during migration with paramater 'enablemodules=MAIN_MODULE_XXX,MAIN_MODULE_YYY,...'
     if (! $error && $enablemodules)