diff --git a/htdocs/core/modules/modTicket.class.php b/htdocs/core/modules/modTicket.class.php index 72fec5ebe01..9cf2c097e3b 100644 --- a/htdocs/core/modules/modTicket.class.php +++ b/htdocs/core/modules/modTicket.class.php @@ -108,7 +108,7 @@ class modTicket extends DolibarrModules // Example: $this->const = array(); $this->const[1] = array('TICKETS_ENABLE_PUBLIC_INTERFACE', 'chaine', '1', 'Enable ticket public interface'); - $this->const[2] = array('TICKETSUP_ADDON', 'chaine', 'mod_ticket_simple', 'Ticket ref module'); + $this->const[2] = array('TICKET_ADDON', 'chaine', 'mod_ticket_simple', 'Ticket ref module'); $this->tabs = array( 'thirdparty:+ticket:Tickets:@ticket:$user->rights->ticket->read:/ticket/list.php?socid=__ID__', diff --git a/htdocs/core/modules/ticket/mod_ticket_simple.php b/htdocs/core/modules/ticket/mod_ticket_simple.php index ac4347dc4db..b70b9babd05 100644 --- a/htdocs/core/modules/ticket/mod_ticket_simple.php +++ b/htdocs/core/modules/ticket/mod_ticket_simple.php @@ -23,7 +23,7 @@ * \brief File with class to manage the numbering module Simple for ticket references */ -require_once DOL_DOCUMENT_ROOT.'/core/modules/modules_ticket.php'; +require_once DOL_DOCUMENT_ROOT.'/core/modules/ticket/modules_ticket.php'; /** * Class to manage the numbering module Simple for ticket references diff --git a/htdocs/core/modules/ticket/mod_ticket_universal.php b/htdocs/core/modules/ticket/mod_ticket_universal.php index edc943e8341..2d521f18a5b 100644 --- a/htdocs/core/modules/ticket/mod_ticket_universal.php +++ b/htdocs/core/modules/ticket/mod_ticket_universal.php @@ -22,7 +22,7 @@ * \brief Fichier contenant la classe du modele de numerotation de reference de projet Universal */ -require_once DOL_DOCUMENT_ROOT.'/core/modules/modules_ticket.php'; +require_once DOL_DOCUMENT_ROOT.'/core/modules/ticket/modules_ticket.php'; /** * Classe du modele de numerotation de reference de projet Universal @@ -52,7 +52,7 @@ class mod_ticket_universal extends ModeleNumRefTicket $texte .= '
'; $texte .= ''; $texte .= ''; - $texte .= ''; + $texte .= ''; $texte .= ''; $tooltip = $langs->trans("GenericMaskCodes", $langs->transnoentities("Ticket"), $langs->transnoentities("Ticket")); @@ -63,7 +63,7 @@ class mod_ticket_universal extends ModeleNumRefTicket // Parametrage du prefix $texte .= ''; - $texte .= ''; + $texte .= ''; $texte .= ''; @@ -109,7 +109,7 @@ class mod_ticket_universal extends ModeleNumRefTicket include_once DOL_DOCUMENT_ROOT . '/core/lib/functions2.lib.php'; // On defini critere recherche compteur - $mask = $conf->global->TICKETSUP_UNIVERSAL_MASK; + $mask = $conf->global->TICKET_UNIVERSAL_MASK; if (!$mask) { $this->error = 'NotConfigured'; diff --git a/htdocs/core/modules/ticket/modules_ticket.php b/htdocs/core/modules/ticket/modules_ticket.php new file mode 100644 index 00000000000..d6f8b06d0e8 --- /dev/null +++ b/htdocs/core/modules/ticket/modules_ticket.php @@ -0,0 +1,120 @@ + + * Copyright (C) 2014 Marcos García + * + * 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 . + * or see http://www.gnu.org/ + */ + +/** + * \file htdocs/core/modules/ticket/modules_ticket.php + * \ingroup project + * \brief File that contain parent class for projects models + * and parent class for projects numbering models + */ + +/** + * Classe mere des modeles de numerotation des references de projets + */ +abstract class ModeleNumRefTicket +{ + public $error = ''; + + /** + * Return if a module can be used or not + * + * @return boolean true if module can be used + */ + public function isEnabled() + { + return true; + } + + /** + * Renvoi la description par defaut du modele de numerotation + * + * @return string Texte descripif + */ + public function info() + { + global $langs; + $langs->load("ticket"); + return $langs->trans("NoDescription"); + } + + /** + * Renvoi un exemple de numerotation + * + * @return string Example + */ + public function getExample() + { + global $langs; + $langs->load("ticket"); + return $langs->trans("NoExample"); + } + + /** + * Test si les numeros deja en vigueur dans la base ne provoquent pas de + * de conflits qui empechera cette numerotation de fonctionner. + * + * @return boolean false si conflit, true si ok + */ + public function canBeActivated() + { + return true; + } + + /** + * Renvoi prochaine valeur attribuee + * + * @param Societe $objsoc Object third party + * @param Project $project Object project + * @return string Valeur + */ + public function getNextValue($objsoc, $project) + { + global $langs; + return $langs->trans("NotAvailable"); + } + + /** + * Renvoi version du module numerotation + * + * @return string Valeur + */ + public function getVersion() + { + global $langs; + $langs->load("admin"); + + if ($this->version == 'development') { + return $langs->trans("VersionDevelopment"); + } + + if ($this->version == 'experimental') { + return $langs->trans("VersionExperimental"); + } + + if ($this->version == 'dolibarr') { + return DOL_VERSION; + } + + if ($this->version) { + return $this->version; + } + + return $langs->trans("NotAvailable"); + } +} diff --git a/htdocs/public/ticketsup/create_ticket.php b/htdocs/public/ticket/create_ticket.php similarity index 100% rename from htdocs/public/ticketsup/create_ticket.php rename to htdocs/public/ticket/create_ticket.php diff --git a/htdocs/public/ticketsup/img/bg_ticket.png b/htdocs/public/ticket/img/bg_ticket.png similarity index 100% rename from htdocs/public/ticketsup/img/bg_ticket.png rename to htdocs/public/ticket/img/bg_ticket.png diff --git a/htdocs/public/ticketsup/index.php b/htdocs/public/ticket/index.php similarity index 100% rename from htdocs/public/ticketsup/index.php rename to htdocs/public/ticket/index.php diff --git a/htdocs/public/ticketsup/list.php b/htdocs/public/ticket/list.php similarity index 100% rename from htdocs/public/ticketsup/list.php rename to htdocs/public/ticket/list.php diff --git a/htdocs/public/ticketsup/view.php b/htdocs/public/ticket/view.php similarity index 100% rename from htdocs/public/ticketsup/view.php rename to htdocs/public/ticket/view.php
' . $langs->trans("Mask") . ':' . $form->textwithpicto('', $tooltip, 1, 1) . '' . $form->textwithpicto('', $tooltip, 1, 1) . '