From 5dee3b5b2f186de9a23c662c9e91afe70914680e Mon Sep 17 00:00:00 2001
From: lvessiller <lvessiller@open-dsi.fr>
Date: Mon, 7 Sep 2020 14:24:09 +0200
Subject: [PATCH 1/3] FIX no empty value in required extrafield

---
 htdocs/core/class/extrafields.class.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/core/class/extrafields.class.php b/htdocs/core/class/extrafields.class.php
index 48015547903..9c1d9c3a105 100644
--- a/htdocs/core/class/extrafields.class.php
+++ b/htdocs/core/class/extrafields.class.php
@@ -1147,7 +1147,7 @@ class ExtraFields
 			}
 
 			$out.='<select class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" '.($moreparam?$moreparam:'').'>';
-			$out.='<option value="0">&nbsp;</option>';
+			if (!$required)	$out.='<option value="0">&nbsp;</option>';
 			foreach ($param['options'] as $key => $val)
 			{
 				if ((string) $key == '') continue;
@@ -1258,7 +1258,7 @@ class ExtraFields
                     dol_syslog(get_class($this) . '::showInputField type=sellist', LOG_DEBUG);
                     $resql = $this->db->query($sql);
                     if ($resql) {
-                        $out .= '<option value="0">&nbsp;</option>';
+						if (!$required) $out .= '<option value="0">&nbsp;</option>';
                         $num = $this->db->num_rows($resql);
                         $i = 0;
                         while ($i < $num) {
@@ -1323,7 +1323,7 @@ class ExtraFields
                 } else {
 					require_once DOL_DOCUMENT_ROOT . '/categories/class/categorie.class.php';
                     $data = $form->select_all_categories(Categorie::$MAP_ID_TO_CODE[$InfoFieldList[5]], '', 'parent', 64, $InfoFieldList[6], 1, 1);
-                    $out .= '<option value="0">&nbsp;</option>';
+					if (!$required) $out .= '<option value="0">&nbsp;</option>';
                     foreach ($data as $data_key => $data_value) {
                         $out .= '<option value="' . $data_key . '"';
                         $out .= ($value == $data_key ? ' selected' : '');

From 23accef5c2e627f7e690036698f38803c38a8790 Mon Sep 17 00:00:00 2001
From: lvessiller <lvessiller@open-dsi.fr>
Date: Tue, 8 Sep 2020 14:53:40 +0200
Subject: [PATCH 2/3] FIX empty value is needed on filter list

---
 htdocs/core/class/extrafields.class.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/core/class/extrafields.class.php b/htdocs/core/class/extrafields.class.php
index 9c1d9c3a105..05bed3c8039 100644
--- a/htdocs/core/class/extrafields.class.php
+++ b/htdocs/core/class/extrafields.class.php
@@ -1147,7 +1147,7 @@ class ExtraFields
 			}
 
 			$out.='<select class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" '.($moreparam?$moreparam:'').'>';
-			if (!$required)	$out.='<option value="0">&nbsp;</option>';
+			$out .= '<option value="">&nbsp;</option>';
 			foreach ($param['options'] as $key => $val)
 			{
 				if ((string) $key == '') continue;
@@ -1258,7 +1258,7 @@ class ExtraFields
                     dol_syslog(get_class($this) . '::showInputField type=sellist', LOG_DEBUG);
                     $resql = $this->db->query($sql);
                     if ($resql) {
-						if (!$required) $out .= '<option value="0">&nbsp;</option>';
+						$out .= '<option value="">&nbsp;</option>';
                         $num = $this->db->num_rows($resql);
                         $i = 0;
                         while ($i < $num) {
@@ -1323,7 +1323,7 @@ class ExtraFields
                 } else {
 					require_once DOL_DOCUMENT_ROOT . '/categories/class/categorie.class.php';
                     $data = $form->select_all_categories(Categorie::$MAP_ID_TO_CODE[$InfoFieldList[5]], '', 'parent', 64, $InfoFieldList[6], 1, 1);
-					if (!$required) $out .= '<option value="0">&nbsp;</option>';
+					$out .= '<option value="">&nbsp;</option>';
                     foreach ($data as $data_key => $data_value) {
                         $out .= '<option value="' . $data_key . '"';
                         $out .= ($value == $data_key ? ' selected' : '');

From 496150d7475469563eb3fcc1d0075c0bcc4437a0 Mon Sep 17 00:00:00 2001
From: lvessiller <lvessiller@open-dsi.fr>
Date: Tue, 6 Oct 2020 10:21:24 +0200
Subject: [PATCH 3/3] FIX extrafield required error after submit

---
 htdocs/core/class/extrafields.class.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/htdocs/core/class/extrafields.class.php b/htdocs/core/class/extrafields.class.php
index 05bed3c8039..ef8f70c767b 100644
--- a/htdocs/core/class/extrafields.class.php
+++ b/htdocs/core/class/extrafields.class.php
@@ -1147,7 +1147,7 @@ class ExtraFields
 			}
 
 			$out.='<select class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" '.($moreparam?$moreparam:'').'>';
-			$out .= '<option value="">&nbsp;</option>';
+			$out .= '<option value="0">&nbsp;</option>';
 			foreach ($param['options'] as $key => $val)
 			{
 				if ((string) $key == '') continue;
@@ -1258,7 +1258,7 @@ class ExtraFields
                     dol_syslog(get_class($this) . '::showInputField type=sellist', LOG_DEBUG);
                     $resql = $this->db->query($sql);
                     if ($resql) {
-						$out .= '<option value="">&nbsp;</option>';
+						$out .= '<option value="0">&nbsp;</option>';
                         $num = $this->db->num_rows($resql);
                         $i = 0;
                         while ($i < $num) {
@@ -1323,7 +1323,7 @@ class ExtraFields
                 } else {
 					require_once DOL_DOCUMENT_ROOT . '/categories/class/categorie.class.php';
                     $data = $form->select_all_categories(Categorie::$MAP_ID_TO_CODE[$InfoFieldList[5]], '', 'parent', 64, $InfoFieldList[6], 1, 1);
-					$out .= '<option value="">&nbsp;</option>';
+					$out .= '<option value="0">&nbsp;</option>';
                     foreach ($data as $data_key => $data_value) {
                         $out .= '<option value="' . $data_key . '"';
                         $out .= ($value == $data_key ? ' selected' : '');
@@ -2008,8 +2008,8 @@ class ExtraFields
 				if ($this->attributes[$object->table_element]['required'][$key])	// Value is required
 				{
 					// Check if empty without using GETPOST, value can be alpha, int, array, etc...
-				    if ((! is_array($_POST["options_".$key]) && empty($_POST["options_".$key]) && $this->attributes[$object->table_element]['type'][$key] != 'select' && $_POST["options_".$key] != '0')
-				        || (! is_array($_POST["options_".$key]) && empty($_POST["options_".$key]) && $this->attributes[$object->table_element]['type'][$key] == 'select')
+				    if ((! is_array($_POST["options_".$key]) && empty($_POST["options_".$key]) && !in_array($this->attributes[$object->table_element]['type'][$key], array('select', 'sellist')) && $_POST["options_".$key] != '0')
+				        || (! is_array($_POST["options_".$key]) && empty($_POST["options_".$key]) && in_array($this->attributes[$object->table_element]['type'][$key], array('select', 'sellist')))
 				        || (is_array($_POST["options_".$key]) && empty($_POST["options_".$key])))
 					{
 						//print 'ccc'.$value.'-'.$this->attributes[$object->table_element]['required'][$key];