From dc0e96a6e5210e3ed914f0db8c3e145dc670a283 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 6 Mar 2020 14:09:00 +0100
Subject: [PATCH] Fix scrutinizer

---
 htdocs/core/customreports.php    | 32 +++++++++++++++++---------------
 htdocs/core/tpl/contacts.tpl.php |  3 ++-
 2 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/htdocs/core/customreports.php b/htdocs/core/customreports.php
index 3c804fb3f0f..01874092d4d 100644
--- a/htdocs/core/customreports.php
+++ b/htdocs/core/customreports.php
@@ -312,7 +312,7 @@ foreach ($object->fields as $key => $val) {
         $arrayofmesures['t.'.$key.'-max'] = $langs->trans($val['label']).' <span class="opacitymedium">('.$langs->trans("Maximum").')</span>';
     }
 }
-// Add measure from extrafields
+// Add extrafields to Measures
 if ($object->isextrafieldmanaged) {
     foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) {
         if (!empty($extrafields->attributes[$object->table_element]['totalizable'][$key])) {
@@ -348,12 +348,13 @@ foreach ($object->fields as $key => $val) {
 			$arrayofgroupby['t.'.$key] = array('label' => $val['label'], 'position' => (int) $val['position']);
 		}
 	}
-	// Add measure from extrafields
-	if ($object->isextrafieldmanaged) {
-		foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) {
-			if ($extrafields->attributes[$object->table_element]['type'][$key] == 'separate') continue;
-			$arrayofgroupby['te.'.$key] = array('label' => $extrafields->attributes[$object->table_element]['label'][$key], 'position' => (int) $extrafields->attributes[$object->table_element]['pos'][$key]);
-		}
+}
+// Add extrafields to Group by
+if ($object->isextrafieldmanaged) {
+	foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) {
+		if ($extrafields->attributes[$object->table_element]['type'][$key] == 'separate') continue;
+		if (!empty($extrafields->attributes[$object->table_element]['totalizable'][$key])) continue;
+		$arrayofgroupby['te.'.$key] = array('label' => $extrafields->attributes[$object->table_element]['label'][$key], 'position' => (int) $extrafields->attributes[$object->table_element]['pos'][$key]);
 	}
 }
 
@@ -387,13 +388,14 @@ foreach ($object->fields as $key => $val) {
             $arrayofxaxis['t.'.$key] = array('label' => $val['label'], 'position' => (int) $val['position']);
         }
     }
-    // Add measure from extrafields
-    if ($object->isextrafieldmanaged) {
-        foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) {
-        	if ($extrafields->attributes[$object->table_element]['type'][$key] == 'separate') continue;
-        	$arrayofxaxis['te.'.$key] = array('label' => $extrafields->attributes[$object->table_element]['label'][$key], 'position' => (int) $extrafields->attributes[$object->table_element]['pos'][$key]);
-        }
-    }
+}
+// Add extrafields to X-Axis
+if ($object->isextrafieldmanaged) {
+	foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) {
+		if ($extrafields->attributes[$object->table_element]['type'][$key] == 'separate') continue;
+		if (!empty($extrafields->attributes[$object->table_element]['totalizable'][$key])) continue;
+		$arrayofxaxis['te.'.$key] = array('label' => $extrafields->attributes[$object->table_element]['label'][$key], 'position' => (int) $extrafields->attributes[$object->table_element]['pos'][$key]);
+	}
 }
 
 $arrayofxaxis = dol_sort_array($arrayofxaxis, 'position', 'asc', 1);
@@ -425,7 +427,7 @@ if ($mode == 'grid') {
         if ($object->isextrafieldmanaged) {
             foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) {
                 if (!empty($extrafields->attributes[$object->table_element]['totalizable'][$key])) {
-                    $arrayofyaxis['te.'.$key] = array('label' => $extrafields->attributes[$object->table_element]['label'][$key], 'position' => (int) $extrafields->attributes[$object->table_element]['pos'][$key]);
+					$arrayofyaxis['te.'.$key] = array('label' => $extrafields->attributes[$object->table_element]['label'][$key], 'position' => (int) $extrafields->attributes[$object->table_element]['pos'][$key]);
                 }
             }
         }
diff --git a/htdocs/core/tpl/contacts.tpl.php b/htdocs/core/tpl/contacts.tpl.php
index f1b6f701b60..e6de4520ba4 100644
--- a/htdocs/core/tpl/contacts.tpl.php
+++ b/htdocs/core/tpl/contacts.tpl.php
@@ -177,7 +177,8 @@ foreach(array('internal', 'external') as $source)
 	$i = 0;
 	while ($i < $num)
 	{
-		$entry = '';
+		$entry = new stdClass();
+
 		$entry->id   = $tab[$i]['rowid'];
 		$entry->type = $tab[$i]['libelle'];