#13 [QuickCreation] add: unique creation object

Eoxia · Mar 15, 2023 · d337cf0 · d337cf0
1 parent f06e306
commit d337cf0
Show file tree

Hide file tree

Showing 5 changed files with 128 additions and 167 deletions.
diff --git a/admin/setup.php b/admin/setup.php
@@ -111,7 +111,7 @@
 print '<tr class="liste_titre">';
 print '<td>' . $langs->trans('Name') . '</td>';
 print '<td>' . $langs->trans('Description') . '</td>';
-print '<td class="center">' . $langs->trans('Status') . '</td>';
+print '<td class="center">' . $langs->trans('Visible') . '</td>';
 print '<td>' . $langs->trans('Value') . '</td>';
 print '</tr>';
 
@@ -126,7 +126,7 @@
 print '</td>';
 
 print '<td class="center">';
-print ajax_constantonoff('EASYCRM_THIRDPARTY_CLIENT_VISIBLE');
+//print ajax_constantonoff('EASYCRM_THIRDPARTY_CLIENT_VISIBLE');
 print '</td>';
 
 if ($conf->global->EASYCRM_THIRDPARTY_CLIENT_VISIBLE > 0 && isModEnabled('societe')) {
@@ -144,7 +144,7 @@
 print '</td>';
 
 print '<td class="center">';
-print ajax_constantonoff('EASYCRM_THIRDPARTY_NAME_VISIBLE');
+//print ajax_constantonoff('EASYCRM_THIRDPARTY_NAME_VISIBLE');
 print '</td></td><td></tr>';
 
 // Email
@@ -180,7 +180,7 @@
 print '</td>';
 
 print '<td class="center">';
-print ajax_constantonoff('EASYCRM_CONTACT_LASTNAME_VISIBLE');
+//print ajax_constantonoff('EASYCRM_CONTACT_LASTNAME_VISIBLE');
 print '</td></td><td></tr>';
 
 // Firstname
@@ -228,7 +228,7 @@
 print '</td></td><td></tr>';
 
 // PROJECT
-print '<tr class="oddeven"><td colspan="4" class="center"><div class="titre inline-block">' . $langs->trans('Configs', $langs->trans('QuickProjectCreations')) . '</div></td><tr>';
+print '<tr class="oddeven"><td colspan="4" class="center"><div class="titre inline-block">' . $langs->trans('Configs', $langs->transnoentities('QuickProjectCreations')) . '</div></td><tr>';
 
 // ProjectLabel
 print '<tr class="oddeven"><td>';
@@ -238,7 +238,7 @@
 print '</td>';
 
 print '<td class="center">';
-print ajax_constantonoff('EASYCRM_PROJECT_LABEL_VISIBLE');
+//print ajax_constantonoff('EASYCRM_PROJECT_LABEL_VISIBLE');
 print '</td></td><td></tr>';
 
 // OpportunityStatus

diff --git a/core/modules/modEasyCRM.class.php b/core/modules/modEasyCRM.class.php
@@ -41,7 +41,7 @@ public function __construct($db)
 		global $langs, $conf;
 		$this->db = $db;
 
-        if (isModEnabled('saturne')) {
+        if (file_exists(__DIR__ . '/../../../saturne/lib/saturne_functions.lib.php')) {
             require_once __DIR__ . '/../../../saturne/lib/saturne_functions.lib.php';
             saturne_load_langs(['easycrm@easycrm']);
         } else {
@@ -185,7 +185,8 @@ public function __construct($db)
 
             // CONST MODULE
 			$i++ => ['EASYCRM_VERSION','chaine', $this->version, '', 0, 'current'],
-			$i   => ['EASYCRM_DB_VERSION', 'chaine', $this->version, '', 0, 'current'],
+			$i++ => ['EASYCRM_DB_VERSION', 'chaine', $this->version, '', 0, 'current'],
+            $i   => ['EASYCRM_SHOW_PATCH_NOTE', 'integer', 1, '', 0, 'current'],
         ];
 
 		// Some keys to add into the overwriting translation tables
@@ -338,16 +339,16 @@ public function init($options = ''): int
     {
 		global $conf;
 
-        $sql = [];
-
-        dolibarr_set_const($this->db, 'EASYCRM_VERSION', $this->version, 'chaine', 0, '', $conf->entity);
-        dolibarr_set_const($this->db, 'EASYCRM_DB_VERSION', $this->version, 'chaine', 0, '', $conf->entity);
-
         if ($this->error > 0) {
             setEventMessages('', $this->errors, 'errors');
             return -1; // Do not activate module if error 'not allowed' returned when loading module SQL queries (the _load_table run sql with run_sql with the error allowed parameter set to 'default')
         }
 
+        $sql = [];
+
+        dolibarr_set_const($this->db, 'EASYCRM_VERSION', $this->version, 'chaine', 0, '', $conf->entity);
+        dolibarr_set_const($this->db, 'EASYCRM_DB_VERSION', $this->version, 'chaine', 0, '', $conf->entity);
+
 		// Permissions
 		$this->remove($options);
 

diff --git a/easycrmindex.php b/easycrmindex.php
@@ -28,34 +28,4 @@
     die('Include of easycrm main fails');
 }
 
-// Global variables definitions
-global $conf, $db, $langs, $moduleName, $moduleNameLowerCase, $user;
-
-// Libraries
-require_once __DIR__ . '/core/modules/mod' . $moduleName . '.class.php';
-
-// Load translation files required by the page
-saturne_load_langs();
-
-// Initialize technical objects
-$classname = 'mod' . $moduleName;
-$modModule = new $classname($db);
-
-// Security check
-$permissiontoread = $user->rights->$moduleNameLowerCase->read;
-saturne_check_access($permissiontoread);
-
-/*
- * View
- */
-
-$title   = $langs->trans('ModuleArea', $moduleName);
-$helpUrl = 'FR:Module_' . $moduleName;
-
-saturne_header(0, '', $title . ' ' . $modModule->version, $helpUrl);
-
-print load_fiche_titre($title . ' ' . $modModule->version, '', $moduleNameLowerCase . '_color.png@' . $moduleNameLowerCase);
-
-// End of page
-llxFooter();
-$db->close();
+require_once __DIR__ . '/../saturne/core/tpl/index/index_view.tpl.php';
diff --git a/langs/fr_FR/easycrm.lang b/langs/fr_FR/easycrm.lang
@@ -29,10 +29,11 @@ QuickCreation            = Ajout rapide
 QuickCreations           = ajouts rapide
 QuickThirdPartyCreation  = Ajout rapide de tiers
 QuickThirdPartyCreations = ajouts rapide de tiers
-QuickProjectCreation     = Ajout rapide de projet
-QuickProjectCreations    = ajouts rapide de projet
+QuickProjectCreation     = Ajout rapide d'opportunité ou de projet
+QuickProjectCreations    = ajouts rapide d'opportunité ou de projet
 QuickContactCreation     = Ajout rapide de contact/adresse
 QuickContactCreations    = ajouts rapide de contact/adresse
+CommercialFollowUp       = Suivi commercial
 
 #
 # Config page - Page d'administration