diff --git a/htdocs/contrat/class/contrat.class.php b/htdocs/contrat/class/contrat.class.php
index c9341d23ee3..1a31e478f56 100644
--- a/htdocs/contrat/class/contrat.class.php
+++ b/htdocs/contrat/class/contrat.class.php
@@ -233,10 +233,10 @@ class Contrat extends CommonObject
 		'datec' =>array('type'=>'datetime', 'label'=>'DateCreation', 'enabled'=>1, 'visible'=>-1, 'position'=>40),
 		'date_contrat' =>array('type'=>'datetime', 'label'=>'Date contrat', 'enabled'=>1, 'visible'=>-1, 'position'=>45),
 		'fk_soc' =>array('type'=>'integer:Societe:societe/class/societe.class.php', 'label'=>'ThirdParty', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>70),
-		'fk_projet' =>array('type'=>'integer:Project:projet/class/project.class.php:1:fk_statut=1', 'label'=>'Fk projet', 'enabled'=>1, 'visible'=>-1, 'position'=>75),
-		'fk_commercial_signature' =>array('type'=>'integer:User:user/class/user.class.php', 'label'=>'Fk commercial signature', 'enabled'=>1, 'visible'=>-1, 'position'=>80),
-		'fk_commercial_suivi' =>array('type'=>'integer:User:user/class/user.class.php', 'label'=>'Fk commercial suivi', 'enabled'=>1, 'visible'=>-1, 'position'=>85),
-		'fk_user_author' =>array('type'=>'integer:User:user/class/user.class.php', 'label'=>'Fk user author', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>90),
+		'fk_projet' =>array('type'=>'integer:Project:projet/class/project.class.php:1:fk_statut=1', 'label'=>'Project', 'enabled'=>1, 'visible'=>-1, 'position'=>75),
+		'fk_commercial_signature' =>array('type'=>'integer:User:user/class/user.class.php', 'label'=>'SaleRepresentative Signature', 'enabled'=>1, 'visible'=>-1, 'position'=>80),
+		'fk_commercial_suivi' =>array('type'=>'integer:User:user/class/user.class.php', 'label'=>'SaleRepresentative follower', 'enabled'=>1, 'visible'=>-1, 'position'=>85),
+		'fk_user_author' =>array('type'=>'integer:User:user/class/user.class.php', 'label'=>'UserAuthor', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>90),
 		'note_private' =>array('type'=>'text', 'label'=>'NotePublic', 'enabled'=>1, 'visible'=>0, 'position'=>105),
 		'note_public' =>array('type'=>'text', 'label'=>'NotePrivate', 'enabled'=>1, 'visible'=>0, 'position'=>110),
 		'model_pdf' =>array('type'=>'varchar(255)', 'label'=>'Model pdf', 'enabled'=>1, 'visible'=>0, 'position'=>115),
@@ -245,7 +245,7 @@ class Contrat extends CommonObject
 		'ref_customer' =>array('type'=>'varchar(50)', 'label'=>'Ref customer', 'enabled'=>1, 'visible'=>-1, 'position'=>130),
 		'fk_user_modif' =>array('type'=>'integer:User:user/class/user.class.php', 'label'=>'UserModif', 'enabled'=>1, 'visible'=>-2, 'notnull'=>-1, 'position'=>135),
 		'last_main_doc' =>array('type'=>'varchar(255)', 'label'=>'Last main doc', 'enabled'=>1, 'visible'=>-1, 'position'=>140),
-		'statut' =>array('type'=>'smallint(6)', 'label'=>'Statut', 'enabled'=>1, 'visible'=>-1, 'position'=>500, 'arrayofkeyval'=>array(0=>'Draft', 1=>'Validated', 2=>'Closed'))
+		'statut' =>array('type'=>'smallint(6)', 'label'=>'Statut', 'enabled'=>1, 'visible'=>-1, 'position'=>500, 'notnull'=>1, 'arrayofkeyval'=>array(0=>'Draft', 1=>'Validated', 2=>'Closed'))
 	);
 	// END MODULEBUILDER PROPERTIES
 
