From acb3fb2cd89c630f2963d96f21b0444c99fb87e7 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 29 Feb 2020 00:11:19 +0100
Subject: [PATCH] Fix extrafields on x-axis

---
 htdocs/core/customreports.php    | 6 ++----
 htdocs/theme/eldy/global.inc.php | 2 +-
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/htdocs/core/customreports.php b/htdocs/core/customreports.php
index 8b8edde0f27..2b78f0ce8af 100644
--- a/htdocs/core/customreports.php
+++ b/htdocs/core/customreports.php
@@ -88,7 +88,7 @@ $arrayoftype = array(
 	'cotisation' => array('label' => 'Subscriptions', 'ObjectClassName' => 'Subscription', 'enabled' => $conf->adherent->enabled, 'ClassPath' => DOL_DOCUMENT_ROOT."/adherents/class/subscription.class.php", 'langs'=>'members'),
 );
 
-// Complete $arrayoftype
+// Complete $arrayoftype by external modules
 $parameters = array('objecttype'=>$objecttype, 'tabfamily'=>$tabfamily);
 $reshook = $hookmanager->executeHooks('loadDataForCustomReports', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
@@ -279,9 +279,7 @@ foreach ($object->fields as $key => $val) {
     // Add measure from extrafields
     if ($object->isextrafieldmanaged) {
         foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) {
-            if (!empty($extrafields->attributes[$object->table_element]['totalizable'][$key])) {
-                $arrayofxaxis['te.'.$key] = array('label' => $extrafields->attributes[$object->table_element]['label'][$key], 'position' => (int) $extrafields->attributes[$object->table_element]['pos'][$key]);
-            }
+            $arrayofxaxis['te.'.$key] = array('label' => $extrafields->attributes[$object->table_element]['label'][$key], 'position' => (int) $extrafields->attributes[$object->table_element]['pos'][$key]);
         }
     }
 }
diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php
index 243153bf4dc..fb73dd183c4 100644
--- a/htdocs/theme/eldy/global.inc.php
+++ b/htdocs/theme/eldy/global.inc.php
@@ -5057,7 +5057,7 @@ input.select2-input {
 	background: var(--inputbackgroundcolor);
 }
 .select2-container--default .select2-selection--multiple .select2-selection__choice{
-	background-color: var(--inputbackgroundcolor);
+	background-color: #ddd;
 }
 
 .select2-search__field