From 867a0072e39cbf25650d31d5b61a75d0c1872f9c Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 23 Jul 2016 13:20:34 +0200
Subject: [PATCH] Fix forcing on module setup was not working

---
 htdocs/admin/modules.php      | 2 +-
 htdocs/index.php              | 6 +++++-
 htdocs/langs/en_US/admin.lang | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/htdocs/admin/modules.php b/htdocs/admin/modules.php
index 1151ef4abb9..91ab445654f 100644
--- a/htdocs/admin/modules.php
+++ b/htdocs/admin/modules.php
@@ -304,7 +304,7 @@ $h++;
 print "<br>\n";
 
 
-dol_fiche_head($head, $mode, $langs->trans("Modules"));
+dol_fiche_head($head, $mode, '');
 
 $var=true;
 
diff --git a/htdocs/index.php b/htdocs/index.php
index 2a524d56078..faa2eb9dcee 100644
--- a/htdocs/index.php
+++ b/htdocs/index.php
@@ -47,7 +47,11 @@ if (!isset($conf->global->MAIN_INFO_SOCIETE_NOM) || empty($conf->global->MAIN_IN
     header("Location: ".DOL_URL_ROOT."/admin/index.php?mainmenu=home&leftmenu=setup&mesg=setupnotcomplete");
     exit;
 }
-
+if (count($conf->modules) <= (empty($conf->global->MAIN_MIN_NB_ENABLED_MODULE_FOR_WARNING)?1:$conf->global->MAIN_MIN_NB_ENABLED_MODULE_FOR_WARNING))	// If only user module enabled
+{
+    header("Location: ".DOL_URL_ROOT."/admin/index.php?mainmenu=home&leftmenu=setup&mesg=setupnotcomplete");
+    exit;
+}
 if (GETPOST('addbox'))	// Add box (when submit is done from a form when ajax disabled)
 {
 	require_once DOL_DOCUMENT_ROOT.'/core/class/infobox.class.php';
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index 8b2d46aedb3..fa5ec94d067 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -950,7 +950,7 @@ LogEventDesc=You can enable here the logging for Dolibarr security events. Admin
 AreaForAdminOnly=Those features can be used by <b>administrator users</b> only.
 SystemInfoDesc=System information is miscellaneous technical information you get in read only mode and visible for administrators only.
 SystemAreaForAdminOnly=This area is available for administrator users only. None of the Dolibarr permissions can reduce this limit.
-CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "Modify" button at bottom of page)
+CompanyFundationDesc=Edit on this page all known information of the company or foundation you need to manage (For this, click on "Modify" or "Save" button at bottom of page)
 DisplayDesc=You can choose each parameter related to the Dolibarr look and feel here
 AvailableModules=Available modules
 ToActivateModule=To activate modules, go on setup Area (Home->Setup->Modules).