Skip to content

Commit

Permalink
Fix ticket : missing file for numbering
Browse files Browse the repository at this point in the history
  • Loading branch information
atm-maxime committed Jul 5, 2018
1 parent 5883899 commit 74b9f87
Show file tree
Hide file tree
Showing 3 changed files with 125 additions and 5 deletions.
2 changes: 1 addition & 1 deletion htdocs/core/modules/ticket/mod_ticket_simple.php
Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions htdocs/core/modules/ticket/mod_ticket_universal.php
Expand Up @@ -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
Expand Down Expand Up @@ -52,7 +52,7 @@ public function info()
$texte .= '<form action="' . $_SERVER["PHP_SELF"] . '" method="POST">';
$texte .= '<input type="hidden" name="token" value="' . $_SESSION['newtoken'] . '">';
$texte .= '<input type="hidden" name="action" value="updateMask">';
$texte .= '<input type="hidden" name="maskconstticket" value="TICKETSUP_UNIVERSAL_MASK">';
$texte .= '<input type="hidden" name="maskconstticket" value="TICKET_UNIVERSAL_MASK">';
$texte .= '<table class="nobordernopadding" width="100%">';

$tooltip = $langs->trans("GenericMaskCodes", $langs->transnoentities("Ticket"), $langs->transnoentities("Ticket"));
Expand All @@ -63,7 +63,7 @@ public function info()

// Parametrage du prefix
$texte .= '<tr><td>' . $langs->trans("Mask") . ':</td>';
$texte .= '<td align="right">' . $form->textwithpicto('<input type="text" class="flat" size="24" name="maskticket" value="' . $conf->global->TICKETSUP_UNIVERSAL_MASK . '">', $tooltip, 1, 1) . '</td>';
$texte .= '<td align="right">' . $form->textwithpicto('<input type="text" class="flat" size="24" name="maskticket" value="' . $conf->global->TICKET_UNIVERSAL_MASK . '">', $tooltip, 1, 1) . '</td>';

$texte .= '<td align="left" rowspan="2">&nbsp; <input type="submit" class="button" value="' . $langs->trans("Modify") . '" name="Button"></td>';

Expand Down Expand Up @@ -109,7 +109,7 @@ public function getNextValue($objsoc, $ticket)
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';
Expand Down
120 changes: 120 additions & 0 deletions htdocs/core/modules/ticket/modules_ticket.php
@@ -0,0 +1,120 @@
<?php
/* Copyright (C) 2010-2014 Regis Houssin <regis.houssin@capnetworks.com>
* Copyright (C) 2014 Marcos García <marcosgdf@gmail.com>
*
* 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 <http://www.gnu.org/licenses/>.
* 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");
}
}

0 comments on commit 74b9f87

Please sign in to comment.