From 9d9cc8bd4ccf6f88519094c86ac0764c83bbc26f Mon Sep 17 00:00:00 2001 From: Nicolas Domenech Date: Wed, 9 Nov 2022 18:11:34 +0100 Subject: [PATCH] #1 [Certificate] fix: change sql file name for use framework name --- README.md | 26 ++++++------ class/certificate.class.php | 2 +- .../certificate/mod_certificate_standard.php | 4 +- core/modules/modDolisirh.class.php | 30 ++++++------- sql/certificate/index.php | 2 + .../llx_saturne_certificate.key.sql | 24 +++++++++++ sql/certificate/llx_saturne_certificate.sql | 42 +++++++++++++++++++ ...lx_saturne_certificate_extrafields.key.sql | 16 +++++++ .../llx_saturne_certificate_extrafields.sql | 21 ++++++++++ .../llx_dolisirh_object_signature.key.sql | 6 +-- 10 files changed, 139 insertions(+), 34 deletions(-) create mode 100644 sql/certificate/index.php create mode 100644 sql/certificate/llx_saturne_certificate.key.sql create mode 100644 sql/certificate/llx_saturne_certificate.sql create mode 100644 sql/certificate/llx_saturne_certificate_extrafields.key.sql create mode 100644 sql/certificate/llx_saturne_certificate_extrafields.sql diff --git a/README.md b/README.md index b0ccdf4..7c6a8f3 100644 --- a/README.md +++ b/README.md @@ -2,22 +2,22 @@ ## Informations -Version du module: 1.1.0 +Version du module : 1.1.0 -Dernière mise à jour: 02/11/2022 +Dernière mise à jour : 02/11/2022 -Prérequis: -* Dolibarr min version 15.0.0 -* Dolibarr min version 15.0.4 +Prérequis : +- Dolibarr min version 15.0.0 +- Dolibarr min version 15.0.4 -Thème: Eldy Menu +Thème : Eldy Menu -Editeur/Licence: [Evarisk](https://www.evarisk.com) / GPL-v3 +Editeur/Licence : [Evarisk](https://www.evarisk.com) / GPLv3 -Assitance: [Forum www.dolibarr.fr](https://www.dolibarr.fr) / Par mail à contact@evarisk.com +Assitance : [Forum www.dolibarr.fr](https://www.dolibarr.fr) / Par mail à technique@evarisk.com à venir : -Documentation: [Wiki DoliSIRH](https://wiki.dolibarr.org/index.php/Module_DoliSIRH) +Documentation : [Wiki DoliSIRH](https://wiki.dolibarr.org/index.php/Module_DoliSIRH) ## Fonctionnalités @@ -25,17 +25,17 @@ Documentation: [Wiki DoliSIRH](https://wiki.dolibarr.org/index.php/Module_DoliSI - Génération des navettes de préparation de la fiche de paye à venir : -[Voir les projets](https://github.com/Evarisk/DoliSIRH/projects?query=is%3Aopen) +[Projet DoliSIRH](https://github.com/Evarisk/DoliSIRH/projects?query=is%3Aopen) ## Installation -# Méthode 1 : +### Méthode 1 : - Depuis le menu "Déployer/Installer un module externe" de Dolibarr : -- Glisser l'archive ZIP 'module_dolisirh-1.2.0' et cliquer sur "SEND" +- Glisser l'archive ZIP 'module_dolisirh-X.Y.Z' et cliquer sur "ENVOYER FICHIER" - Activer le module dans la liste des Modules/Applications installés -# Méthode 2 : +### Méthode 2 : - Dans le dossier "dolibarr/htdocs/custom" copier la ligne suivante : ``` diff --git a/class/certificate.class.php b/class/certificate.class.php index 1cee58b..a4f6365 100644 --- a/class/certificate.class.php +++ b/class/certificate.class.php @@ -44,7 +44,7 @@ class Certificate extends CommonObject /** * @var string Name of table without prefix where object is stored. This is also the key used for extrafields management. */ - public $table_element = 'dolisirh_certificate'; + public $table_element = 'saturne_certificate'; /** * @var int Does this object support multicompany module ? diff --git a/core/modules/dolisirh/certificate/mod_certificate_standard.php b/core/modules/dolisirh/certificate/mod_certificate_standard.php index d4f849a..a00dc44 100644 --- a/core/modules/dolisirh/certificate/mod_certificate_standard.php +++ b/core/modules/dolisirh/certificate/mod_certificate_standard.php @@ -86,7 +86,7 @@ public function canBeActivated(object $object): bool $posindice = strlen($this->prefix) + 6; $sql = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max"; - $sql .= " FROM ".MAIN_DB_PREFIX."dolisirh_certificate"; + $sql .= " FROM ".MAIN_DB_PREFIX."saturne_certificate"; $sql .= " WHERE ref LIKE '".$db->escape($this->prefix)."____-%'"; if ($object->ismultientitymanaged == 1) { $sql .= " AND entity = ".$conf->entity; @@ -122,7 +122,7 @@ public function getNextValue(object $object) // first we get the max value $posindice = strlen($this->prefix) + 6; $sql = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max"; - $sql .= " FROM ".MAIN_DB_PREFIX."dolisirh_certificate"; + $sql .= " FROM ".MAIN_DB_PREFIX."saturne_certificate"; $sql .= " WHERE ref LIKE '".$db->escape($this->prefix)."____-%'"; if ($object->ismultientitymanaged == 1) { $sql .= " AND entity = ".$conf->entity; diff --git a/core/modules/modDolisirh.class.php b/core/modules/modDolisirh.class.php index ce89f41..570e637 100644 --- a/core/modules/modDolisirh.class.php +++ b/core/modules/modDolisirh.class.php @@ -342,21 +342,21 @@ public function __construct($db) 'user' => 0, ); -// $this->menu[$r++] = array( -// 'fk_menu' => 'fk_mainmenu=dolisirh', -// 'type' => 'left', -// 'titre' => $langs->trans('Certificate'), -// 'prefix' => '', -// 'mainmenu' => 'dolisirh', -// 'leftmenu' => 'certificate', -// 'url' => '/dolisirh/view/certificate/certificate_list.php', -// 'langs' => 'dolisirh@dolisirh', -// 'position' => 1000 + $r, -// 'enabled' => '$conf->dolisirh->enabled', -// 'perms' => '$user->rights->dolisirh->certificate->read', -// 'target' => '', -// 'user' => 0, -// ); + $this->menu[$r++] = array( + 'fk_menu' => 'fk_mainmenu=dolisirh', + 'type' => 'left', + 'titre' => $langs->trans('Certificate'), + 'prefix' => '', + 'mainmenu' => 'dolisirh', + 'leftmenu' => 'certificate', + 'url' => '/dolisirh/view/certificate/certificate_list.php', + 'langs' => 'dolisirh@dolisirh', + 'position' => 1000 + $r, + 'enabled' => '$conf->dolisirh->enabled', + 'perms' => '$user->rights->dolisirh->certificate->read', + 'target' => '', + 'user' => 0, + ); $this->menu[$r++] = array( 'fk_menu' => 'fk_mainmenu=dolisirh', // '' if this is a top menu. For left menu, use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode diff --git a/sql/certificate/index.php b/sql/certificate/index.php new file mode 100644 index 0000000..17927e6 --- /dev/null +++ b/sql/certificate/index.php @@ -0,0 +1,2 @@ + +-- +-- This program is free software: you can redistribute it and/or modify +-- it under the terms of the GNU General Public License as published by +-- the Free Software Foundation, either version 3 of the License, or +-- (at your option) any later version. +-- +-- This program is distributed in the hope that it will be useful, +-- but WITHOUT ANY WARRANTY; without even the implied warranty of +-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +-- GNU General Public License for more details. +-- +-- You should have received a copy of the GNU General Public License +-- along with this program. If not, see https://www.gnu.org/licenses/. + +ALTER TABLE llx_saturne_certificate ADD INDEX idx_saturne_certificate_rowid (rowid); +ALTER TABLE llx_saturne_certificate ADD INDEX idx_saturne_certificate_ref (ref); +ALTER TABLE llx_saturne_certificate ADD INDEX idx_saturne_certificate_status (status); +ALTER TABLE llx_saturne_certificate ADD INDEX idx_saturne_certificate_fk_element (fk_element); +ALTER TABLE llx_saturne_certificate ADD INDEX idx_saturne_certificate_fk_product (fk_product); +ALTER TABLE llx_saturne_certificate ADD INDEX idx_saturne_certificate_fk_soc (fk_soc); +ALTER TABLE llx_saturne_certificate ADD INDEX idx_saturne_certificate_fk_project (fk_project); +ALTER TABLE llx_saturne_certificate ADD UNIQUE INDEX uk_saturne_certificate_ref (ref, entity); +ALTER TABLE llx_saturne_certificate ADD CONSTRAINT llx_saturne_certificate_fk_user_creat FOREIGN KEY (fk_user_creat) REFERENCES llx_user(rowid); \ No newline at end of file diff --git a/sql/certificate/llx_saturne_certificate.sql b/sql/certificate/llx_saturne_certificate.sql new file mode 100644 index 0000000..acceca9 --- /dev/null +++ b/sql/certificate/llx_saturne_certificate.sql @@ -0,0 +1,42 @@ +-- Copyright (C) 2023 EVARISK +-- +-- This program is free software: you can redistribute it and/or modify +-- it under the terms of the GNU General Public License as published by +-- the Free Software Foundation, either version 3 of the License, or +-- (at your option) any later version. +-- +-- This program is distributed in the hope that it will be useful, +-- but WITHOUT ANY WARRANTY; without even the implied warranty of +-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +-- GNU General Public License for more details. +-- +-- You should have received a copy of the GNU General Public License +-- along with this program. If not, see https://www.gnu.org/licenses/. + +CREATE TABLE llx_saturne_certificate( + rowid integer AUTO_INCREMENT PRIMARY KEY NOT NULL, + ref varchar(128) DEFAULT '(PROV)' NOT NULL, + ref_ext varchar(128), + entity integer DEFAULT 1 NOT NULL, + label varchar(255), + description text, + note_public text, + note_private text, + date_creation datetime NOT NULL, + date_start datetime, + date_end datetime, + tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, + import_key varchar(14), + last_main_doc varchar(255), + model_pdf varchar(255), + status integer NOT NULL, + json text, + sha256 text, + element_type text, + fk_element integer, + fk_product integer, + fk_soc integer, + fk_project integer, + fk_user_creat integer NOT NULL, + fk_user_modif integer +) ENGINE=innodb; \ No newline at end of file diff --git a/sql/certificate/llx_saturne_certificate_extrafields.key.sql b/sql/certificate/llx_saturne_certificate_extrafields.key.sql new file mode 100644 index 0000000..6536540 --- /dev/null +++ b/sql/certificate/llx_saturne_certificate_extrafields.key.sql @@ -0,0 +1,16 @@ +-- Copyright (C) 2023 EVARISK +-- +-- This program is free software; you can redistribute it and/or modify +-- it under the terms of the GNU General Public License as published by +-- the Free Software Foundation; either version 3 of the License, or +-- (at your option) any later version. +-- +-- This program is distributed in the hope that it will be useful, +-- but WITHOUT ANY WARRANTY; without even the implied warranty of +-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +-- GNU General Public License for more details. +-- +-- You should have received a copy of the GNU General Public License +-- along with this program. If not, see https://www.gnu.org/licenses/. + +ALTER TABLE llx_saturne_certificate_extrafields ADD INDEX idx_certificate_fk_object(fk_object); \ No newline at end of file diff --git a/sql/certificate/llx_saturne_certificate_extrafields.sql b/sql/certificate/llx_saturne_certificate_extrafields.sql new file mode 100644 index 0000000..44c9745 --- /dev/null +++ b/sql/certificate/llx_saturne_certificate_extrafields.sql @@ -0,0 +1,21 @@ +-- Copyright (C) 2023 EVARISK +-- +-- This program is free software; you can redistribute it and/or modify +-- it under the terms of the GNU General Public License as published by +-- the Free Software Foundation; either version 3 of the License, or +-- (at your option) any later version. +-- +-- This program is distributed in the hope that it will be useful, +-- but WITHOUT ANY WARRANTY; without even the implied warranty of +-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +-- GNU General Public License for more details. +-- +-- You should have received a copy of the GNU General Public License +-- along with this program. If not, see https://www.gnu.org/licenses/. + +create table llx_saturne_certificate_extrafields( + rowid integer AUTO_INCREMENT PRIMARY KEY, + tms timestamp, + fk_object integer NOT NULL, + import_key varchar(14) -- import key +) ENGINE=innodb; \ No newline at end of file diff --git a/sql/signature/llx_dolisirh_object_signature.key.sql b/sql/signature/llx_dolisirh_object_signature.key.sql index 60a51a6..0711a8e 100644 --- a/sql/signature/llx_dolisirh_object_signature.key.sql +++ b/sql/signature/llx_dolisirh_object_signature.key.sql @@ -14,6 +14,6 @@ -- along with this program. If not, see https://www.gnu.org/licenses/. ALTER TABLE llx_dolisirh_object_signature ADD INDEX idx_dolisirh_object_signature_rowid (rowid); -ALTER TABLE llx_dolisirh_certificate_extrafields ADD INDEX idx_dolisirh_object_signature_status (status); -ALTER TABLE llx_dolisirh_certificate_extrafields ADD INDEX idx_dolisirh_object_signature_element_id (element_id); -ALTER TABLE llx_dolisirh_certificate_extrafields ADD INDEX idx_dolisirh_object_signature_fk_object (fk_object); +ALTER TABLE llx_dolisirh_object_signature ADD INDEX idx_dolisirh_object_signature_status (status); +ALTER TABLE llx_dolisirh_object_signature ADD INDEX idx_dolisirh_object_signature_element_id (element_id); +ALTER TABLE llx_dolisirh_object_signature ADD INDEX idx_dolisirh_object_signature_fk_object (fk_object);