Fix: missing search in alternative root directory

htdocs/core/lib/admin.lib.php

@@ -725,26 +725,32 @@ function activateModule($value,$withdeps=1)
             $num = count($objMod->depends);
             for ($i = 0; $i < $num; $i++)
             {
-                if (file_exists(DOL_DOCUMENT_ROOT."/core/modules/".$objMod->depends[$i].".class.php"))
+            	foreach ($modulesdir as $dir)
+            	{
+            		if (file_exists($dir.$objMod->depends[$i].".class.php"))
             		{
             			activateModule($objMod->depends[$i]);
             		}
             	}
             }
+        }
 
-        if (isset($objMod->conflictwith) && is_array($objMod->conflictwith))
+        if (is_array($objMod->conflictwith) && ! empty($objMod->conflictwith))
         {
             // Desactivation des modules qui entrent en conflit
             $num = count($objMod->conflictwith);
             for ($i = 0; $i < $num; $i++)
             {
-                if (file_exists(DOL_DOCUMENT_ROOT."/core/modules/".$objMod->conflictwith[$i].".class.php"))
+            	foreach ($modulesdir as $dir)
+            	{
+            		if (file_exists($dir.$objMod->conflictwith[$i].".class.php"))
             		{
             			unActivateModule($objMod->conflictwith[$i],0);
             		}
             	}
             }
         }
+    }
 
     return $ret;
 }