diff --git a/ChangeLog.md b/ChangeLog.md index 557fd86d834a0f87d1c462925b49be961d4d0eab..6b7a2f5a1aaa32342df1f2a8f27afcde79cb6124 100755 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -3,6 +3,12 @@ Le format du fichier est basé sur [Tenez un ChangeLog](http://keepachangelog.co ## [Non Distribué] +## [14.0.26] - 12-03-2025 +- Correction de la définition des Extrafields à partir de DLB20 : syntaxe USF sur les filtres SQL + +## [14.0.25] - 25-02-2025 +- Modification de la définition des Extrafields à partir de DLB21 : syntaxe USF sur les filtres SQL + ## [14.0.24] - 19-02-2025 - Modification du type des évenements de 'moduleauto' en 'systemauto' car 'moduleauto' n'est pas entierement supporté (donc les types n'auront pas de libellé mais les évenements seront consirerées comme évenements auto) @@ -408,7 +414,9 @@ Le format du fichier est basé sur [Tenez un ChangeLog](http://keepachangelog.co ## [1.0.0] - 10-01-2019 - Version initial. -[Non Distribué]: http://git.open-dsi.fr/dolibarr-extension/extendedcontract/compare/14.0.24...HEAD +[Non Distribué]: http://git.open-dsi.fr/dolibarr-extension/extendedcontract/compare/14.0.26...HEAD +[14.0.26]: http://git.open-dsi.fr/dolibarr-extension/extendedcontract/commits/14.0.26 +[14.0.25]: http://git.open-dsi.fr/dolibarr-extension/extendedcontract/commits/14.0.25 [14.0.24]: http://git.open-dsi.fr/dolibarr-extension/extendedcontract/commits/14.0.24 [14.0.23]: http://git.open-dsi.fr/dolibarr-extension/extendedcontract/commits/14.0.23 [14.0.22]: http://git.open-dsi.fr/dolibarr-extension/extendedcontract/commits/14.0.22 diff --git a/VERSION b/VERSION index da84cd5f5950c8b17b003385c35fc5797ab00d7d..32667cd2e2c022d130bc7ea5fb9569087b8c1414 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -14.0.24 \ No newline at end of file +14.0.26 \ No newline at end of file diff --git a/core/modules/modExtendedContract.class.php b/core/modules/modExtendedContract.class.php index f7fdedba594fa5ca8a9a1543ed20b0a8211a208a..9442dff72ed2198abcb3533b0b9dbd5c93623fc9 100755 --- a/core/modules/modExtendedContract.class.php +++ b/core/modules/modExtendedContract.class.php @@ -547,6 +547,15 @@ class modExtendedContract extends DolibarrModules $result = $extrafields->update(self::EF_CONTRACT_MONTH_FOR_NEW_REVALUATION_INDEX, 'ECContractMonthForNewRevaluationIndex', 'select', '', 'contrat', 0, 0, $pos + 104, array('options' => array(1 => $langs->trans('ECContractMonthForNewRevaluationIndexJanuary'), 2 => $langs->trans('ECContractMonthForNewRevaluationIndexFebruary'), 3 => $langs->trans('ECContractMonthForNewRevaluationIndexMarch'), 4 => $langs->trans('ECContractMonthForNewRevaluationIndexApril'), 5 => $langs->trans('ECContractMonthForNewRevaluationIndexMay'), 6 => $langs->trans('ECContractMonthForNewRevaluationIndexJune'), 7 => $langs->trans('ECContractMonthForNewRevaluationIndexJuly'), 8 => $langs->trans('ECContractMonthForNewRevaluationIndexAugust'), 9 => $langs->trans('ECContractMonthForNewRevaluationIndexSeptember'), 10 => $langs->trans('ECContractMonthForNewRevaluationIndexOctober'), 11 => $langs->trans('ECContractMonthForNewRevaluationIndexNovember'), 12 => $langs->trans('ECContractMonthForNewRevaluationIndexDecember'))), 1, '', 1, 0, '', '', '', 'extendedcontract@extendedcontract', '1'); $result = $extrafields->update(self::EF_CONTRACT_REVALUATION_CALCULATION_BASE, 'ECContractRevaluationCalculationBase', 'select', '', 'contrat', 0, 0, $pos + 107, array('options' => array(1 => $langs->trans('ECContractRevaluationCalculationBaseInitialAmount'), 2 => $langs->trans('ECContractRevaluationCalculationBaseLastResetAmount'))), 1, '', 1, 0, '', '', '', 'extendedcontract@extendedcontract', '1'); + // 14.0.25 + if (version_compare(DOL_VERSION, '20.0', '>=')) { + $result = $extrafields->update(self::EF_CONTRACT_LAST_REVALUATION_INDEX_USED, 'ECContractLastRevaluationIndexUsed', 'sellist', '', 'contrat', 0, 0, $pos + 106, array('options' => array('c_extendedcontract_index_values:index_label:rowid:options_' . self::EF_CONTRACT_REVALUATION_INDEX . '|fk_index:(active:=:1)' => null)), 1, '', 1, 0, '', '', '', 'extendedcontract@extendedcontract', '1'); + $result = $extrafields->update(self::EF_CONTRACT_REVALUATION_INDEX, 'ECContractRevaluationIndex', 'sellist', '', 'contrat', 0, 0, $pos + 101, array('options' => array('c_extendedcontract_index:label:rowid::(active:=:1)' => null)), 1, '', 1, 0, '', '', '', 'extendedcontract@extendedcontract', '1'); + $result = $extrafields->update(self::EF_CONTRACT_INITIAL_REVALUATION_INDEX_USED, 'ECContractInitialRevaluationIndexUsed', 'sellist', '', 'contrat', 0, 0, $pos + 105, array('options' => array('c_extendedcontract_index_values:index_label:rowid:options_' . self::EF_CONTRACT_REVALUATION_INDEX . '|fk_index:(active:=:1)' => null)), 1, '', 1, 0, '', '', '', 'extendedcontract@extendedcontract', '1'); + $result = $extrafields->update(self::EF_CONTRACT_PAYMENT_MODE, 'PaymentMode', 'sellist', '', 'contrat', 0, 0, $pos + 55, array('options' => array("c_paiement:libelle:id::((active:>:0) AND (code:!=:'') AND (entity:IN:" . getEntity('c_paiement') . "))" => null)), 1, '', 1, 0, '', '', '', 'bills', '1'); + $result = $extrafields->update(self::EF_CONTRACT_ACCOUNT, 'BankAccount', 'sellist', '', 'contrat', 0, 0, $pos + 56, array('options' => array('bank_account:label:rowid::((clos:=:0) AND (entity:IN:' . getEntity('bank_account') . '))' => null)), 1, '', 1, 0, '', '', '', 'banks', '1'); + } + $this->db->begin(); // Create tables of all dictionaries