diff --git a/htdocs/core/customreports.php b/htdocs/core/customreports.php
index f208baee872..4ded4498add 100644
--- a/htdocs/core/customreports.php
+++ b/htdocs/core/customreports.php
@@ -224,6 +224,7 @@ foreach ($arrayoftype as $key => $val) {
 
 $count = 0;
 $arrayofmesures = fillArrayOfMeasures($object, 't', $langs->trans($newarrayoftype[$objecttype]['label']), $arrayofmesures, 0, $count);
+$arrayofmesures = dol_sort_array($arrayofmesures, 'position', 'asc', 0, 0, 1);
 
 $count = 0;
 $arrayofxaxis = fillArrayOfXAxis($object, 't', $langs->trans($newarrayoftype[$objecttype]['label']), $arrayofxaxis, 0, $count);
@@ -274,13 +275,19 @@ if (is_array($search_groupby) && count($search_groupby)) {
 			$fieldtocount = $search_groupby[$gkey];
 		}
 
-		var_dump($fieldtocount);
-		var_dump($arrayofgroupby);
 		$sql = "SELECT DISTINCT ".$fieldtocount." as val";
+
 		if (strpos($fieldtocount, 'te.') === 0) {
 			$sql .= ' FROM '.MAIN_DB_PREFIX.$object->table_element.'_extrafields as te';
 		} else {
-			$sql .= ' FROM '.MAIN_DB_PREFIX.$object->table_element.' as t';
+			$tabletouse = $object->table_element;
+			$tablealiastouse = 't';
+			if (!empty($arrayofgroupby[$gval])) {
+				$tmpval = explode('.', $gval);
+				$tabletouse = $arrayofgroupby[$gval]['table'];
+				$tablealiastouse = $tmpval[0];
+			}
+			$sql .= ' FROM '.MAIN_DB_PREFIX.$tabletouse.' as '.$tablealiastouse;
 		}
 
 		// Add the where here
@@ -343,8 +350,17 @@ if (is_array($search_groupby) && count($search_groupby)) {
 
 			$arrayofvaluesforgroupby['g_'.$gkey][$keytouse] = $valuetranslated;
 		}
+		// Add also the possible NULL value if field is a parent field that is not a strict join
+		$tmpfield = explode('.', $gval);
+		if ($tmpfield[0] != 't' || (is_array($object->fields[$tmpfield[1]]) && empty($object->fields[$tmpfield[1]]['notnull']))) {
+			dol_syslog("The group by field ".$gval." may be null (because field is null or it is a left join), so we add __NULL__ entry in list of possible values");
+			//var_dump($gval); var_dump($object->fields);
+			$arrayofvaluesforgroupby['g_'.$gkey]['__NULL__'] = $langs->transnoentitiesnoconv("NotDefined");
+		}
+
 		asort($arrayofvaluesforgroupby['g_'.$gkey]);
 
+		// Add a protection/error to refuse the request if number of differentr values for the group by is higher than $MAXUNIQUEVALFORGROUP
 		if (count($arrayofvaluesforgroupby['g_'.$gkey]) > $MAXUNIQUEVALFORGROUP) {
 			$langs->load("errors");
 			if (strpos($fieldtocount, 'te.') === 0) {
@@ -430,7 +446,11 @@ $count = 0;
 //var_dump($arrayofmesures);
 print '<div class="divadvancedsearchfield clearboth">';
 print '<div class="inline-block"><span class="fas fa-ruler-combined paddingright pictofixedwidth" title="'.dol_escape_htmltag($langs->trans("Measures")).'"></span><span class="fas fa-caret-left caretleftaxis" title="'.dol_escape_htmltag($langs->trans("Measures")).'"></span></div>';
-print $form->multiselectarray('search_measures', $arrayofmesures, $search_measures, 0, 0, 'minwidth400', 1, 0, '', '', $langs->trans("Measures"));	// Fill the array $arrayofmeasures with possible fields
+$simplearrayofmesures = array();
+foreach ($arrayofmesures as $key => $val) {
+	$simplearrayofmesures[$key] = $arrayofmesures[$key]['label'];
+}
+print $form->multiselectarray('search_measures', $simplearrayofmesures, $search_measures, 0, 0, 'minwidth400', 1, 0, '', '', $langs->trans("Measures"));	// Fill the array $arrayofmeasures with possible fields
 print '</div>';
 
 // XAxis
@@ -464,18 +484,38 @@ if ($mode == 'grid') {
 				continue;
 			}
 			if (in_array($val['type'], array('timestamp', 'date', 'datetime'))) {
-				$arrayofyaxis['t.'.$key.'-year'] = array('label' => $langs->trans($val['label']).' ('.$YYYY.')', 'position' => $val['position']);
-				$arrayofyaxis['t.'.$key.'-month'] = array('label' => $langs->trans($val['label']).' ('.$YYYY.'-'.$MM.')', 'position' => $val['position']);
-				$arrayofyaxis['t.'.$key.'-day'] = array('label' => $langs->trans($val['label']).' ('.$YYYY.'-'.$MM.'-'.$DD.')', 'position' => $val['position']);
+				$arrayofyaxis['t.'.$key.'-year'] = array(
+					'label' => $langs->trans($val['label']).' ('.$YYYY.')',
+					'position' => $val['position'],
+					'table' => $object->table_element
+				);
+				$arrayofyaxis['t.'.$key.'-month'] = array(
+					'label' => $langs->trans($val['label']).' ('.$YYYY.'-'.$MM.')',
+					'position' => $val['position'],
+					'table' => $object->table_element
+				);
+				$arrayofyaxis['t.'.$key.'-day'] = array(
+					'label' => $langs->trans($val['label']).' ('.$YYYY.'-'.$MM.'-'.$DD.')',
+					'position' => $val['position'],
+					'table' => $object->table_element
+				);
 			} else {
-				$arrayofyaxis['t.'.$key] = array('label' => $val['label'], 'position' => (int) $val['position']);
+				$arrayofyaxis['t.'.$key] = array(
+					'label' => $val['label'],
+					'position' => (int) $val['position'],
+					'table' => $object->table_element
+				);
 			}
 		}
 		// 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]) && (!isset($extrafields->attributes[$object->table_element]['enabled'][$key]) || dol_eval($extrafields->attributes[$object->table_element]['enabled'][$key], 1, 1, '1'))) {
-					$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],
+						'table' => $object->table_element
+					);
 				}
 			}
 		}
