From fd6c4fd4d0704a74a47cdf893670b49b38d953d6 Mon Sep 17 00:00:00 2001
From: De Coninck Laurent <laurent@adlogix.eu>
Date: Thu, 16 Feb 2017 09:26:18 +0100
Subject: [PATCH] fix the enabling of a dependency module already ON

If a depency module is already activated and we try to activate the parent, we got an error because the entry is already existing in the database.
---
 htdocs/core/lib/admin.lib.php | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/htdocs/core/lib/admin.lib.php b/htdocs/core/lib/admin.lib.php
index 8b5bb4839a2..288082296f3 100644
--- a/htdocs/core/lib/admin.lib.php
+++ b/htdocs/core/lib/admin.lib.php
@@ -763,6 +763,11 @@ function activateModule($value,$withdeps=1)
 		return $ret;
 	}
 
+	$const_name = $objMod->const_name;
+	if(!empty($conf->global->$const_name)){
+        return $ret;
+    }
+
     $result=$objMod->init();
     if ($result <= 0) 
     {
@@ -784,7 +789,13 @@ function activateModule($value,$withdeps=1)
                 		if (file_exists($dir.$objMod->depends[$i].".class.php"))
                 		{
                 			$resarray = activateModule($objMod->depends[$i]);
-    						if (empty($resarray['errors'])) $activate = true;
+    						if (empty($resarray['errors'])){
+    						    $activate = true;
+                            }else{
+    						    foreach ($resarray['errors'] as $errorMessage){
+                                    dol_syslog($errorMessage, LOG_ERR);
+                                }
+                            }
     						break;
                 		}
                 	}