From 8bce409db0333285920b0dd9618a41956e9811a6 Mon Sep 17 00:00:00 2001
From: simicar29 <53998265+simicar29@users.noreply.github.com>
Date: Mon, 10 Feb 2020 13:14:42 +0100
Subject: [PATCH] Show extrafields only when enabled

Show extrafields only in context where they are enabled (especially in edit mode that uses the showOptionals function).
---
 htdocs/core/class/commonobject.class.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index c7dbab57b31..299fe0c8817 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -6624,7 +6624,12 @@ abstract class CommonObject
 				if (is_array($params) && array_key_exists('onlykey', $params) && $key != $params['onlykey']) continue;
 
 				// @todo Add test also on 'enabled' (different than 'list' that is 'visibility')
-				//$enabled = 1;
+				$enabled = 1;
+				if ($enabled && isset($extrafields->attributes[$this->table_element]['enabled'][$key]))
+				{
+                    $enabled = dol_eval($extrafields->attributes[$this->table_element]['enabled'][$key], 1);
+                }
+				if (empty($enabled)) continue;
 
 				$visibility = 1;
 				if ($visibility && isset($extrafields->attributes[$this->table_element]['list'][$key]))