Merge pull request #39 from OPEN-DSI/2024_rc

2024 rc -> 2024
OPEN-DSI · Jun 18, 2024 · 71f4954 · 71f4954
2 parents b7ef954 + fa52c04
commit 71f4954
Show file tree

Hide file tree

Showing 12 changed files with 36 additions and 17 deletions.
diff --git a/.easya_info.json b/.easya_info.json
@@ -1,4 +1,6 @@
 {
-    "dol_min": 14,
-    "dol_max": 18
+    "dlb_min_version": 14,
+    "dlb_max_version": 18,
+    "php_min_version": 7.1,
+    "php_max_version": 8.2
 }
diff --git a/ChangeLog.md b/ChangeLog.md
@@ -3,9 +3,16 @@ Le format du fichier est basé sur [Tenez un ChangeLog](http://keepachangelog.co
 
 ## [Non Distribué]
 
+## [14.0.4] - 11-06-2024
+- Ajout version de PHP.
+
+## [14.0.3] - 31-05-2024
+- Changement de marque.
+
 ## [14.0.2] - 22-09-2023
 - Correction du filtre sur les colonnes de type boolean
 - Correction des requetes UPDATE et DELETE en prenant en compte l'entité dans les requêtes
+- mise en place CI Gitlab
 
 ## [14.0.1] - 26-02-2024
 - Changement de numérotation
@@ -247,7 +254,10 @@ 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/14.0.1...HEAD
+[Non Distribué]: https://github.com/OPEN-DSI/dolibarr_module_advancedictionaries/compare/14.0.4...HEAD
+[14.0.4]: https://github.com/OPEN-DSI/dolibarr_module_advancedictionaries/commits/14.0.4
+[14.0.3]: https://github.com/OPEN-DSI/dolibarr_module_advancedictionaries/commits/14.0.3
+[14.0.2]: https://github.com/OPEN-DSI/dolibarr_module_advancedictionaries/commits/14.0.2
 [14.0.1]: https://github.com/OPEN-DSI/dolibarr_module_advancedictionaries/commits/14.0.1
 [4.0.59]: https://github.com/OPEN-DSI/dolibarr_module_advancedictionaries/commits/v4.0.59
 [4.0.58]: https://github.com/OPEN-DSI/dolibarr_module_advancedictionaries/commits/v4.0.58

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-14.0.2
+14.0.4
diff --git a/admin/about.php b/admin/about.php
@@ -42,7 +42,8 @@
  * View
  */
 
-llxHeader();
+$wikihelp='EN:AdvanceDictionaries_En|FR:AdvanceDictionaries_Fr|ES:AdvanceDictionaries_Es';
+llxHeader('', $langs->trans("AdvanceDictionariesSetup"), $wikihelp);
 
 $linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
 print load_fiche_titre($langs->trans("AdvanceDictionariesSetup"),$linkback,'title_setup');
@@ -51,17 +52,18 @@
 
 $head=advancedictionaries_prepare_head();
 
-dol_fiche_head($head, 'about', $langs->trans("Module163017Name"), 0, 'action');
+print dol_get_fiche_head($head, 'about', $langs->trans("Module163017Name"), 0, 'opendsi@advancedictionaries');
 
 $modClass = new modAdvanceDictionaries($db);
 $constantLastVersion = !empty($modClass->getVersion()) ? $modClass->getVersion() : 'NC';
 $constantSireneVersion = !empty($conf->global->MODULE_SIRENE_VERSION) ? $conf->global->MODULE_SIRENE_VERSION : 'NC';
 
 $supportvalue = "/*****"."<br>";
-$supportvalue.= " * Module : AdvanceDictionaries"."<br>";
+$supportvalue.= " * Module : ".$langs->trans("Module163017Name")."<br>";
 $supportvalue.= " * Module version : ".$constantLastVersion."<br>";
 $supportvalue.= " * Dolibarr version : ".DOL_VERSION."<br>";
 $supportvalue.= " * Dolibarr version installation initiale : ".$conf->global->MAIN_VERSION_LAST_INSTALL."<br>";
+$supportvalue.= " * Version PHP : ".PHP_VERSION."<br>";
 $supportvalue.= " *****/"."<br><br>";
 $supportvalue.= "Description de votre problème :"."<br>";
 

diff --git a/admin/changelog.php b/admin/changelog.php
@@ -42,7 +42,8 @@
  * View
  */
 
-llxHeader();
+ $wikihelp='EN:AdvanceDictionaries_En|FR:AdvanceDictionaries_Fr|ES:AdvanceDictionaries_Es';
+ llxHeader('', $langs->trans("AdvanceDictionariesSetup"), $wikihelp);
 
 $linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
 print load_fiche_titre($langs->trans("AdvanceDictionariesSetup"),$linkback,'title_setup');
@@ -51,7 +52,7 @@
 
 $head=advancedictionaries_prepare_head();
 
-dol_fiche_head($head, 'changelog', $langs->trans("Module163017Name"), 0, 'action');
+print dol_get_fiche_head($head, 'changelog', $langs->trans("Module163017Name"), 0, 'opendsi@advancedictionaries');
 
 $changelog = opendsi_common_getChangeLog('advancedictionaries');
 

diff --git a/admin/dictionaries.php b/admin/dictionaries.php
@@ -55,7 +55,8 @@
  * View
  */
 
-llxHeader();
+ $wikihelp='EN:AdvanceDictionaries_En|FR:AdvanceDictionaries_Fr|ES:AdvanceDictionaries_Es';
+ llxHeader('', $langs->trans("AdvanceDictionariesSetup"), $wikihelp);
 
 $linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
 print load_fiche_titre($langs->trans("AdvanceDictionariesSetup"),$linkback,'title_setup');
@@ -64,7 +65,7 @@
 
 $head=advancedictionaries_prepare_head();
 
-dol_fiche_head($head, 'dictionaries', $langs->trans("Module163017Name"), 0, 'action');
+print dol_get_fiche_head($head, 'dictionaries', $langs->trans("Module163017Name"), 0, 'opendsi@advancedictionaries');
 
 $moduleFilter = ''; // array or string to set the dictionaries of witch modules to show in dictionaries list
 $familyFilter = ''; // array or string to set the dictionaries of witch family to show in dictionaries list

diff --git a/admin/setup.php b/admin/setup.php
@@ -92,15 +92,16 @@
 
 $formother = new FormOther($db);
 
-llxHeader();
+$wikihelp='EN:AdvanceDictionaries_En|FR:AdvanceDictionaries_Fr|ES:AdvanceDictionaries_Es';
+llxHeader('', $langs->trans("AdvanceDictionariesSetup"), $wikihelp);
 
 $linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
 print load_fiche_titre($langs->trans("AdvanceDictionariesSetup"),$linkback,'title_setup');
 print "<br>\n";
 
 $head=advancedictionaries_prepare_head();
 
-dol_fiche_head($head, 'settings', $langs->trans("Module163017Name"), 0, 'action');
+print dol_get_fiche_head($head, 'settings', $langs->trans("Module163017Name"), 0, 'opendsi@advancedictionaries');
 
 
 print '<br>';

diff --git a/core/modules/modAdvanceDictionaries.class.php b/core/modules/modAdvanceDictionaries.class.php
@@ -67,13 +67,14 @@ public function __construct($db)
 		// Module description, used if translation string 'ModuleXXXDesc' not found (where XXX is value of numeric property 'numero' of module)
 		$this->description = "Description of module Advanced Dictionaries";
         $this->descriptionlong = "";
-        $this->editor_name		= '<b>Easya Solutions</b> (Ex Open-Dsi)';
+        $this->editor_name		= '<b>Easya Solutions</b>';
         $this->editor_web		= 'https://easya.solutions';
         $this->editor_url		= "https://easya.solutions";
         $this->editor_email		= '[email protected]';
 
 		// Possible values for version are: 'development', 'experimental', 'dolibarr', 'dolibarr_deprecated' or a version string like 'x.y.z'
 		$this->version = file_get_contents(__DIR__.'/../../VERSION');
+		$this->url_last_version = 'https://git.open-dsi.fr/dolibarr-extension/'.strtolower($this->name).'/-/raw/2024/VERSION';
 		// 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.
@@ -121,8 +122,9 @@ public function __construct($db)
 		$this->depends = array();		// List of modules id that must be enabled if this module is enabled
 		$this->requiredby = array();	// List of modules id to disable if this one is disabled
 		$this->conflictwith = array();	// List of modules id this module is in conflict with
-		$this->phpmin = array(5,0);					// Minimum version of PHP required by module
-		$this->need_dolibarr_version = array(4,0);	// Minimum version of Dolibarr required by module
+		$easya_info = json_decode(file_get_contents(__DIR__.'/../../.easya_info.json'));
+        $this->phpmin = explode('.', $easya_info->php_min_version);                    // Minimum version of PHP required by module
+        $this->need_dolibarr_version = explode('.', $easya_info->dlb_min_version);    // Minimum version of Dolibarr required by module
 		$this->langfiles = array("advancedictionaries@advancedictionaries", "opendsi@advancedictionaries");
         $langs->load('advancedictionaries@advancedictionaries');
 

diff --git a/img/object_opendsi.png b/img/object_opendsi.png
diff --git a/img/object_opendsi_big.png b/img/object_opendsi_big.png
diff --git a/img/opendsi_dolibarr_preferred_partner.png b/img/opendsi_dolibarr_preferred_partner.png
diff --git a/langs/fr_FR/opendsi.lang b/langs/fr_FR/opendsi.lang
@@ -3,5 +3,5 @@ CHARSET=UTF-8
 easyaFamily=Easya Solutions
 OpenDsiAboutDesc1=Ce module a été développé par <a href="https://easya.solutions" target="_blank">Easya Solutions</a><br><br>Pour toute question technique ou retour, déposez une demande de support sur
 OpenDsiAboutDesc2=notre support
-OpenDsiAboutDesc3=ou contactez-nous sur <a href="mailto:[email protected]">[email protected]</a><br><br>Pour toute question commerciale, contactez-nous sur <a href="mailto:[email protected]">[email protected]</a> ou au +33 4 82 53 94 76<br><br>Retrouvez nos autres modules sur <a href="http://www.dolistore.com/search.php?orderby=position&orderway=desc&search_query=open-dsi&submit_search=Rechercher" target="_blank">Dolistore</a>
+OpenDsiAboutDesc3=<br><br>Pour toute question commerciale, contactez-nous sur <a href="mailto:[email protected]">[email protected]</a> ou au +33 4 82 53 94 76<br><br>Retrouvez nos autres modules sur <a href="http://www.dolistore.com/search.php?orderby=position&orderway=desc&search_query=easya&submit_search=Rechercher" target="_blank">Dolistore</a>
 OpenDsiChangeLog=Fichier de log