@@ -505,7 +545,7 @@ $sql = '';
 if (!empty($search_measures) && !empty($search_xaxis)) {
 	$fieldid = 'rowid';
 
-	$sql = 'SELECT ';
+	$sql = "SELECT ";
 	foreach ($search_xaxis as $key => $val) {
 		if (preg_match('/\-year$/', $val)) {
 			$tmpval = preg_replace('/\-year$/', '', $val);
@@ -552,40 +592,72 @@ if (!empty($search_measures) && !empty($search_xaxis)) {
 		}
 	}
 	$sql = preg_replace('/,\s*$/', '', $sql);
-	$sql .= ' FROM '.MAIN_DB_PREFIX.$object->table_element.' as t';
+	$sql .= " FROM ".MAIN_DB_PREFIX.$object->table_element." as t";
 	// Add measure from extrafields
 	if ($object->isextrafieldmanaged) {
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX.$object->table_element."_extrafields as te ON te.fk_object = t.".$fieldid;
 	}
-	if ($object->ismultientitymanaged) {
+	// Add table for link for multientity
+	if ($object->ismultientitymanaged) {	// 0=No test on entity, 1=Test with field entity, 'field@table'=Test with link by field@table
 		if ($object->ismultientitymanaged == 1) {
-			// Nothing here
+			// No table to add here
 		} else {
 			$tmparray = explode('@', $object->ismultientitymanaged);
-			$sql .= " INNER JOIN ".MAIN_DB_PREFIX.$tmparray[1]." as parenttable ON t.".$tmparray[0]." = parenttable.rowid";
-			$sql .= ' AND parenttable.entity IN ('.getEntity($tmparray[1]).')';
+			$sql .= " INNER JOIN ".MAIN_DB_PREFIX.$tmparray[1]." as parenttableforentity ON t.".$tmparray[0]." = parenttableforentity.rowid";
+			$sql .= " AND parenttableforentity.entity IN (".getEntity($tmparray[1]).")";
 		}
 	}
 
-	// Add INNER JOIN for all parent tables
-	//var_dump($arrayofxaxis); var_dump($search_xaxis);
 	$listoftablesalreadyadded = array($object->table_element => $object->table_element);
+
+	// Add LEFT JOIN for all parent tables mentionned into the Xaxis
+	//var_dump($arrayofxaxis); var_dump($search_xaxis);
 	foreach ($search_xaxis as $key => $val) {
 		if (!empty($arrayofxaxis[$val])) {
 			$tmpval = explode('.', $val);
 			//var_dump($arrayofxaxis[$val]['table']);
 			if (! in_array($arrayofxaxis[$val]['table'], $listoftablesalreadyadded)) {	// We do not add join for main table already added
-				$sql .= ' INNER JOIN '.MAIN_DB_PREFIX.$arrayofxaxis[$val]['table'].' as '.$tmpval[0];
+				$sql .= " LEFT JOIN ".MAIN_DB_PREFIX.$arrayofxaxis[$val]['table']." as ".$tmpval[0]." ON t.".str_replace('t__', '', $tmpval[0])." = ".$tmpval[0].".rowid";
 				$listoftablesalreadyadded[$arrayofxaxis[$val]['table']] = $arrayofxaxis[$val]['table'];
 			}
 		} else {
-			dol_print_error($db, 'Found an key into search_xaxis not found into arrayofxaxis');
+			dol_print_error($db, 'Found a key into search_xaxis not found into arrayofxaxis');
 		}
 	}
 
-	$sql .= ' WHERE 1 = 1';
-	if ($object->ismultientitymanaged == 1) {
-		$sql .= ' AND t.entity IN ('.getEntity($object->element).')';
+	// Add LEFT JOIN for all parent tables mentionned into the Group by
+	//var_dump($arrayofgroupby); var_dump($search_groupby);
+	foreach ($search_groupby as $key => $val) {
+		if (!empty($arrayofgroupby[$val])) {
+			$tmpval = explode('.', $val);
+			//var_dump($arrayofxaxis[$val]['table']);
+			if (! in_array($arrayofgroupby[$val]['table'], $listoftablesalreadyadded)) {	// We do not add join for main table already added
+				$sql .= " LEFT JOIN ".MAIN_DB_PREFIX.$arrayofgroupby[$val]['table']." as ".$tmpval[0]." ON t.".str_replace('t__', '', $tmpval[0])." = ".$tmpval[0].".rowid";
+				$listoftablesalreadyadded[$arrayofgroupby[$val]['table']] = $arrayofgroupby[$val]['table'];
+			}
+		} else {
+			dol_print_error($db, 'Found a key into search_groupby not found into arrayofgroupby');
+		}
+	}
+
+	// Add LEFT JOIN for all parent tables mentionned into the Yaxis
+	//var_dump($arrayofgroupby); var_dump($search_groupby);
+	foreach ($search_measures as $key => $val) {
+		if (!empty($arrayofmesures[$val])) {
+			$tmpval = explode('.', $val);
+			//var_dump($arrayofxaxis[$val]['table']);
+			if (! in_array($arrayofmesures[$val]['table'], $listoftablesalreadyadded)) {	// We do not add join for main table already added
+				$sql .= " LEFT JOIN ".MAIN_DB_PREFIX.$arrayofmesures[$val]['table']." as ".$tmpval[0]." ON t.".str_replace('t__', '', $tmpval[0])." = ".$tmpval[0].".rowid";
+				$listoftablesalreadyadded[$arrayofmesures[$val]['table']] = $arrayofmesures[$val]['table'];
+			}
+		} else {
+			dol_print_error($db, 'Found a key into search_measures not found into arrayofmesures');
+		}
+	}
+
+	$sql .= " WHERE 1 = 1";
+	if ($object->ismultientitymanaged == 1) {	// 0=No test on entity, 1=Test with field entity, 'field@table'=Test with link by field@table
+		$sql .= " AND t.entity IN (".getEntity($object->element).")";
 	}
 	// Add the where here
 	$sqlfilters = $search_component_params_hidden;
@@ -598,7 +670,7 @@ if (!empty($search_measures) && !empty($search_xaxis)) {
 			print $errormessage;
 		}
 	}
-	$sql .= ' GROUP BY ';
+	$sql .= " GROUP BY ";
 	foreach ($search_xaxis as $key => $val) {
 		if (preg_match('/\-year$/', $val)) {
 			$tmpval = preg_replace('/\-year$/', '', $val);
@@ -663,7 +735,7 @@ if (!empty($search_measures) && !empty($search_xaxis)) {
 
 $legend = array();
 foreach ($search_measures as $key => $val) {
-	$legend[] = $langs->trans($arrayofmesures[$val]);
+	$legend[] = $langs->trans($arrayofmesures[$val]['label']);
 }
 
 $useagroupby = (is_array($search_groupby) && count($search_groupby));
@@ -694,7 +766,7 @@ if ($sql) {
 			if (!empty($object->fields[$xvalwithoutprefix]['arrayofkeyval'])) {
 				$xlabel = $object->fields[$xvalwithoutprefix]['arrayofkeyval'][$obj->$fieldforxkey];
 			}
-			$labeltouse = (($xlabel || $xlabel == '0') ? dol_trunc($xlabel, 20, 'middle') : ($xlabel === '' ? $langs->trans("Empty") : $langs->trans("NotDefined")));
+			$labeltouse = (($xlabel || $xlabel == '0') ? dol_trunc($xlabel, 20, 'middle') : ($xlabel === '' ? $langs->transnoentitiesnoconv("Empty") : $langs->transnoentitiesnoconv("NotDefined")));
 
 			if ($oldlabeltouse && ($labeltouse != $oldlabeltouse)) {
 				$xi++; // Increase $xi
@@ -888,26 +960,62 @@ function fillArrayOfMeasures($object, $tablealias, $labelofobject, &$arrayofmesu
 
 	if ($level == 0) {
 		// Add the count of record only for the main/first level object. Parents are necessarly unique for each record.
-		$arrayofmesures[$tablealias.'.count'] = img_picto('', $object->picto, 'class="pictofixedwidth"').' '.$labelofobject.': Count';
+		$arrayofmesures[$tablealias.'.count'] = array(
+			'label' => img_picto('', $object->picto, 'class="pictofixedwidth"').' '.$labelofobject.': Count',
+			'position' => 0,
+			'table' => $object->table_element
+		);
 	}
 
 	// Add main fields of object
 	foreach ($object->fields as $key => $val) {
 		if (!empty($val['isameasure']) && (!isset($val['enabled']) || dol_eval($val['enabled'], 1, 1, '1'))) {
-			$arrayofmesures[$tablealias.'.'.$key.'-sum'] = img_picto('', $object->picto, 'class="pictofixedwidth"').' '.$labelofobject.': '.$langs->trans($val['label']).' <span class="opacitymedium">('.$langs->trans("Sum").')</span>';
-			$arrayofmesures[$tablealias.'.'.$key.'-average'] = img_picto('', $object->picto, 'class="pictofixedwidth"').' '.$labelofobject.': '.$langs->trans($val['label']).' <span class="opacitymedium">('.$langs->trans("Average").')</span>';
-			$arrayofmesures[$tablealias.'.'.$key.'-min'] = img_picto('', $object->picto, 'class="pictofixedwidth"').' '.$labelofobject.': '.$langs->trans($val['label']).' <span class="opacitymedium">('.$langs->trans("Minimum").')</span>';
-			$arrayofmesures[$tablealias.'.'.$key.'-max'] = img_picto('', $object->picto, 'class="pictofixedwidth"').' '.$labelofobject.': '.$langs->trans($val['label']).' <span class="opacitymedium">('.$langs->trans("Maximum").')</span>';
+			$arrayofmesures[$tablealias.'.'.$key.'-sum'] = array(
+				'label' => img_picto('', $object->picto, 'class="pictofixedwidth"').' '.$labelofobject.': '.$langs->trans($val['label']).' <span class="opacitymedium">('.$langs->trans("Sum").')</span>',
+				'position' => ($val['position']+($count * 100000)).'.1',
+				'table' => $object->table_element
+			);
+			$arrayofmesures[$tablealias.'.'.$key.'-average'] = array(
+				'label' => img_picto('', $object->picto, 'class="pictofixedwidth"').' '.$labelofobject.': '.$langs->trans($val['label']).' <span class="opacitymedium">('.$langs->trans("Average").')</span>',
+				'position' => ($val['position']+($count * 100000)).'.2',
+				'table' => $object->table_element
+			);
+			$arrayofmesures[$tablealias.'.'.$key.'-min'] = array(
+				'label' => img_picto('', $object->picto, 'class="pictofixedwidth"').' '.$labelofobject.': '.$langs->trans($val['label']).' <span class="opacitymedium">('.$langs->trans("Minimum").')</span>',
+				'position' => ($val['position']+($count * 100000)).'.3',
+				'table' => $object->table_element
+			);
+			$arrayofmesures[$tablealias.'.'.$key.'-max'] = array(
+				'label' => img_picto('', $object->picto, 'class="pictofixedwidth"').' '.$labelofobject.': '.$langs->trans($val['label']).' <span class="opacitymedium">('.$langs->trans("Maximum").')</span>',
+				'position' => ($val['position']+($count * 100000)).'.4',
+				'table' => $object->table_element
+			);
 		}
 	}
 	// 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]) && (!isset($extrafields->attributes[$object->table_element]['enabled'][$key]) || dol_eval($extrafields->attributes[$object->table_element]['enabled'][$key], 1, 1, '1'))) {
-				$arrayofmesures[$tablealias.'e.'.$key.'-sum'] = img_picto('', $object->picto, 'class="pictofixedwidth"').' '.$labelofobject.': '.$langs->trans($extrafields->attributes[$object->table_element]['label'][$key]).' <span class="opacitymedium">('.$langs->trans("Sum").')</span>';
-				$arrayofmesures[$tablealias.'e.'.$key.'-average'] = img_picto('', $object->picto, 'class="pictofixedwidth"').' '.$labelofobject.': '.$langs->trans($extrafields->attributes[$object->table_element]['label'][$key]).' <span class="opacitymedium">('.$langs->trans("Average").')</span>';
-				$arrayofmesures[$tablealias.'e.'.$key.'-min'] = img_picto('', $object->picto, 'class="pictofixedwidth"').' '.$labelofobject.': '.$langs->trans($extrafields->attributes[$object->table_element]['label'][$key]).' <span class="opacitymedium">('.$langs->trans("Minimum").')</span>';
-				$arrayofmesures[$tablealias.'e.'.$key.'-max'] = img_picto('', $object->picto, 'class="pictofixedwidth"').' '.$labelofobject.': '.$langs->trans($extrafields->attributes[$object->table_element]['label'][$key]).' <span class="opacitymedium">('.$langs->trans("Maximum").')</span>';
+				$arrayofmesures[$tablealias.'e.'.$key.'-sum'] = array(
+					'label' => img_picto('', $object->picto, 'class="pictofixedwidth"').' '.$labelofobject.': '.$langs->trans($extrafields->attributes[$object->table_element]['label'][$key]).' <span class="opacitymedium">('.$langs->trans("Sum").')</span>',
+					'position' => ($val['position']+($count * 100000)).'.1',
+					'table' => $object->table_element
+				);
+				$arrayofmesures[$tablealias.'e.'.$key.'-average'] = array(
+					'label' => img_picto('', $object->picto, 'class="pictofixedwidth"').' '.$labelofobject.': '.$langs->trans($extrafields->attributes[$object->table_element]['label'][$key]).' <span class="opacitymedium">('.$langs->trans("Average").')</span>',
+					'position' => ($val['position']+($count * 100000)).'.2',
+					'table' => $object->table_element
+				);
+				$arrayofmesures[$tablealias.'e.'.$key.'-min'] = array(
+					'label' => img_picto('', $object->picto, 'class="pictofixedwidth"').' '.$labelofobject.': '.$langs->trans($extrafields->attributes[$object->table_element]['label'][$key]).' <span class="opacitymedium">('.$langs->trans("Minimum").')</span>',
+					'position' => ($val['position']+($count * 100000)).'.3',
+					'table' => $object->table_element
+				);
+				$arrayofmesures[$tablealias.'e.'.$key.'-max'] = array(
+					'label' => img_picto('', $object->picto, 'class="pictofixedwidth"').' '.$labelofobject.': '.$langs->trans($extrafields->attributes[$object->table_element]['label'][$key]).' <span class="opacitymedium">('.$langs->trans("Maximum").')</span>',
+					'position' => ($val['position']+($count * 100000)).'.4',
+					'table' => $object->table_element
+				);
 			}
 		}
 	}
@@ -915,19 +1023,16 @@ function fillArrayOfMeasures($object, $tablealias, $labelofobject, &$arrayofmesu
 	foreach ($object->fields as $key => $val) {
 		if (preg_match('/^[^:]+:[^:]+:/', $val['type'])) {
 			$tmptype = explode(':', $val['type'], 4);
-			if ($tmptype[0] = 'integer' && $tmptype[1] && $tmptype[2]) {
+			if ($tmptype[0] == 'integer' && $tmptype[1] && $tmptype[2]) {
 				$newobject = $tmptype[1];
 				dol_include_once($tmptype[2]);
 				if (class_exists($newobject)) {
 					$tmpobject = new $newobject($db);
-					/*var_dump($val['label']);
-					 var_dump($tmptype);
-					 var_dump($arrayofmesures);
-					 var_dump('t-'.$key);*/
+					//var_dump($key); var_dump($tmpobject->element); var_dump($val['label']); var_dump($tmptype); var_dump('t-'.$key);
 					$count++;
 					$arrayofmesures = fillArrayOfMeasures($tmpobject, $tablealias.'__'.$key, $langs->trans($val['label']), $arrayofmesures, $level + 1, $count);
 				} else {
-					print 'Failed to find '.$newobject.' class for field '.$key.' of object '.$object->element."\n";
+					print 'For property '.$object->element.'->'.$key.', type="'.$val['type'].'": Failed to find class '.$newobject." in file ".$tmptype[2]."<br>\n";
 				}
 			}
 		}
@@ -1037,7 +1142,7 @@ function fillArrayOfXAxis($object, $tablealias, $labelofobject, &$arrayofxaxis,
 	foreach ($object->fields as $key => $val) {
 		if (preg_match('/^[^:]+:[^:]+:/', $val['type'])) {
 			$tmptype = explode(':', $val['type'], 4);
-			if ($tmptype[0] = 'integer' && $tmptype[1] && $tmptype[2]) {
+			if ($tmptype[0] == 'integer' && $tmptype[1] && $tmptype[2]) {
 				$newobject = $tmptype[1];
 				dol_include_once($tmptype[2]);
 				if (class_exists($newobject)) {
@@ -1046,7 +1151,7 @@ function fillArrayOfXAxis($object, $tablealias, $labelofobject, &$arrayofxaxis,
 					$count++;
 					$arrayofxaxis = fillArrayOfXAxis($tmpobject, $tablealias.'__'.$key, $langs->trans($val['label']), $arrayofxaxis, $level + 1, $count);
 				} else {
-					print 'Failed to find '.$newobject.' class for field '.$key.' of object '.$object->element."\n";
+					print 'For property '.$object->element.'->'.$key.', type="'.$val['type'].'": Failed to find class '.$newobject." in file ".$tmptype[2]."<br>\n";
 				}
 			}
 		}
@@ -1156,7 +1261,7 @@ function fillArrayOfGroupBy($object, $tablealias, $labelofobject, &$arrayofgroup
 	foreach ($object->fields as $key => $val) {
 		if (preg_match('/^[^:]+:[^:]+:/', $val['type'])) {
 			$tmptype = explode(':', $val['type'], 4);
-			if ($tmptype[0] = 'integer' && $tmptype[1] && $tmptype[2]) {
+			if ($tmptype[0] == 'integer' && $tmptype[1] && $tmptype[2]) {
 				$newobject = $tmptype[1];
 				dol_include_once($tmptype[2]);
 				if (class_exists($newobject)) {
@@ -1165,7 +1270,7 @@ function fillArrayOfGroupBy($object, $tablealias, $labelofobject, &$arrayofgroup
 					$count++;
 					$arrayofgroupby = fillArrayOfGroupBy($tmpobject, $tablealias.'__'.$key, $langs->trans($val['label']), $arrayofgroupby, $level + 1, $count);
 				} else {
-					print 'Failed to find '.$newobject.' class for field '.$key.' of object '.$object->element."\n";
+					print 'For property '.$object->element.'->'.$key.', type="'.$val['type'].'": Failed to find class '.$newobject." in file ".$tmptype[2]."<br>\n";
 				}
 			}
 		}