Merge pull request #21 from OPEN-DSI/2022.5.3_rc

- Ajout d'une nouvelle option de champ 'empty_options'

ChangeLog.md

@@ -3,6 +3,9 @@ Le format du fichier est basé sur [Tenez un ChangeLog](http://keepachangelog.co
 
 ## [Non Distribué]
 
+## [4.0.57] - 08-06-2023
+- Ajout d'une nouvelle option de champ 'empty_options'
+
 ## [4.0.56] - 10-03-2023
 - correction de l'enregistrement des balise HTML des type text avec WYSIWYG
 
@@ -231,7 +234,8 @@ Le format du fichier est basé sur [Tenez un ChangeLog](http://keepachangelog.co
 ## [4.0.0] - 16-07-2018
 - Version initial.
 
-[Non Distribué]: https://github.com/OPEN-DSI/dolibarr_module_advancedictionaries/compare/v4.0.56...HEAD
+[Non Distribué]: https://github.com/OPEN-DSI/dolibarr_module_advancedictionaries/compare/v4.0.57...HEAD
+[4.0.57]: https://github.com/OPEN-DSI/dolibarr_module_advancedictionaries/commits/v4.0.57
 [4.0.56]: https://github.com/OPEN-DSI/dolibarr_module_advancedictionaries/commits/v4.0.56
 [4.0.54]: https://github.com/OPEN-DSI/dolibarr_module_advancedictionaries/commits/v4.0.54
 [4.0.53]: https://github.com/OPEN-DSI/dolibarr_module_advancedictionaries/commits/v4.0.53

class/dictionary.class.php

@@ -153,6 +153,7 @@ class Dictionary extends CommonObject
 	 *																	5 : ObjectName
 	 *																	6 : classPath
 	 *																	7 : lang (can use | for multiple field with lang file to load, can use 'AS', example: t1.lang AS t1_lang|t2.lang AS t2_lang)
+	 *   'empty_options'          => array,        				// List of value who is considered as empty (for select, sellist, radio, checkbox, chkbxlst, chkbxlstwithorder)
 	 *   'association_table'      => array (                    // Options on fields with an association table (type "chkbxlst" and "chkbxlstwithorder")
 	 *      'name'                => string                     // Custom association table name given here
 	 *      'fk_line_name'        => string                     // Custom column name for line's id of this dictionary
@@ -2374,7 +2375,7 @@ public function getSearchFieldsValueFromForm()
 					case 'chkbxlst':
                     case 'chkbxlstwithorder':
 						$value_key = GETPOST($fieldHtmlName, 'alpha');
-						if ($value_key === '') $value_key = null;
+						if ($value_key === '' || (is_array($field['empty_options']) && in_array($value_key, $field['empty_options']))) $value_key = null;
 						else $value_key = array($value_key);
 						break;
 					case 'boolean':

core/modules/modAdvanceDictionaries.class.php

@@ -72,7 +72,7 @@ public function __construct($db)
 		$this->editor_url = 'http://www.open-dsi.fr';
 
 		// Possible values for version are: 'development', 'experimental', 'dolibarr', 'dolibarr_deprecated' or a version string like 'x.y.z'
-		$this->version = '4.0.56';
+		$this->version = '4.0.57';
 		// Key used in llx_const table to save module status enabled/disabled (where MYMODULE is value of property name of module in uppercase)
 		$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
 		// Name of image file used for this module.