Merge branch '2024_rc_marque' into '2024_rc'

New - changement marque, support, CI

See merge request !3

.easya_info.json

+{
+    "dlb_min_version": "14",
+    "dlb_max_version": "18"
+}

.gitlab-ci.yml

+include:
+  - project: "opendsi/ci-templates"
+    file: "/dolibarr/module/main.yml"
\ No newline at end of file

ChangeLog.md

@@ -3,6 +3,9 @@ Le format du fichier est basé sur [Tenez un ChangeLog](http://keepachangelog.co
 
 ## [Non Distribué]
 
+## [14.0.1] - 28-05-2024
+- Changement de marque, support, CI.
+
 ## [14.0.0] - 23-02-2024
 - Changement de numérotation
 
@@ -24,7 +27,8 @@ Le format du fichier est basé sur [Tenez un ChangeLog](http://keepachangelog.co
 ## [1.0.0] - 20-01-2021
 - Version initiale.
 
-[Non Distribué]: http://git.open-dsi.fr/dolibarr-extension/openmetabase/compare/v1.0.5...HEAD
+[Non Distribué]: http://git.open-dsi.fr/dolibarr-extension/openmetabase/compare/14.0.1...HEAD
+[14.0.1]: http://git.open-dsi.fr/dolibarr-extension/openmetabase/commits/v14.0.1
 [14.0.0]: http://git.open-dsi.fr/dolibarr-extension/openmetabase/commits/v14.0.0
 [1.0.5]: http://git.open-dsi.fr/dolibarr-extension/openmetabase/commits/v1.0.5
 [1.0.4]: http://git.open-dsi.fr/dolibarr-extension/openmetabase/commits/v1.0.4

VERSION

-14.0.0
+14.0.1
\ No newline at end of file

admin/about.php

@@ -29,6 +29,7 @@ if (!$res && file_exists('../../../main.inc.php'))  $res = @include '../../../ma
 if (!$res) die('Include of main fails');
 require_once DOL_DOCUMENT_ROOT . '/core/lib/admin.lib.php';
 dol_include_once('/openmetabase/lib/openmetabase.lib.php');
+dol_include_once('/openmetabase/core/modules/modOpenMetabase.class.php');
 
 $langs->loadLangs(array('admin', 'openmetabase@openmetabase', 'opendsi@openmetabase'));
 
@@ -47,14 +48,35 @@ print '<br>';
 
 $head = openmetabase_admin_prepare_head();
 
-dol_fiche_head($head, 'about', $langs->trans('About'), 0, 'opendsi@openmetabase');
+print dol_get_fiche_head($head, 'about', $langs->trans("Module163052Name"), 0, 'opendsi@openmetabase');
 
-print '<table width="100%"><tr>';
-print '<td width="310px"><img src="../img/opendsi_dolibarr_preferred_partner.png" /></td>';
-print '<td align="left" valign="top"><p>' . $langs->trans('OpenDsiAboutDesc') . '</p></td>';
-print '</tr></table>';
+$modClass = new modOpenMetabase($db);
+$OpenMetabaseVersion = !empty($modClass->getVersion()) ? $modClass->getVersion() : 'NC';
 
-dol_fiche_end();
+$supportvalue = "/*****"."<br>";
+$supportvalue.= " * Module : ".$langs->trans("Module163052Name")."<br>";
+$supportvalue.= " * Module version : ".$OpenMetabaseVersion."<br>";
+$supportvalue.= " * Module version installation initiale : ".$OpenMetabaseVersion."<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>";
+$supportvalue.= "Description de votre problème :"."<br>";
+
+print '<table width="100%">';
+print '<tr>';
+print '<form id="ticket" method="POST" target="_blank" action="https://support.easya.solutions/create_ticket.php">';
+print '<input name=message type="hidden" value="'.$supportvalue.'" />';
+print '<input name=email type="hidden" value="'.$user->email.'" />';
+print '<td class="titlefield center"><img alt="Easya Solutions" src="../img/opendsi_dolibarr_preferred_partner.png" /></td>'."\n";
+print '<td class="left"><p>'.$langs->trans("OpenDsiAboutDesc1").' <button type="submit" >'.$langs->trans("OpenDsiAboutDesc2").'</button> '.$langs->trans("OpenDsiAboutDesc3").'</p></td>'."\n";
+print '</tr>'."\n";
+print '</table>'."\n";
+
+print '<br>'."\n";
+
+
+print dol_get_fiche_end();
 
 llxFooter();
 

admin/changelog.php

@@ -48,7 +48,7 @@ print '<br>';
 
 $head = openmetabase_admin_prepare_head();
 
-dol_fiche_head($head, 'changelog', $langs->trans('OpenDsiChangeLog'), 0, 'opendsi@openmetabase');
+print dol_get_fiche_head($head, 'changelog', $langs->trans("Module163052Name"), 0, 'opendsi@openmetabase');
 
 $changelog = opendsi_common_getChangeLog('openmetabase');
 
@@ -56,7 +56,7 @@ print '<div class="moduledesclong">';
 print (!empty($changelog) ? $changelog : $langs->trans('NotAvailable'));
 print '<div>';
 
-dol_fiche_end();
+print dol_get_fiche_end();
 
 llxFooter();
 

core/modules/modOpenMetabase.class.php

@@ -66,17 +66,29 @@ class modOpenMetabase extends DolibarrModules
 		// Module description, used if translation string 'ModuleXXXDesc' not found (where XXX is value of numeric property 'numero' of module)
 		$this->description = "Description of module OpenMetabase";
 		$this->descriptionlong = "";
-		$this->editor_name = 'Open-DSI';
-		$this->editor_url = 'http://www.open-dsi.fr';
+        $this->editor_name      = '<b>Easya Solutions</b>';
+        $this->editor_web       = 'https://easya.solutions';
+        $this->editor_url       = "https://easya.solutions";
+        $this->editor_email     = 'support@easya.solutions';
 		
 		// Possible values for version are: 'development', 'experimental', 'dolibarr', 'dolibarr_deprecated' or a version string like 'x.y.z'
-		$this->version = '1.0.5';
+		$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)
+
+		$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->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
 		// Name of image file used for this module.
 		// If file is in theme/yourtheme/img directory under name object_pictovalue.png, use this->picto='pictovalue'
 		// If file is in module/img directory under name object_pictovalue.png, use this->picto='pictovalue@module'
-		$this->picto='opendsi@openmetabase';
+		if((float)DOL_VERSION <= 11.0) {
+			$this->picto='opendsi@'.strtolower($this->name);
+		} else {
+			$this->picto='opendsi_big@'.strtolower($this->name);
+		}
 
 		// Defined all module parts (triggers, login, substitutions, menus, css, etc...)
 		// for default path (eg: /mymodule/core/xxxxx) (0=disable, 1=enable)

easya_version.json

-{
-    "dol_min": 14,
-    "dol_max": 18
-}

langs/fr_FR/opendsi.lang

 # Dolibarr language file - fr_FR - opendsi
 CHARSET=UTF-8
 OpenDsiFamily=Open-DSI
-OpenDsiAboutDesc=Ce module a été développé par <a href="http://www.open-dsi.fr" target="_blank">Open-DSI</a><br>Vous pouvez trouver la documentation sur notre <a href="http://wiki.open-dsi.fr/index.php/Accueil" target="_blank">wiki</a><br><br>Pour toute question technique ou retour, contactez-nous sur <a href="mailto:support@open-dsi.fr">support@open-dsi.fr</a><br><br>Pour toute question commerciale, contactez-nous sur <a href="mailto:contact@open-dsi.fr">contact@open-dsi.fr</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>
 OpenDsiChangeLog=Fichier de log
+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=<br><br>Pour toute question commerciale, contactez-nous sur <a href="mailto:info@easya.solutions">info@easya.solutions</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>

langs/fr_FR/openmetabase.lang

@@ -20,6 +20,8 @@ OpenMetabaseDatabaseNameName    = Nom de la base de donnée
 OpenMetabaseDatabaseNameDesc    = Nom de la base de donnée où le dump doit être restauré
 OpenMetabaseRestoreOptionsName  = Options de restauration
 OpenMetabaseRestoreOptionsDesc  = Options de restauration (Disponibles: 'pgsql_dump_format')
+OpenMetabaseSetup               = Configuration du module OpenMetabase
+OpenMetabaseSetupPage           = Page de configuration du module OpenMetabase
 
 #######################################################################
 # Cron

lib/openmetabase.lib.php

@@ -40,7 +40,7 @@ function openmetabase_admin_prepare_head()
     $h++;
 
     $head[$h][0] = dol_buildpath("/openmetabase/admin/about.php", 1);
-    $head[$h][1] = $langs->trans("About");
+    $head[$h][1] = $langs->trans("About") . " / " . $langs->trans("Support");
     $head[$h][2] = 'about';
     $h++;