Browse Source

Debug v18 - Fix extrafields visibility in customreports

Laurent Destailleur 2 years ago
parent
commit
481fc79721

+ 5 - 0
htdocs/adherents/class/adherent.class.php

@@ -64,6 +64,11 @@ class Adherent extends CommonObject
 	 */
 	public $ismultientitymanaged = 1;
 
+	/**
+	 * @var int  Does object support extrafields ? 0=No, 1=Yes
+	 */
+	public $isextrafieldmanaged = 1;
+
 	/**
 	 * @var string picto
 	 */

+ 1 - 1
htdocs/core/customreports.php

@@ -1072,7 +1072,7 @@ function fillArrayOfXAxis($object, $tablealias, $labelofobject, &$arrayofxaxis,
 {
 	global $langs, $extrafields, $db;
 
-	if ($level >= 2) {	// Limit scan on 2 levels max
+	if ($level >= 3) {	// Limit scan on 2 levels max
 		return $arrayofxaxis;
 	}
 

+ 5 - 0
htdocs/product/class/product.class.php

@@ -80,6 +80,11 @@ class Product extends CommonObject
 	 */
 	public $ismultientitymanaged = 1;
 
+	/**
+	 * @var int  Does object support extrafields ? 0=No, 1=Yes
+	 */
+	public $isextrafieldmanaged = 1;
+
 	/**
 	 * @var string picto
 	 */

+ 1 - 1
htdocs/product/dynamic_price/class/price_parser.class.php

@@ -157,7 +157,7 @@ class PriceParser
 		// Retrieve all extrafields if not already not know (should not happen)
 		if (! is_object($extrafields)) {
 			$extrafields = new ExtraFields($this->db);
-			$extrafields->fetch_name_optionals_label();
+			$extrafields->fetch_name_optionals_label($product->table_element);
 		}
 
 		$product->fetch_optionals();

+ 5 - 0
htdocs/projet/class/project.class.php

@@ -67,6 +67,11 @@ class Project extends CommonObject
 	 */
 	public $ismultientitymanaged = 1;
 
+	/**
+	 * @var int  Does object support extrafields ? 0=No, 1=Yes
+	 */
+	public $isextrafieldmanaged = 1;
+
 	/**
 	 * @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
 	 */

+ 5 - 0
htdocs/user/class/user.class.php

@@ -69,6 +69,11 @@ class User extends CommonObject
 	 */
 	public $ismultientitymanaged = 1;
 
+	/**
+	 * @var int  Does object support extrafields ? 0=No, 1=Yes
+	 */
+	public $isextrafieldmanaged = 1;
+
 	/**
 	 * @var string picto
 	 */