Merge branch '2024_rc_fix_extrafields' into '2024_rc'

FIX extrafiels compatibility dlb 20

See merge request dolibarr-extension/demat4dolibarr!35

ChangeLog.md

@@ -3,6 +3,9 @@ Le format du fichier est basé sur [Tenez un ChangeLog](https://keepachangelog.c
 
 ## [Non Distribué]
 
+## [14.0.11] - 15-10-2024
+- Correction compatibilité Dolibarr 20 champs complémentaires factures/contacts
+
 ## [14.0.10] - 14-10-2024
 - Correction compatibilité Dolibarr 20 champs complémentaires factures
 
@@ -256,7 +259,8 @@ Le format du fichier est basé sur [Tenez un ChangeLog](https://keepachangelog.c
 ## [7.0.0] - 15-07-2019
 - Version initial.
 
-[Non Distribué]: httpss://git.open-dsi.fr/dolibarr-extension/demat4dolibarr/compare/14.0.10...HEAD
+[Non Distribué]: httpss://git.open-dsi.fr/dolibarr-extension/demat4dolibarr/compare/14.0.11...HEAD
+[14.0.11]: httpss://git.open-dsi.fr/dolibarr-extension/demat4dolibarr/compare/14.0.11
 [14.0.10]: httpss://git.open-dsi.fr/dolibarr-extension/demat4dolibarr/compare/14.0.10
 [14.0.9]: httpss://git.open-dsi.fr/dolibarr-extension/demat4dolibarr/compare/14.0.9
 [14.0.8]: httpss://git.open-dsi.fr/dolibarr-extension/demat4dolibarr/compare/14.0.8

VERSION

-14.0.10
\ No newline at end of file
+14.0.11
\ No newline at end of file

core/modules/modDemat4Dolibarr.class.php

@@ -536,8 +536,10 @@ class modDemat4Dolibarr extends DolibarrModules
 			$result = $extrafields->update('d4d_billing_mode', $langs->trans('Demat4DolibarrBillingMode'), 'sellist', '', 'facture', 0, 0, 1103, array('options' => array('c_demat4dolibarr_billing_mode:code|label:rowid::active=1 AND entity IN (' . $dictionary->getEntity() . ')' => null)), 1, '', 1, 0, '', '', '');
 			// For Dolibarr 20 compatibility
 			if (DOL_VERSION >= 20.0) {	
+				$result = $extrafields->update('d4d_job_status', $langs->trans('Demat4DolibarrJobStatus'), 'sellist', '', 'facture', 0, 0, 1110, array('options' => array('c_demat4dolibarr_job_status:short_label:rowid::(active:=:1) AND (entity:IN:' . $dictionary->getEntity() . ')' => null)), 1, '', $hidden_tech_block ? 0 : 1, 0, '', '', '', '', '1');
 				$result = $extrafields->update('d4d_invoice_status', $langs->trans('Demat4DolibarrInvoiceStatus'), 'sellist', '', 'facture', 0, 0, 1106, array('options' => array('c_demat4dolibarr_invoice_status:short_label:rowid::(active:=:1) AND (entity:IN:' . $dictionary->getEntity() . ')' => null)), 1, '', 1, 0, '', '', '', '', '1');
 				$result = $extrafields->update('d4d_chorus_status', $langs->trans('Demat4DolibarrChorusStatus'), 'sellist', '', 'facture', 0, 0, 1105, array('options' => array('c_demat4dolibarr_chorus_status:short_label:rowid::(active:=:1) AND (entity:IN:' . $dictionary->getEntity() . ')' => null)), 1, '', 1, 0, '', '', '', '', '1');
+				$result = $extrafields->update('d4d_validator_type_id', $langs->trans('Demat4DolibarrValidatorTypeId'), 'sellist', '', 'socpeople', 0, 0, 1201, array('options' => array('c_demat4dolibarr_validator_type_id:code|label:rowid::(active:=:1) AND (entity:IN:' . $dictionary->getEntity() . ')' => null)), 1, '', 1, 0, '', '', '');
 				$result = $extrafields->update('d4d_billing_mode', $langs->trans('Demat4DolibarrBillingMode'), 'sellist', '', 'facture', 0, 0, 1103, array('options' => array('c_demat4dolibarr_billing_mode:code|label:rowid::(active:=:1) AND (entity:IN:' . $dictionary->getEntity() . ')' => null)), 1, '', 1, 0, '', '', '');
 			}
 			$dictionaries = Dictionary::fetchAllDictionaries($this->db, 'demat4dolibarr');