lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2972 from FHenry/develop

Browse Source 
fix bug in upgare2.php script (test $res after affect it should be better)
This commit is contained in:
Laurent Destailleur 2015-06-05 19:06:41 +02:00
commit 4bac36d810
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
htdocs/install/upgrade2.php
View File

@ -3818,8 +3818,9 @@ function migrate_reload_modules($db,$langs,$conf,$listofmodule=array())
if ($moduletoreload == 'MAIN_MODULE_SERVICE') // Permission has changed into 2.7 if ($moduletoreload == 'MAIN_MODULE_SERVICE') // Permission has changed into 2.7
{ {
dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate module Service"); dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate module Service");
if ($res) {
$res=@include_once DOL_DOCUMENT_ROOT.'/core/modules/modService.class.php'; $res=@include_once DOL_DOCUMENT_ROOT.'/core/modules/modService.class.php';
if ($res) {
$mod=new modService($db); $mod=new modService($db);
//$mod->remove('noboxes'); //$mod->remove('noboxes');
$mod->init('newboxdefonly'); $mod->init('newboxdefonly');
@ -3828,8 +3829,9 @@ function migrate_reload_modules($db,$langs,$conf,$listofmodule=array())
if ($moduletoreload == 'MAIN_MODULE_COMMANDE') // Permission has changed into 2.9 if ($moduletoreload == 'MAIN_MODULE_COMMANDE') // Permission has changed into 2.9
{ {
dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate module Commande"); dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate module Commande");
if ($res) {
$res=@include_once DOL_DOCUMENT_ROOT.'/core/modules/modCommande.class.php'; $res=@include_once DOL_DOCUMENT_ROOT.'/core/modules/modCommande.class.php';
if ($res) {
$mod=new modCommande($db); $mod=new modCommande($db);
//$mod->remove('noboxes'); //$mod->remove('noboxes');
$mod->init('newboxdefonly'); $mod->init('newboxdefonly');
@ -3838,8 +3840,8 @@ function migrate_reload_modules($db,$langs,$conf,$listofmodule=array())
if ($moduletoreload == 'MAIN_MODULE_FACTURE') // Permission has changed into 2.9 if ($moduletoreload == 'MAIN_MODULE_FACTURE') // Permission has changed into 2.9
{ {
dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate module Facture"); dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate module Facture");
if ($res) {
$res=@include_once DOL_DOCUMENT_ROOT.'/core/modules/modFacture.class.php'; $res=@include_once DOL_DOCUMENT_ROOT.'/core/modules/modFacture.class.php';
if ($res) {
$mod=new modFacture($db); $mod=new modFacture($db);
//$mod->remove('noboxes'); //$mod->remove('noboxes');
$mod->init('newboxdefonly'); $mod->init('newboxdefonly');
@ -3878,8 +3880,8 @@ function migrate_reload_modules($db,$langs,$conf,$listofmodule=array())
if ($moduletoreload == 'MAIN_MODULE_ECM') // Permission has changed into 3.0 and 3.1 if ($moduletoreload == 'MAIN_MODULE_ECM') // Permission has changed into 3.0 and 3.1
{ {
dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate module ECM"); dolibarr_install_syslog("upgrade2::migrate_reload_modules Reactivate module ECM");
if ($res) {
$res=@include_once DOL_DOCUMENT_ROOT.'/core/modules/modECM.class.php'; $res=@include_once DOL_DOCUMENT_ROOT.'/core/modules/modECM.class.php';
if ($res) {
$mod=new modECM($db); $mod=new modECM($db);
$mod->remove('noboxes'); // We need to remove because a permission id has been removed $mod->remove('noboxes'); // We need to remove because a permission id has been removed
$mod->init('newboxdefonly'); $mod->init('newboxdefonly');