From 247acdd27446434927a8727506cacdd58985fc8f Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 6 May 2020 03:47:28 +0200
Subject: [PATCH] Fix position of custom groups of modules

---
 htdocs/admin/company.php                      |  2 +-
 htdocs/admin/modules.php                      | 10 ++++++----
 htdocs/core/lib/functions.lib.php             |  1 +
 htdocs/core/modules/DolibarrModules.class.php |  2 +-
 htdocs/theme/eldy/info-box.inc.php            |  5 +++++
 htdocs/theme/eldy/progress.inc.php            |  2 +-
 htdocs/theme/md/info-box.inc.php              |  4 ++++
 7 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/htdocs/admin/company.php b/htdocs/admin/company.php
index d4664a13de1..f33a3ea6f93 100644
--- a/htdocs/admin/company.php
+++ b/htdocs/admin/company.php
@@ -693,7 +693,7 @@ print '<br>';
 
 
 // Sales taxes (VAT, IRPF, ...)
-print load_fiche_titre($langs->trans("TypeOfSaleTaxes"));
+print load_fiche_titre($langs->trans("TypeOfSaleTaxes"), '', 'object_payment');
 
 print '<table class="noborder centpercent editmode">';
 print '<tr class="liste_titre">';
diff --git a/htdocs/admin/modules.php b/htdocs/admin/modules.php
index 926a4c34f70..6a0ff450346 100644
--- a/htdocs/admin/modules.php
+++ b/htdocs/admin/modules.php
@@ -412,11 +412,13 @@ foreach ($modulesdir as $dir)
 									}
 
 									$familyposition = $familyinfo[$familykey]['position'];
-									if ($external)
+									$listOfOfficialModuleGroups = array('hr', 'technic', 'interface', 'technic', 'portal', 'financial', 'crm', 'base', 'products', 'srm', 'ecm', 'projects', 'other');
+									if ($external && ! in_array($familykey, $listOfOfficialModuleGroups))
 									{
-										// TODO Find a solution so modules with their own family are always at end
-										//var_dump($familyposition);
-										//$familyposition += 100;
+										// If module is extern and into a custom group (not into an official predefined one), it must appear at end (custom groups should not be before official groups).
+										if (is_numeric($familyposition)) {
+											$familyposition = sprintf("%03d", (int) $familyposition + 100);
+										}
 									}
 
 									$orders[$i] = $familyposition."_".$familykey."_".$moduleposition."_".$j; // Sort by family, then by module position then number
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 14531947574..f456ec311ac 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -3268,6 +3268,7 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
 				'payment'=>'bg-infobox-bank_account', 'poll'=>'bg-infobox-adherent', 'project'=>'bg-infobox-project', 'projecttask'=>'bg-infobox-project', 'propal'=>'bg-infobox-propal',
 				'resource'=>'bg-infobox-action', 'supplier_invoice'=>'bg-infobox-order_supplier', 'supplier_order'=>'bg-infobox-order_supplier', 'supplier_proposal'=>'bg-infobox-supplier_proposal',
 				'ticket'=>'bg-infobox-contrat', 'title_accountancy'=>'bg-infobox-bank_account', 'title_hrm'=>'bg-infobox-holiday', 'trip'=>'bg-infobox-expensereport', 'title_agenda'=>'bg-infobox-action',
+				//'title_setup'=>'bg-infobox-action', 'tools'=>'bg-infobox-action',
 				'list-alt'=>'imgforviewmode', 'calendar'=>'imgforviewmode', 'calendarweek'=>'imgforviewmode', 'calendarmonth'=>'imgforviewmode', 'calendarday'=>'imgforviewmode', 'calendarperuser'=>'imgforviewmode'
 			);
 			if (!empty($arrayconvpictotomorcess[$pictowithouttext])) {
diff --git a/htdocs/core/modules/DolibarrModules.class.php b/htdocs/core/modules/DolibarrModules.class.php
index cd3fe7922ee..c592cb69959 100644
--- a/htdocs/core/modules/DolibarrModules.class.php
+++ b/htdocs/core/modules/DolibarrModules.class.php
@@ -2279,7 +2279,7 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
     	$const_name = 'MAIN_MODULE_'.strtoupper(preg_replace('/^mod/i', '', get_class($this)));
 
 		print '
-    	<div class="box-flex-item info-box-module'.(empty($conf->global->$const_name) ? ' info-box-module-disabled' : ' ').'">
+    	<div class="box-flex-item info-box-module'.(empty($conf->global->$const_name) ? ' info-box-module-disabled' : '').($this->isCoreOrExternalModule() == 'external' ? ' info-box-module-external' : '').'">
 	    <div class="info-box info-box-sm info-box-module">
 	    <div class="info-box-icon">';
 
diff --git a/htdocs/theme/eldy/info-box.inc.php b/htdocs/theme/eldy/info-box.inc.php
index 028039f6c8b..7f62fe39689 100644
--- a/htdocs/theme/eldy/info-box.inc.php
+++ b/htdocs/theme/eldy/info-box.inc.php
@@ -6,6 +6,11 @@ if (!defined('ISLOADEDBYSTEELSHEET')) die('Must be call by steelsheet'); ?>
  * Component: Info Box
  * -------------------
  */
+
+.info-box-module-external span.info-box-icon-version {
+    background: #999;
+}
+
 .info-box {
 	display: block;
     position: relative;
diff --git a/htdocs/theme/eldy/progress.inc.php b/htdocs/theme/eldy/progress.inc.php
index b0bd96df1d2..71f25ff35ba 100644
--- a/htdocs/theme/eldy/progress.inc.php
+++ b/htdocs/theme/eldy/progress.inc.php
@@ -123,7 +123,7 @@ if (!defined('ISLOADEDBYSTEELSHEET')) die('Must be call by steelsheet'); ?>
     width: 3px;
 }
 .progress-group .progress-text {
-    font-weight: 600;
+    /* font-weight: 600; */
 }
 .progress-group .progress-number {
     float: right;
diff --git a/htdocs/theme/md/info-box.inc.php b/htdocs/theme/md/info-box.inc.php
index d9b467f130b..d866cab96a6 100644
--- a/htdocs/theme/md/info-box.inc.php
+++ b/htdocs/theme/md/info-box.inc.php
@@ -7,6 +7,10 @@ if (!defined('ISLOADEDBYSTEELSHEET')) die('Must be call by steelsheet'); ?>
  * -------------------
  */
 
+.info-box-module-external span.info-box-icon-version {
+    background: #999;
+}
+
 span.info-box-icon-text {	/* hide box text number due to problems */
     display: none;
 }