From 3babdb9798702da37f45ff1ce8c51bca26e0c238 Mon Sep 17 00:00:00 2001
From: Maxime Kohlhaas <maxime@atm-consulting.fr>
Date: Thu, 28 Jun 2018 13:45:30 +0200
Subject: [PATCH 01/10] Fix filters not saved when ordering

---
 htdocs/product/reassort.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/htdocs/product/reassort.php b/htdocs/product/reassort.php
index f71601e7bc0..295bf530f91 100644
--- a/htdocs/product/reassort.php
+++ b/htdocs/product/reassort.php
@@ -242,6 +242,8 @@ if ($resql)
 	if ($fourn_id)	$param.="&fourn_id=".$fourn_id;
 	if ($snom)		$param.="&snom=".$snom;
 	if ($sref)		$param.="&sref=".$sref;
+	if ($toolowstock)		$param.="&toolowstock=".$toolowstock;
+	if ($search_categ)		$param.="&search_categ=".$search_categ;
 
 	$formProduct = new FormProduct($db);
 	$formProduct->loadWarehouses();

From 5756955d5544df5d12b9b4ba1502e4f9b5516f0e Mon Sep 17 00:00:00 2001
From: Maxime Kohlhaas <maxime@atm-consulting.fr>
Date: Thu, 28 Jun 2018 14:26:51 +0200
Subject: [PATCH 02/10] Fix link to create event had no socid if from
 thirdparty card

---
 htdocs/core/class/html.formactions.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/core/class/html.formactions.class.php b/htdocs/core/class/html.formactions.class.php
index 2d66661c839..a39b4840017 100644
--- a/htdocs/core/class/html.formactions.class.php
+++ b/htdocs/core/class/html.formactions.class.php
@@ -196,7 +196,7 @@ class FormActions
 
 			if (! empty($conf->agenda->enabled))
 			{
-				$buttontoaddnewevent = '<a href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create&datep='.dol_print_date(dol_now(),'dayhourlog').'&origin='.$typeelement.'&originid='.$object->id.($object->socid>0?'&socid='.$object->socid:'').($projectid>0?'&projectid='.$projectid:'').'&backtopage='.urlencode($urlbacktopage).'">';
+				$buttontoaddnewevent = '<a href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create&datep='.dol_print_date(dol_now(),'dayhourlog').'&origin='.$typeelement.'&originid='.$object->id.($object->socid>0?'&socid='.$object->socid:'').($projectid>0?'&projectid='.$projectid:'').($socid>0?'&socid='.$socid:'').'&backtopage='.urlencode($urlbacktopage).'">';
 				$buttontoaddnewevent.= $langs->trans("AddEvent");
 				$buttontoaddnewevent.= '</a>';
 			}

From 875cee84c7dca5d11dcdc995fe0389294a9d74ee Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@capnetworks.com>
Date: Tue, 3 Jul 2018 13:47:53 +0200
Subject: [PATCH 03/10] Fix: missing "paid" field

---
 htdocs/loan/index.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/loan/index.php b/htdocs/loan/index.php
index d1436287db3..afaefc4575c 100644
--- a/htdocs/loan/index.php
+++ b/htdocs/loan/index.php
@@ -71,7 +71,7 @@ $loan_static = new Loan($db);
 
 llxHeader();
 
-$sql = "SELECT l.rowid, l.label, l.capital, l.datestart, l.dateend,";
+$sql = "SELECT l.rowid, l.label, l.capital, l.paid, l.datestart, l.dateend,";
 $sql.= " SUM(pl.amount_capital) as alreadypayed";
 $sql.= " FROM ".MAIN_DB_PREFIX."loan as l LEFT JOIN ".MAIN_DB_PREFIX."payment_loan AS pl";
 $sql.= " ON l.rowid = pl.fk_loan";
@@ -83,7 +83,7 @@ if ($filtre) {
     $filtre=str_replace(":","=",$filtre);
     $sql .= " AND ".$filtre;
 }
-$sql.= " GROUP BY l.rowid, l.label, l.capital, l.datestart, l.dateend";
+$sql.= " GROUP BY l.rowid, l.label, l.capital, l.paid, l.datestart, l.dateend";
 $sql.= $db->order($sortfield,$sortorder);
 
 $nbtotalofrecords = '';

From 0bb7f84f87945f31ded1c2722d9d3eba8fb33752 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@capnetworks.com>
Date: Tue, 3 Jul 2018 14:11:00 +0200
Subject: [PATCH 04/10] Fix: check if multicompany object exists

---
 htdocs/public/stripe/ipn.php | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/htdocs/public/stripe/ipn.php b/htdocs/public/stripe/ipn.php
index 19f9b8c80bc..c5d2cd85e5c 100644
--- a/htdocs/public/stripe/ipn.php
+++ b/htdocs/public/stripe/ipn.php
@@ -88,7 +88,7 @@ $user = new User($db);
 $user->fetch(5);
 $user->getrights();
 
-if (! empty($conf->multicompany->enabled) && ! empty($conf->stripeconnect->enabled)) {
+if (! empty($conf->multicompany->enabled) && ! empty($conf->stripeconnect->enabled) && is_object($mc)) {
 	$sql = "SELECT entity";
 	$sql.= " FROM ".MAIN_DB_PREFIX."oauth_token";
 	$sql.= " WHERE service = '".$db->escape($service)."' and tokenstring = '%".$db->escape($event->account)."%'";
@@ -102,10 +102,12 @@ if (! empty($conf->multicompany->enabled) && ! empty($conf->stripeconnect->enabl
 			$obj = $db->fetch_object($result);
 			$key=$obj->entity;
 		}
-		else {$key=1;
+		else {
+			$key=1;
 		}
 	}
-	else {$key=1;
+	else {
+		$key=1;
 	}
 	$ret=$mc->switchEntity($key);
 	if (! $res && file_exists("../../main.inc.php")) $res=@include("../../main.inc.php");

From 74b9f87cab84a3d0bb6480c0b8f34c336742661e Mon Sep 17 00:00:00 2001
From: Maxime Kohlhaas <maxime@atm-consulting.fr>
Date: Thu, 5 Jul 2018 14:35:12 +0200
Subject: [PATCH 05/10] Fix ticket : missing file for numbering

---
 .../core/modules/ticket/mod_ticket_simple.php |   2 +-
 .../modules/ticket/mod_ticket_universal.php   |   8 +-
 htdocs/core/modules/ticket/modules_ticket.php | 120 ++++++++++++++++++
 3 files changed, 125 insertions(+), 5 deletions(-)
 create mode 100644 htdocs/core/modules/ticket/modules_ticket.php

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 .= '<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"));
@@ -63,7 +63,7 @@ class mod_ticket_universal extends ModeleNumRefTicket
 
         // 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>';
 
@@ -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 @@
+<?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");
+    }
+}

From 39f890d84af7f30ad4efadab9cecaa14b8eb139d Mon Sep 17 00:00:00 2001
From: Maxime Kohlhaas <maxime@atm-consulting.fr>
Date: Thu, 5 Jul 2018 14:51:00 +0200
Subject: [PATCH 06/10] Fix TICKETSUP var name

---
 htdocs/core/modules/modTicket.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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__',

From badcbd78d8c056d2a3d1d97c8ef625fffb59329f Mon Sep 17 00:00:00 2001
From: Maxime Kohlhaas <maxime@atm-consulting.fr>
Date: Thu, 5 Jul 2018 15:20:38 +0200
Subject: [PATCH 07/10] Rename ticketsup public directory

---
 .../public/{ticketsup => ticket}/create_ticket.php  |   0
 .../public/{ticketsup => ticket}/img/bg_ticket.png  | Bin
 htdocs/public/{ticketsup => ticket}/index.php       |   0
 htdocs/public/{ticketsup => ticket}/list.php        |   0
 htdocs/public/{ticketsup => ticket}/view.php        |   0
 5 files changed, 0 insertions(+), 0 deletions(-)
 rename htdocs/public/{ticketsup => ticket}/create_ticket.php (100%)
 rename htdocs/public/{ticketsup => ticket}/img/bg_ticket.png (100%)
 rename htdocs/public/{ticketsup => ticket}/index.php (100%)
 rename htdocs/public/{ticketsup => ticket}/list.php (100%)
 rename htdocs/public/{ticketsup => ticket}/view.php (100%)

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

From 05ed721a8c80a0121d860459ad6b5b2a94daa549 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 6 Jul 2018 13:09:07 +0200
Subject: [PATCH 08/10] Fix name of constant for module TICKET

---
 htdocs/admin/ticket.php                       | 154 +++++++++---------
 htdocs/core/class/html.formticket.class.php   |  10 +-
 htdocs/core/lib/ticket.lib.php                |   6 +-
 htdocs/core/modules/modTicket.class.php       |   2 +-
 ...erface_50_modTicket_TicketEmail.class.php} |  26 +--
 htdocs/public/ticket/create_ticket.php        |  26 +--
 htdocs/public/ticket/index.php                |   4 +-
 htdocs/public/ticket/list.php                 |   2 +-
 htdocs/public/ticket/view.php                 |   2 +-
 htdocs/ticket/card.php                        |   4 +-
 htdocs/ticket/class/actions_ticket.class.php  |  50 +++---
 htdocs/ticket/class/ticket.class.php          |  14 +-
 htdocs/ticket/contact.php                     |   2 +-
 htdocs/ticket/css/styles.css.php              |   2 +-
 htdocs/ticket/document.php                    |   2 +-
 htdocs/ticket/history.php                     |   4 +-
 htdocs/ticket/index.php                       |   4 +-
 htdocs/ticket/list.php                        |   2 +-
 18 files changed, 158 insertions(+), 158 deletions(-)
 rename htdocs/core/triggers/{interface_50_modTicketsup_TicketEmail.class.php => interface_50_modTicket_TicketEmail.class.php} (92%)

diff --git a/htdocs/admin/ticket.php b/htdocs/admin/ticket.php
index c6f5e49ff01..742f966e4cc 100644
--- a/htdocs/admin/ticket.php
+++ b/htdocs/admin/ticket.php
@@ -67,92 +67,92 @@ if ($action == 'updateMask') {
 } elseif ($action == 'setvar') {
     include_once DOL_DOCUMENT_ROOT . "/core/lib/files.lib.php";
 
-    $notification_email = GETPOST('TICKETS_NOTIFICATION_EMAIL_FROM', 'alpha');
+    $notification_email = GETPOST('TICKET_NOTIFICATION_EMAIL_FROM', 'alpha');
     if (!empty($notification_email)) {
-        $res = dolibarr_set_const($db, 'TICKETS_NOTIFICATION_EMAIL_FROM', $notification_email, 'chaine', 0, '', $conf->entity);
+        $res = dolibarr_set_const($db, 'TICKET_NOTIFICATION_EMAIL_FROM', $notification_email, 'chaine', 0, '', $conf->entity);
     } else {
-        $res = dolibarr_set_const($db, 'TICKETS_NOTIFICATION_EMAIL_FROM', '', 'chaine', 0, '', $conf->entity);
+        $res = dolibarr_set_const($db, 'TICKET_NOTIFICATION_EMAIL_FROM', '', 'chaine', 0, '', $conf->entity);
     }
     if (!$res > 0) {
         $error++;
     }
 
     // altairis : differentiate notification email FROM and TO
-    $notification_email_to = GETPOST('TICKETS_NOTIFICATION_EMAIL_TO', 'alpha');
+    $notification_email_to = GETPOST('TICKET_NOTIFICATION_EMAIL_TO', 'alpha');
     if (!empty($notification_email_to)) {
-        $res = dolibarr_set_const($db, 'TICKETS_NOTIFICATION_EMAIL_TO', $notification_email_to, 'chaine', 0, '', $conf->entity);
+        $res = dolibarr_set_const($db, 'TICKET_NOTIFICATION_EMAIL_TO', $notification_email_to, 'chaine', 0, '', $conf->entity);
     } else {
-        $res = dolibarr_set_const($db, 'TICKETS_NOTIFICATION_EMAIL_TO', '', 'chaine', 0, '', $conf->entity);
+        $res = dolibarr_set_const($db, 'TICKET_NOTIFICATION_EMAIL_TO', '', 'chaine', 0, '', $conf->entity);
     }
     if (!$res > 0) {
         $error++;
     }
 
-    $mail_new_ticket = GETPOST('TICKETS_MESSAGE_MAIL_NEW', 'alpha');
+    $mail_new_ticket = GETPOST('TICKET_MESSAGE_MAIL_NEW', 'alpha');
     if (!empty($mail_new_ticket)) {
-        $res = dolibarr_set_const($db, 'TICKETS_MESSAGE_MAIL_NEW', $mail_new_ticket, 'chaine', 0, '', $conf->entity);
+        $res = dolibarr_set_const($db, 'TICKET_MESSAGE_MAIL_NEW', $mail_new_ticket, 'chaine', 0, '', $conf->entity);
     } else {
-        $res = dolibarr_set_const($db, 'TICKETS_MESSAGE_MAIL_NEW', $langs->trans('TicketMessageMailNewText'), 'chaine', 0, '', $conf->entity);
+        $res = dolibarr_set_const($db, 'TICKET_MESSAGE_MAIL_NEW', $langs->trans('TicketMessageMailNewText'), 'chaine', 0, '', $conf->entity);
     }
     if (!$res > 0) {
         $error++;
     }
 
-    $mail_intro = GETPOST('TICKETS_MESSAGE_MAIL_INTRO', 'alpha');
+    $mail_intro = GETPOST('TICKET_MESSAGE_MAIL_INTRO', 'alpha');
     if (!empty($mail_intro)) {
-        $res = dolibarr_set_const($db, 'TICKETS_MESSAGE_MAIL_INTRO', $mail_intro, 'chaine', 0, '', $conf->entity);
+        $res = dolibarr_set_const($db, 'TICKET_MESSAGE_MAIL_INTRO', $mail_intro, 'chaine', 0, '', $conf->entity);
     } else {
-        $res = dolibarr_set_const($db, 'TICKETS_MESSAGE_MAIL_INTRO', $langs->trans('TicketMessageMailIntroText'), 'chaine', 0, '', $conf->entity);
+        $res = dolibarr_set_const($db, 'TICKET_MESSAGE_MAIL_INTRO', $langs->trans('TicketMessageMailIntroText'), 'chaine', 0, '', $conf->entity);
     }
     if (!$res > 0) {
         $error++;
     }
 
-    $mail_signature = GETPOST('TICKETS_MESSAGE_MAIL_SIGNATURE', 'alpha');
+    $mail_signature = GETPOST('TICKET_MESSAGE_MAIL_SIGNATURE', 'alpha');
     if (!empty($mail_signature)) {
-        $res = dolibarr_set_const($db, 'TICKETS_MESSAGE_MAIL_SIGNATURE', $mail_signature, 'chaine', 0, '', $conf->entity);
+        $res = dolibarr_set_const($db, 'TICKET_MESSAGE_MAIL_SIGNATURE', $mail_signature, 'chaine', 0, '', $conf->entity);
     } else {
-        $res = dolibarr_set_const($db, 'TICKETS_MESSAGE_MAIL_SIGNATURE', $langs->trans('TicketMessageMailSignatureText'), 'chaine', 0, '', $conf->entity);
+        $res = dolibarr_set_const($db, 'TICKET_MESSAGE_MAIL_SIGNATURE', $langs->trans('TicketMessageMailSignatureText'), 'chaine', 0, '', $conf->entity);
     }
     if (!$res > 0) {
         $error++;
     }
 
-    $url_interface = GETPOST('TICKETS_URL_PUBLIC_INTERFACE', 'alpha');
+    $url_interface = GETPOST('TICKET_URL_PUBLIC_INTERFACE', 'alpha');
     if (!empty($mail_signature)) {
-        $res = dolibarr_set_const($db, 'TICKETS_URL_PUBLIC_INTERFACE', $url_interface, 'chaine', 0, '', $conf->entity);
+        $res = dolibarr_set_const($db, 'TICKET_URL_PUBLIC_INTERFACE', $url_interface, 'chaine', 0, '', $conf->entity);
     } else {
-        $res = dolibarr_set_const($db, 'TICKETS_URL_PUBLIC_INTERFACE', '', 'chaine', 0, '', $conf->entity);
+        $res = dolibarr_set_const($db, 'TICKET_URL_PUBLIC_INTERFACE', '', 'chaine', 0, '', $conf->entity);
     }
     if (!$res > 0) {
         $error++;
     }
 
-    $topic_interface = GETPOST('TICKETS_PUBLIC_INTERFACE_TOPIC', 'alpha');
+    $topic_interface = GETPOST('TICKET_PUBLIC_INTERFACE_TOPIC', 'alpha');
     if (!empty($mail_signature)) {
-        $res = dolibarr_set_const($db, 'TICKETS_PUBLIC_INTERFACE_TOPIC', $topic_interface, 'chaine', 0, '', $conf->entity);
+        $res = dolibarr_set_const($db, 'TICKET_PUBLIC_INTERFACE_TOPIC', $topic_interface, 'chaine', 0, '', $conf->entity);
     } else {
-        $res = dolibarr_set_const($db, 'TICKETS_PUBLIC_INTERFACE_TOPIC', '', 'chaine', 0, '', $conf->entity);
+        $res = dolibarr_set_const($db, 'TICKET_PUBLIC_INTERFACE_TOPIC', '', 'chaine', 0, '', $conf->entity);
     }
     if (!$res > 0) {
         $error++;
     }
 
-    $text_home = GETPOST('TICKETS_PUBLIC_TEXT_HOME', 'alpha');
+    $text_home = GETPOST('TICKET_PUBLIC_TEXT_HOME', 'alpha');
     if (!empty($mail_signature)) {
-        $res = dolibarr_set_const($db, 'TICKETS_PUBLIC_TEXT_HOME', $text_home, 'chaine', 0, '', $conf->entity);
+        $res = dolibarr_set_const($db, 'TICKET_PUBLIC_TEXT_HOME', $text_home, 'chaine', 0, '', $conf->entity);
     } else {
-        $res = dolibarr_set_const($db, 'TICKETS_PUBLIC_TEXT_HOME', $langs->trans('TicketPublicInterfaceTextHome'), 'chaine', 0, '', $conf->entity);
+        $res = dolibarr_set_const($db, 'TICKET_PUBLIC_TEXT_HOME', $langs->trans('TicketPublicInterfaceTextHome'), 'chaine', 0, '', $conf->entity);
     }
     if (!$res > 0) {
         $error++;
     }
 
-    $text_help = GETPOST('TICKETS_PUBLIC_TEXT_HELP_MESSAGE', 'alpha');
+    $text_help = GETPOST('TICKET_PUBLIC_TEXT_HELP_MESSAGE', 'alpha');
     if (!empty($text_help)) {
-        $res = dolibarr_set_const($db, 'TICKETS_PUBLIC_TEXT_HELP_MESSAGE', $text_help, 'chaine', 0, '', $conf->entity);
+        $res = dolibarr_set_const($db, 'TICKET_PUBLIC_TEXT_HELP_MESSAGE', $text_help, 'chaine', 0, '', $conf->entity);
     } else {
-        $res = dolibarr_set_const($db, 'TICKETS_PUBLIC_TEXT_HELP_MESSAGE', $langs->trans('TicketPublicPleaseBeAccuratelyDescribe'), 'chaine', 0, '', $conf->entity);
+        $res = dolibarr_set_const($db, 'TICKET_PUBLIC_TEXT_HELP_MESSAGE', $langs->trans('TicketPublicPleaseBeAccuratelyDescribe'), 'chaine', 0, '', $conf->entity);
     }
     if (!$res > 0) {
         $error++;
@@ -160,34 +160,34 @@ if ($action == 'updateMask') {
 }
 
 if ($action == 'setvarother') {
-    $param_enable_public_interface = GETPOST('TICKETS_ENABLE_PUBLIC_INTERFACE', 'alpha');
-    $res = dolibarr_set_const($db, 'TICKETS_ENABLE_PUBLIC_INTERFACE', $param_enable_public_interface, 'chaine', 0, '', $conf->entity);
+    $param_enable_public_interface = GETPOST('TICKET_ENABLE_PUBLIC_INTERFACE', 'alpha');
+    $res = dolibarr_set_const($db, 'TICKET_ENABLE_PUBLIC_INTERFACE', $param_enable_public_interface, 'chaine', 0, '', $conf->entity);
     if (!$res > 0) {
         $error++;
     }
 
-    $param_must_exists = GETPOST('TICKETS_EMAIL_MUST_EXISTS', 'alpha');
-    $res = dolibarr_set_const($db, 'TICKETS_EMAIL_MUST_EXISTS', $param_must_exists, 'chaine', 0, '', $conf->entity);
+    $param_must_exists = GETPOST('TICKET_EMAIL_MUST_EXISTS', 'alpha');
+    $res = dolibarr_set_const($db, 'TICKET_EMAIL_MUST_EXISTS', $param_must_exists, 'chaine', 0, '', $conf->entity);
     if (!$res > 0) {
         $error++;
     }
 
-    $param_disable_email = GETPOST('TICKETS_DISABLE_ALL_MAILS', 'alpha');
-    $res = dolibarr_set_const($db, 'TICKETS_DISABLE_ALL_MAILS', $param_disable_email, 'chaine', 0, '', $conf->entity);
+    $param_disable_email = GETPOST('TICKET_DISABLE_ALL_MAILS', 'alpha');
+    $res = dolibarr_set_const($db, 'TICKET_DISABLE_ALL_MAILS', $param_disable_email, 'chaine', 0, '', $conf->entity);
     if (!$res > 0) {
         $error++;
     }
 
-    $param_activate_log_by_email = GETPOST('TICKETS_ACTIVATE_LOG_BY_EMAIL', 'alpha');
-    $res = dolibarr_set_const($db, 'TICKETS_ACTIVATE_LOG_BY_EMAIL', $param_activate_log_by_email, 'chaine', 0, '', $conf->entity);
+    $param_activate_log_by_email = GETPOST('TICKET_ACTIVATE_LOG_BY_EMAIL', 'alpha');
+    $res = dolibarr_set_const($db, 'TICKET_ACTIVATE_LOG_BY_EMAIL', $param_activate_log_by_email, 'chaine', 0, '', $conf->entity);
     if (!$res > 0) {
         $error++;
     }
 
     if ($conf->global->MAIN_FEATURES_LEVEL >= 2)
     {
-    	$param_show_module_logo = GETPOST('TICKETS_SHOW_MODULE_LOGO', 'alpha');
-    	$res = dolibarr_set_const($db, 'TICKETS_SHOW_MODULE_LOGO', $param_show_module_logo, 'chaine', 0, '', $conf->entity);
+    	$param_show_module_logo = GETPOST('TICKET_SHOW_MODULE_LOGO', 'alpha');
+    	$res = dolibarr_set_const($db, 'TICKET_SHOW_MODULE_LOGO', $param_show_module_logo, 'chaine', 0, '', $conf->entity);
     	if (!$res > 0) {
         	$error++;
     	}
@@ -195,21 +195,21 @@ if ($action == 'setvarother') {
 
     if ($conf->global->MAIN_FEATURES_LEVEL >= 2)
     {
-    	$param_notification_also_main_addressemail = GETPOST('TICKETS_NOTIFICATION_ALSO_MAIN_ADDRESS', 'alpha');
-	    $res = dolibarr_set_const($db, 'TICKETS_NOTIFICATION_ALSO_MAIN_ADDRESS', $param_notification_also_main_addressemail, 'chaine', 0, '', $conf->entity);
+    	$param_notification_also_main_addressemail = GETPOST('TICKET_NOTIFICATION_ALSO_MAIN_ADDRESS', 'alpha');
+	    $res = dolibarr_set_const($db, 'TICKET_NOTIFICATION_ALSO_MAIN_ADDRESS', $param_notification_also_main_addressemail, 'chaine', 0, '', $conf->entity);
 	    if (!$res > 0) {
 	        $error++;
 	    }
     }
 
-    $param_limit_view = GETPOST('TICKETS_LIMIT_VIEW_ASSIGNED_ONLY', 'alpha');
-    $res = dolibarr_set_const($db, 'TICKETS_LIMIT_VIEW_ASSIGNED_ONLY', $param_limit_view, 'chaine', 0, '', $conf->entity);
+    $param_limit_view = GETPOST('TICKET_LIMIT_VIEW_ASSIGNED_ONLY', 'alpha');
+    $res = dolibarr_set_const($db, 'TICKET_LIMIT_VIEW_ASSIGNED_ONLY', $param_limit_view, 'chaine', 0, '', $conf->entity);
     if (!$res > 0) {
         $error++;
     }
 
-    $param_auto_assign = GETPOST('TICKETS_AUTO_ASSIGN_USER_CREATE', 'alpha');
-    $res = dolibarr_set_const($db, 'TICKETS_AUTO_ASSIGN_USER_CREATE', $param_auto_assign, 'chaine', 0, '', $conf->entity);
+    $param_auto_assign = GETPOST('TICKET_AUTO_ASSIGN_USER_CREATE', 'alpha');
+    $res = dolibarr_set_const($db, 'TICKET_AUTO_ASSIGN_USER_CREATE', $param_auto_assign, 'chaine', 0, '', $conf->entity);
     if (!$res > 0) {
         $error++;
     }
@@ -358,10 +358,10 @@ print '<table class="noborder" width="100%">';
 print '<tr class="pair"><td width="70%">' . $langs->trans("TicketsActivatePublicInterface") . '</td>';
 print '<td align="left">';
 if ($conf->use_javascript_ajax) {
-    print ajax_constantonoff('TICKETS_ENABLE_PUBLIC_INTERFACE');
+    print ajax_constantonoff('TICKET_ENABLE_PUBLIC_INTERFACE');
 } else {
     $arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
-    print $form->selectarray("TICKETS_ENABLE_PUBLIC_INTERFACE", $arrval, $conf->global->TICKETS_ENABLE_PUBLIC_INTERFACE);
+    print $form->selectarray("TICKET_ENABLE_PUBLIC_INTERFACE", $arrval, $conf->global->TICKET_ENABLE_PUBLIC_INTERFACE);
 }
 print '</td>';
 print '<td align="center">';
@@ -373,10 +373,10 @@ print '</tr>';
 print '<tr class="pair"><td width="70%">' . $langs->trans("TicketsEmailMustExist") . '</td>';
 print '<td align="left">';
 if ($conf->use_javascript_ajax) {
-    print ajax_constantonoff('TICKETS_EMAIL_MUST_EXISTS');
+    print ajax_constantonoff('TICKET_EMAIL_MUST_EXISTS');
 } else {
     $arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
-    print $form->selectarray("TICKETS_EMAIL_MUST_EXISTS", $arrval, $conf->global->TICKETS_EMAIL_MUST_EXISTS);
+    print $form->selectarray("TICKET_EMAIL_MUST_EXISTS", $arrval, $conf->global->TICKET_EMAIL_MUST_EXISTS);
 }
 print '</td>';
 print '<td align="center">';
@@ -390,10 +390,10 @@ print '</tr>';
 	print '<tr class="pair"><td width="70%">' . $langs->trans("TicketsShowModuleLogo") . '</td>';
 	print '<td align="left">';
 	if ($conf->use_javascript_ajax) {
-	    print ajax_constantonoff('TICKETS_SHOW_MODULE_LOGO');
+	    print ajax_constantonoff('TICKET_SHOW_MODULE_LOGO');
 	} else {
 	    $arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
-	    print $form->selectarray("TICKETS_SHOW_MODULE_LOGO", $arrval, $conf->global->TICKETS_SHOW_MODULE_LOGO);
+	    print $form->selectarray("TICKET_SHOW_MODULE_LOGO", $arrval, $conf->global->TICKET_SHOW_MODULE_LOGO);
 	}
 	print '</td>';
 	print '<td align="center">';
@@ -406,10 +406,10 @@ print '</tr>';
 print '<tr class="pair"><td width="70%">' . $langs->trans("TicketsShowCompanyLogo") . '</td>';
 print '<td align="left">';
 if ($conf->use_javascript_ajax) {
-	print ajax_constantonoff('TICKETS_SHOW_COMPANY_LOGO');
+	print ajax_constantonoff('TICKET_SHOW_COMPANY_LOGO');
 } else {
 	$arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
-	print $form->selectarray("TICKETS_SHOW_COMPANY_LOGO", $arrval, $conf->global->TICKETS_SHOW_COMPANY_LOGO);
+	print $form->selectarray("TICKET_SHOW_COMPANY_LOGO", $arrval, $conf->global->TICKET_SHOW_COMPANY_LOGO);
 }
 print '</td>';
 print '<td align="center">';
@@ -426,10 +426,10 @@ print '<table class="noborder" width="100%">';
 print '<tr class="pair"><td width="70%">' . $langs->trans("TicketsDisableEmail") . '</td>';
 print '<td align="left">';
 if ($conf->use_javascript_ajax) {
-    print ajax_constantonoff('TICKETS_DISABLE_ALL_MAILS');
+    print ajax_constantonoff('TICKET_DISABLE_ALL_MAILS');
 } else {
     $arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
-    print $form->selectarray("TICKETS_DISABLE_ALL_MAILS", $arrval, $conf->global->TICKETS_DISABLE_ALL_MAILS);
+    print $form->selectarray("TICKET_DISABLE_ALL_MAILS", $arrval, $conf->global->TICKET_DISABLE_ALL_MAILS);
 }
 print '</td>';
 print '<td align="center">';
@@ -441,10 +441,10 @@ print '</tr>';
 print '<tr class="pair"><td width="70%">' . $langs->trans("TicketsLogEnableEmail") . '</td>';
 print '<td align="left">';
 if ($conf->use_javascript_ajax) {
-    print ajax_constantonoff('TICKETS_ACTIVATE_LOG_BY_EMAIL');
+    print ajax_constantonoff('TICKET_ACTIVATE_LOG_BY_EMAIL');
 } else {
     $arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
-    print $form->selectarray("TICKETS_ACTIVATE_LOG_BY_EMAIL", $arrval, $conf->global->TICKETS_ACTIVATE_LOG_BY_EMAIL);
+    print $form->selectarray("TICKET_ACTIVATE_LOG_BY_EMAIL", $arrval, $conf->global->TICKET_ACTIVATE_LOG_BY_EMAIL);
 }
 print '</td>';
 print '<td align="center">';
@@ -458,10 +458,10 @@ if ($conf->global->MAIN_FEATURES_LEVEL >= 2)
 	print '<tr class="pair"><td width="70%">' . $langs->trans("TicketsEmailAlsoSendToMainAddress") . '</td>';
 	print '<td align="left">';
 	if ($conf->use_javascript_ajax) {
-	    print ajax_constantonoff('TICKETS_NOTIFICATION_ALSO_MAIN_ADDRESS');
+	    print ajax_constantonoff('TICKET_NOTIFICATION_ALSO_MAIN_ADDRESS');
 	} else {
 	    $arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
-	    print $form->selectarray("TICKETS_NOTIFICATION_ALSO_MAIN_ADDRESS", $arrval, $conf->global->TICKETS_NOTIFICATION_ALSO_MAIN_ADDRESS);
+	    print $form->selectarray("TICKET_NOTIFICATION_ALSO_MAIN_ADDRESS", $arrval, $conf->global->TICKET_NOTIFICATION_ALSO_MAIN_ADDRESS);
 	}
 	print '</td>';
 	print '<td align="center">';
@@ -474,10 +474,10 @@ if ($conf->global->MAIN_FEATURES_LEVEL >= 2)
 print '<tr class="pair"><td width="70%">' . $langs->trans("TicketsLimitViewAssignedOnly") . '</td>';
 print '<td align="left">';
 if ($conf->use_javascript_ajax) {
-    print ajax_constantonoff('TICKETS_LIMIT_VIEW_ASSIGNED_ONLY');
+    print ajax_constantonoff('TICKET_LIMIT_VIEW_ASSIGNED_ONLY');
 } else {
     $arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
-    print $form->selectarray("TICKETS_LIMIT_VIEW_ASSIGNED_ONLY", $arrval, $conf->global->TICKETS_LIMIT_VIEW_ASSIGNED_ONLY);
+    print $form->selectarray("TICKET_LIMIT_VIEW_ASSIGNED_ONLY", $arrval, $conf->global->TICKET_LIMIT_VIEW_ASSIGNED_ONLY);
 }
 print '</td>';
 print '<td align="center">';
@@ -494,10 +494,10 @@ if (!$conf->use_javascript_ajax) {
 print '<tr class="pair"><td width="70%">' . $langs->trans("TicketsAutoAssignTicket") . '</td>';
 print '<td align="left">';
 if ($conf->use_javascript_ajax) {
-    print ajax_constantonoff('TICKETS_AUTO_ASSIGN_USER_CREATE');
+    print ajax_constantonoff('TICKET_AUTO_ASSIGN_USER_CREATE');
 } else {
     $arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
-    print $form->selectarray("TICKETS_AUTO_ASSIGN_USER_CREATE", $arrval, $conf->global->TICKETS_AUTO_ASSIGN_USER_CREATE);
+    print $form->selectarray("TICKET_AUTO_ASSIGN_USER_CREATE", $arrval, $conf->global->TICKET_AUTO_ASSIGN_USER_CREATE);
 }
 print '</td>';
 print '<td align="center">';
@@ -533,7 +533,7 @@ if (empty($conf->global->FCKEDITOR_ENABLE_MAIL)) {
 // Email d'envoi des notifications
 print '<tr class="pair"><td>' . $langs->trans("TicketEmailNotificationFrom") . '</td>';
 print '<td align="left">';
-print '<input type="text" name="TICKETS_NOTIFICATION_EMAIL_FROM" value="' . $conf->global->TICKETS_NOTIFICATION_EMAIL_FROM . '" size="20" ></td>';
+print '<input type="text" name="TICKET_NOTIFICATION_EMAIL_FROM" value="' . $conf->global->TICKET_NOTIFICATION_EMAIL_FROM . '" size="20" ></td>';
 print '<td align="center">';
 print $form->textwithpicto('', $langs->trans("TicketEmailNotificationFromHelp"), 1, 'help');
 print '</td>';
@@ -542,18 +542,18 @@ print '</tr>';
 // Email de réception des notifications
 print '<tr class="pair"><td>' . $langs->trans("TicketEmailNotificationTo") . '</td>';
 print '<td align="left">';
-print '<input type="text"   name="TICKETS_NOTIFICATION_EMAIL_TO" value="' . (!empty($conf->global->TICKETS_NOTIFICATION_EMAIL_TO) ? $conf->global->TICKETS_NOTIFICATION_EMAIL_TO : $conf->global->TICKETS_NOTIFICATION_EMAIL_FROM) . '" size="20" ></td>';
+print '<input type="text"   name="TICKET_NOTIFICATION_EMAIL_TO" value="' . (!empty($conf->global->TICKET_NOTIFICATION_EMAIL_TO) ? $conf->global->TICKET_NOTIFICATION_EMAIL_TO : $conf->global->TICKET_NOTIFICATION_EMAIL_FROM) . '" size="20" ></td>';
 print '<td align="center">';
 print $form->textwithpicto('', $langs->trans("TicketEmailNotificationToHelp"), 1, 'help');
 print '</td>';
 print '</tr>';
 
 // Texte de création d'un ticket
-$mail_mesg_new = $conf->global->TICKETS_MESSAGE_MAIL_NEW ? $conf->global->TICKETS_MESSAGE_MAIL_NEW : $langs->trans('TicketNewEmailBody');
+$mail_mesg_new = $conf->global->TICKET_MESSAGE_MAIL_NEW ? $conf->global->TICKET_MESSAGE_MAIL_NEW : $langs->trans('TicketNewEmailBody');
 print '<tr><td>' . $langs->trans("TicketNewEmailBodyLabel") . '</label>';
 print '</td><td>';
 require_once DOL_DOCUMENT_ROOT . '/core/class/doleditor.class.php';
-$doleditor = new DolEditor('TICKETS_MESSAGE_MAIL_NEW', $mail_mesg_new, '100%', 120, 'dolibarr_mailings', '', false, true, $conf->global->FCKEDITOR_ENABLE_MAIL, ROWS_2, 70);
+$doleditor = new DolEditor('TICKET_MESSAGE_MAIL_NEW', $mail_mesg_new, '100%', 120, 'dolibarr_mailings', '', false, true, $conf->global->FCKEDITOR_ENABLE_MAIL, ROWS_2, 70);
 $doleditor->Create();
 print '</td>';
 print '<td align="center">';
@@ -561,11 +561,11 @@ print $form->textwithpicto('', $langs->trans("TicketNewEmailBodyHelp"), 1, 'help
 print '</td></tr>';
 
 // Texte d'introduction
-$mail_intro = $conf->global->TICKETS_MESSAGE_MAIL_INTRO ? $conf->global->TICKETS_MESSAGE_MAIL_INTRO : $langs->trans('TicketMessageMailIntroText');
+$mail_intro = $conf->global->TICKET_MESSAGE_MAIL_INTRO ? $conf->global->TICKET_MESSAGE_MAIL_INTRO : $langs->trans('TicketMessageMailIntroText');
 print '<tr><td>' . $langs->trans("TicketMessageMailIntroLabelAdmin") . '</label>';
 print '</td><td>';
 require_once DOL_DOCUMENT_ROOT . '/core/class/doleditor.class.php';
-$doleditor = new DolEditor('TICKETS_MESSAGE_MAIL_INTRO', $mail_intro, '100%', 120, 'dolibarr_mailings', '', false, true, $conf->global->FCKEDITOR_ENABLE_MAIL, ROWS_2, 70);
+$doleditor = new DolEditor('TICKET_MESSAGE_MAIL_INTRO', $mail_intro, '100%', 120, 'dolibarr_mailings', '', false, true, $conf->global->FCKEDITOR_ENABLE_MAIL, ROWS_2, 70);
 $doleditor->Create();
 print '</td>';
 print '<td align="center">';
@@ -573,11 +573,11 @@ print $form->textwithpicto('', $langs->trans("TicketMessageMailIntroHelpAdmin"),
 print '</td></tr>';
 
 // Texte de signature
-$mail_signature = $conf->global->TICKETS_MESSAGE_MAIL_SIGNATURE ? $conf->global->TICKETS_MESSAGE_MAIL_SIGNATURE : $langs->trans('TicketMessageMailSignatureText');
+$mail_signature = $conf->global->TICKET_MESSAGE_MAIL_SIGNATURE ? $conf->global->TICKET_MESSAGE_MAIL_SIGNATURE : $langs->trans('TicketMessageMailSignatureText');
 print '<tr><td>' . $langs->trans("TicketMessageMailSignatureLabelAdmin") . '</label>';
 print '</td><td>';
 require_once DOL_DOCUMENT_ROOT . '/core/class/doleditor.class.php';
-$doleditor = new DolEditor('TICKETS_MESSAGE_MAIL_SIGNATURE', $mail_signature, '100%', 120, 'dolibarr_mailings', '', false, true, $conf->global->FCKEDITOR_ENABLE_MAIL, ROWS_2, 70);
+$doleditor = new DolEditor('TICKET_MESSAGE_MAIL_SIGNATURE', $mail_signature, '100%', 120, 'dolibarr_mailings', '', false, true, $conf->global->FCKEDITOR_ENABLE_MAIL, ROWS_2, 70);
 $doleditor->Create();
 print '</td>';
 print '<td align="center">';
@@ -589,31 +589,31 @@ print '<td colspan="3">' . $langs->trans("PublicInterface") . '</td>';
 print "</tr>\n";
 
 // Url public interface
-$url_interface = $conf->global->TICKETS_URL_PUBLIC_INTERFACE;
+$url_interface = $conf->global->TICKET_URL_PUBLIC_INTERFACE;
 print '<tr><td>' . $langs->trans("TicketUrlPublicInterfaceLabelAdmin") . '</label>';
 print '</td><td>';
-print '<input type="text" name="TICKETS_URL_PUBLIC_INTERFACE" value="' . $conf->global->TICKETS_URL_PUBLIC_INTERFACE . '" size="40" ></td>';
+print '<input type="text" name="TICKET_URL_PUBLIC_INTERFACE" value="' . $conf->global->TICKET_URL_PUBLIC_INTERFACE . '" size="40" ></td>';
 print '</td>';
 print '<td align="center">';
 print $form->textwithpicto('', $langs->trans("TicketUrlPublicInterfaceHelpAdmin"), 1, 'help');
 print '</td></tr>';
 
 // Interface topic
-$url_interface = $conf->global->TICKETS_PUBLIC_INTERFACE_TOPIC;
+$url_interface = $conf->global->TICKET_PUBLIC_INTERFACE_TOPIC;
 print '<tr><td>' . $langs->trans("TicketPublicInterfaceTopicLabelAdmin") . '</label>';
 print '</td><td>';
-print '<input type="text"   name="TICKETS_PUBLIC_INTERFACE_TOPIC" value="' . $conf->global->TICKETS_PUBLIC_INTERFACE_TOPIC . '" size="40" ></td>';
+print '<input type="text"   name="TICKET_PUBLIC_INTERFACE_TOPIC" value="' . $conf->global->TICKET_PUBLIC_INTERFACE_TOPIC . '" size="40" ></td>';
 print '</td>';
 print '<td align="center">';
 print $form->textwithpicto('', $langs->trans("TicketPublicInterfaceTopicHelp"), 1, 'help');
 print '</td></tr>';
 
 // Texte d'accueil homepage
-$public_text_home = $conf->global->TICKETS_PUBLIC_TEXT_HOME ? $conf->global->TICKETS_PUBLIC_TEXT_HOME : $langs->trans('TicketPublicInterfaceTextHome');
+$public_text_home = $conf->global->TICKET_PUBLIC_TEXT_HOME ? $conf->global->TICKET_PUBLIC_TEXT_HOME : $langs->trans('TicketPublicInterfaceTextHome');
 print '<tr><td>' . $langs->trans("TicketPublicInterfaceTextHomeLabelAdmin") . '</label>';
 print '</td><td>';
 require_once DOL_DOCUMENT_ROOT . '/core/class/doleditor.class.php';
-$doleditor = new DolEditor('TICKETS_PUBLIC_TEXT_HOME', $public_text_home, '100%', 180, 'dolibarr_notes', '', false, true, $conf->global->FCKEDITOR_ENABLE_SOCIETE, ROWS_2, 70);
+$doleditor = new DolEditor('TICKET_PUBLIC_TEXT_HOME', $public_text_home, '100%', 180, 'dolibarr_notes', '', false, true, $conf->global->FCKEDITOR_ENABLE_SOCIETE, ROWS_2, 70);
 $doleditor->Create();
 print '</td>';
 print '<td align="center">';
@@ -621,11 +621,11 @@ print $form->textwithpicto('', $langs->trans("TicketPublicInterfaceTextHomeHelpA
 print '</td></tr>';
 
 // Texte d'aide à la saisie du message
-$public_text_help_message = $conf->global->TICKETS_PUBLIC_TEXT_HELP_MESSAGE ? $conf->global->TICKETS_PUBLIC_TEXT_HELP_MESSAGE : $langs->trans('TicketPublicPleaseBeAccuratelyDescribe');
+$public_text_help_message = $conf->global->TICKET_PUBLIC_TEXT_HELP_MESSAGE ? $conf->global->TICKET_PUBLIC_TEXT_HELP_MESSAGE : $langs->trans('TicketPublicPleaseBeAccuratelyDescribe');
 print '<tr><td>' . $langs->trans("TicketPublicInterfaceTextHelpMessageLabelAdmin") . '</label>';
 print '</td><td>';
 require_once DOL_DOCUMENT_ROOT . '/core/class/doleditor.class.php';
-$doleditor = new DolEditor('TICKETS_PUBLIC_TEXT_HELP_MESSAGE', $public_text_help_message, '100%', 180, 'dolibarr_notes', '', false, true, $conf->global->FCKEDITOR_ENABLE_SOCIETE, ROWS_2, 70);
+$doleditor = new DolEditor('TICKET_PUBLIC_TEXT_HELP_MESSAGE', $public_text_help_message, '100%', 180, 'dolibarr_notes', '', false, true, $conf->global->FCKEDITOR_ENABLE_SOCIETE, ROWS_2, 70);
 $doleditor->Create();
 print '</td>';
 print '<td align="center">';
diff --git a/htdocs/core/class/html.formticket.class.php b/htdocs/core/class/html.formticket.class.php
index de08557890f..1fcc865c05a 100644
--- a/htdocs/core/class/html.formticket.class.php
+++ b/htdocs/core/class/html.formticket.class.php
@@ -327,7 +327,7 @@ class FormTicket
 
         // If public form, display more information
         if ($this->ispublic) {
-            print '<div class="warning">' . ($conf->global->TICKETS_PUBLIC_TEXT_HELP_MESSAGE ? $conf->global->TICKETS_PUBLIC_TEXT_HELP_MESSAGE : $langs->trans('TicketPublicPleaseBeAccuratelyDescribe')) . '</div>';
+            print '<div class="warning">' . ($conf->global->TICKET_PUBLIC_TEXT_HELP_MESSAGE ? $conf->global->TICKET_PUBLIC_TEXT_HELP_MESSAGE : $langs->trans('TicketPublicPleaseBeAccuratelyDescribe')) . '</div>';
         }
         include_once DOL_DOCUMENT_ROOT . '/core/class/doleditor.class.php';
         $uselocalbrowser = true;
@@ -889,8 +889,8 @@ class FormTicket
                     }
                 }
 
-                if ($conf->global->TICKETS_NOTIFICATION_ALSO_MAIN_ADDRESS) {
-                    $sendto[] = $conf->global->TICKETS_NOTIFICATION_EMAIL_TO . '(generic email)';
+                if ($conf->global->TICKET_NOTIFICATION_ALSO_MAIN_ADDRESS) {
+                    $sendto[] = $conf->global->TICKET_NOTIFICATION_EMAIL_TO . '(generic email)';
                 }
 
                 // Print recipient list
@@ -906,7 +906,7 @@ class FormTicket
         // Intro
         // External users can't send message email
         if ($user->rights->ticket->write && !$user->socid) {
-            $mail_intro = GETPOST('mail_intro') ? GETPOST('mail_intro') : $conf->global->TICKETS_MESSAGE_MAIL_INTRO;
+            $mail_intro = GETPOST('mail_intro') ? GETPOST('mail_intro') : $conf->global->TICKET_MESSAGE_MAIL_INTRO;
             print '<tr class="email_line"><td><label for="mail_intro">' . $langs->trans("TicketMessageMailIntro") . '</label>';
 
             print '</td><td>';
@@ -957,7 +957,7 @@ class FormTicket
         // Signature
         // External users can't send message email
         if ($user->rights->ticket->write && !$user->socid) {
-            $mail_signature = GETPOST('mail_signature') ? GETPOST('mail_signature') : $conf->global->TICKETS_MESSAGE_MAIL_SIGNATURE;
+            $mail_signature = GETPOST('mail_signature') ? GETPOST('mail_signature') : $conf->global->TICKET_MESSAGE_MAIL_SIGNATURE;
             print '<tr class="email_line"><td><label for="mail_intro">' . $langs->trans("TicketMessageMailSignature") . '</label>';
 
             print '</td><td>';
diff --git a/htdocs/core/lib/ticket.lib.php b/htdocs/core/lib/ticket.lib.php
index 8f54197113e..7fac65ab42b 100644
--- a/htdocs/core/lib/ticket.lib.php
+++ b/htdocs/core/lib/ticket.lib.php
@@ -150,7 +150,7 @@ function llxHeaderTicket($title, $head = "", $disablejs = 0, $disablehead = 0, $
     top_htmlhead($head, $title, $disablejs, $disablehead, $arrayofjs, $arrayofcss); // Show html headers
     print '<body id="mainbody" class="publicnewticketform" style="margin-top: 10px;">';
 
-    if (! empty($conf->global->TICKETS_SHOW_COMPANY_LOGO)) {
+    if (! empty($conf->global->TICKET_SHOW_COMPANY_LOGO)) {
     	// Print logo
     	$urllogo = DOL_URL_ROOT . '/theme/login_logo.png';
 
@@ -163,8 +163,8 @@ function llxHeaderTicket($title, $head = "", $disablejs = 0, $disablehead = 0, $
     		$urllogo = DOL_URL_ROOT . '/theme/dolibarr_logo.png';
     	}
     	print '<center>';
-    	print '<a href="' . ($conf->global->TICKETS_URL_PUBLIC_INTERFACE ? $conf->global->TICKETS_URL_PUBLIC_INTERFACE : dol_buildpath('/public/ticket/index.php', 1)) . '"><img alt="Logo" id="logosubscribe" title="" src="' . $urllogo . '" style="max-width: 440px" /></a><br>';
-    	print '<strong>' . ($conf->global->TICKETS_PUBLIC_INTERFACE_TOPIC ? $conf->global->TICKETS_PUBLIC_INTERFACE_TOPIC : $langs->trans("TicketSystem")) . '</strong>';
+    	print '<a href="' . ($conf->global->TICKET_URL_PUBLIC_INTERFACE ? $conf->global->TICKET_URL_PUBLIC_INTERFACE : dol_buildpath('/public/ticket/index.php', 1)) . '"><img alt="Logo" id="logosubscribe" title="" src="' . $urllogo . '" style="max-width: 440px" /></a><br>';
+    	print '<strong>' . ($conf->global->TICKET_PUBLIC_INTERFACE_TOPIC ? $conf->global->TICKET_PUBLIC_INTERFACE_TOPIC : $langs->trans("TicketSystem")) . '</strong>';
     	print '</center><br>';
     }
 
diff --git a/htdocs/core/modules/modTicket.class.php b/htdocs/core/modules/modTicket.class.php
index 9cf2c097e3b..01c10a631ca 100644
--- a/htdocs/core/modules/modTicket.class.php
+++ b/htdocs/core/modules/modTicket.class.php
@@ -107,7 +107,7 @@ class modTicket extends DolibarrModules
         // (key, 'chaine', value, desc, visible, 'current' or 'allentities', deleteonunactive)
         // Example:
         $this->const = array();
-        $this->const[1] = array('TICKETS_ENABLE_PUBLIC_INTERFACE', 'chaine', '1', 'Enable ticket public interface');
+        $this->const[1] = array('TICKET_ENABLE_PUBLIC_INTERFACE', 'chaine', '1', 'Enable ticket public interface');
         $this->const[2] = array('TICKET_ADDON', 'chaine', 'mod_ticket_simple', 'Ticket ref module');
 
         $this->tabs = array(
diff --git a/htdocs/core/triggers/interface_50_modTicketsup_TicketEmail.class.php b/htdocs/core/triggers/interface_50_modTicket_TicketEmail.class.php
similarity index 92%
rename from htdocs/core/triggers/interface_50_modTicketsup_TicketEmail.class.php
rename to htdocs/core/triggers/interface_50_modTicket_TicketEmail.class.php
index 5c0d2636296..56bbd897f3d 100644
--- a/htdocs/core/triggers/interface_50_modTicketsup_TicketEmail.class.php
+++ b/htdocs/core/triggers/interface_50_modTicket_TicketEmail.class.php
@@ -116,7 +116,7 @@ class InterfaceTicketEmail extends DolibarrTriggers
 	                $res = $userstat->fetch($object->fk_user_assign);
 	                if ($res > 0)
 	                {
-	                	if (empty($conf->global->TICKETS_DISABLE_ALL_MAILS))
+	                	if (empty($conf->global->TICKET_DISABLE_ALL_MAILS))
 	                	{
 	                		// Init to avoid errors
 	                		$filepath = array();
@@ -146,7 +146,7 @@ class InterfaceTicketEmail extends DolibarrTriggers
 
 	                        $message = dol_nl2br($message);
 
-	                        if (!empty($conf->global->TICKETS_DISABLE_MAIL_AUTOCOPY_TO)) {
+	                        if (!empty($conf->global->TICKET_DISABLE_MAIL_AUTOCOPY_TO)) {
 	                            $old_MAIN_MAIL_AUTOCOPY_TO = $conf->global->MAIN_MAIL_AUTOCOPY_TO;
 	                            $conf->global->MAIN_MAIL_AUTOCOPY_TO = '';
 	                        }
@@ -157,7 +157,7 @@ class InterfaceTicketEmail extends DolibarrTriggers
 		                    } else {
 		                        $result = $mailfile->sendfile();
 		                    }
-	                        if (!empty($conf->global->TICKETS_DISABLE_MAIL_AUTOCOPY_TO)) {
+	                        if (!empty($conf->global->TICKET_DISABLE_MAIL_AUTOCOPY_TO)) {
 	                            $conf->global->MAIN_MAIL_AUTOCOPY_TO = $old_MAIN_MAIL_AUTOCOPY_TO;
 	                        }
 	                	}
@@ -182,9 +182,9 @@ class InterfaceTicketEmail extends DolibarrTriggers
 
 	            // Send email to notification email
 
-	            if (empty($conf->global->TICKETS_DISABLE_ALL_MAILS) && empty($object->context['disableticketemail']))
+	            if (empty($conf->global->TICKET_DISABLE_ALL_MAILS) && empty($object->context['disableticketemail']))
 	            {
-		            $sendto = $conf->global->TICKETS_NOTIFICATION_EMAIL_TO;
+		            $sendto = $conf->global->TICKET_NOTIFICATION_EMAIL_TO;
 
 		            if ($sendto)
 					{
@@ -217,12 +217,12 @@ class InterfaceTicketEmail extends DolibarrTriggers
 			            $message_admin.='<p>'.$langs->trans('Message').' : <br>'.$object->message.'</p>';
 			            $message_admin.='<p><a href="'.dol_buildpath('/ticket/card.php', 2).'?track_id='.$object->track_id.'">'.$langs->trans('SeeThisTicketIntomanagementInterface').'</a></p>';
 
-			            $from = $conf->global->MAIN_INFO_SOCIETE_NOM.'<'.$conf->global->TICKETS_NOTIFICATION_EMAIL_FROM.'>';
+			            $from = $conf->global->MAIN_INFO_SOCIETE_NOM.'<'.$conf->global->TICKET_NOTIFICATION_EMAIL_FROM.'>';
 			            $replyto = $from;
 
 		                $message_admin = dol_nl2br($message_admin);
 
-		                if (!empty($conf->global->TICKETS_DISABLE_MAIL_AUTOCOPY_TO)) {
+		                if (!empty($conf->global->TICKET_DISABLE_MAIL_AUTOCOPY_TO)) {
 		                    $old_MAIN_MAIL_AUTOCOPY_TO = $conf->global->MAIN_MAIL_AUTOCOPY_TO;
 		                    $conf->global->MAIN_MAIL_AUTOCOPY_TO = '';
 		                }
@@ -233,7 +233,7 @@ class InterfaceTicketEmail extends DolibarrTriggers
 			            } else {
 			                     $result=$mailfile->sendfile();
 			            }
-		                if (!empty($conf->global->TICKETS_DISABLE_MAIL_AUTOCOPY_TO)) {
+		                if (!empty($conf->global->TICKET_DISABLE_MAIL_AUTOCOPY_TO)) {
 		                    $conf->global->MAIN_MAIL_AUTOCOPY_TO = $old_MAIN_MAIL_AUTOCOPY_TO;
 		                }
 					}
@@ -241,7 +241,7 @@ class InterfaceTicketEmail extends DolibarrTriggers
 
 				// Send email to customer
 
-				if (empty($conf->global->TICKETS_DISABLE_ALL_MAILS) && empty($object->context['disableticketemail']) && $object->notify_tiers_at_create)
+				if (empty($conf->global->TICKET_DISABLE_ALL_MAILS) && empty($object->context['disableticketemail']) && $object->notify_tiers_at_create)
 	            {
 		            $sendto = '';
 		            if (empty($user->socid) && empty($user->email)) {
@@ -287,16 +287,16 @@ class InterfaceTicketEmail extends DolibarrTriggers
 
 			            $message_customer.='</ul>';
 			            $message_customer.='<p>'.$langs->trans('Message').' : <br>'.$object->message.'</p>';
-			            $url_public_ticket = ($conf->global->TICKETS_URL_PUBLIC_INTERFACE?$conf->global->TICKETS_URL_PUBLIC_INTERFACE.'/':dol_buildpath('/public/ticket/view.php', 2)).'?track_id='.$object->track_id;
+			            $url_public_ticket = ($conf->global->TICKET_URL_PUBLIC_INTERFACE?$conf->global->TICKET_URL_PUBLIC_INTERFACE.'/':dol_buildpath('/public/ticket/view.php', 2)).'?track_id='.$object->track_id;
 			            $message_customer.='<p>' . $langs->trans('TicketNewEmailBodyInfosTrackUrlCustomer') . ' : <a href="'.$url_public_ticket.'">'.$url_public_ticket.'</a></p>';
 			            $message_customer.='<p>'.$langs->trans('TicketEmailPleaseDoNotReplyToThisEmail').'</p>';
 
-			            $from = $conf->global->MAIN_INFO_SOCIETE_NOM.'<'.$conf->global->TICKETS_NOTIFICATION_EMAIL_FROM.'>';
+			            $from = $conf->global->MAIN_INFO_SOCIETE_NOM.'<'.$conf->global->TICKET_NOTIFICATION_EMAIL_FROM.'>';
 			            $replyto = $from;
 
 	                    $message_customer = dol_nl2br($message_customer);
 
-	                    if (!empty($conf->global->TICKETS_DISABLE_MAIL_AUTOCOPY_TO)) {
+	                    if (!empty($conf->global->TICKET_DISABLE_MAIL_AUTOCOPY_TO)) {
 	                        $old_MAIN_MAIL_AUTOCOPY_TO = $conf->global->MAIN_MAIL_AUTOCOPY_TO;
 	                        $conf->global->MAIN_MAIL_AUTOCOPY_TO = '';
 	                    }
@@ -307,7 +307,7 @@ class InterfaceTicketEmail extends DolibarrTriggers
 			            } else {
 			                      $result=$mailfile->sendfile();
 			            }
-	                    if (!empty($conf->global->TICKETS_DISABLE_MAIL_AUTOCOPY_TO)) {
+	                    if (!empty($conf->global->TICKET_DISABLE_MAIL_AUTOCOPY_TO)) {
 	                        $conf->global->MAIN_MAIL_AUTOCOPY_TO = $old_MAIN_MAIL_AUTOCOPY_TO;
 	                    }
 	                }
diff --git a/htdocs/public/ticket/create_ticket.php b/htdocs/public/ticket/create_ticket.php
index 0cd27ff0e73..066471fddff 100644
--- a/htdocs/public/ticket/create_ticket.php
+++ b/htdocs/public/ticket/create_ticket.php
@@ -102,7 +102,7 @@ if ($action == 'create_ticket' && GETPOST('add_ticket')) {
         $contacts = $object->searchContactByEmail($origin_email);
 
         // Option to require email exists to create ticket
-        if (!empty($conf->global->TICKETS_EMAIL_MUST_EXISTS) && !$contacts[0]->socid) {
+        if (!empty($conf->global->TICKET_EMAIL_MUST_EXISTS) && !$contacts[0]->socid) {
             $error++;
             array_push($object->errors, $langs->trans("ErrorEmailMustExistToCreateTicket"));
             $action = '';
@@ -203,24 +203,24 @@ if ($action == 'create_ticket' && GETPOST('add_ticket')) {
                 // Send email to customer
 
                 $subject = '[' . $conf->global->MAIN_INFO_SOCIETE_NOM . '] ' . $langs->transnoentities('TicketNewEmailSubject');
-                $message .= ($conf->global->TICKETS_MESSAGE_MAIL_NEW ? $conf->global->TICKETS_MESSAGE_MAIL_NEW : $langs->transnoentities('TicketNewEmailBody')) . "\n\n";
+                $message .= ($conf->global->TICKET_MESSAGE_MAIL_NEW ? $conf->global->TICKET_MESSAGE_MAIL_NEW : $langs->transnoentities('TicketNewEmailBody')) . "\n\n";
                 $message .= $langs->transnoentities('TicketNewEmailBodyInfosTicket') . "\n";
 
-                $url_public_ticket = ($conf->global->TICKETS_URL_PUBLIC_INTERFACE ? $conf->global->TICKETS_URL_PUBLIC_INTERFACE . '/' : dol_buildpath('/public/ticket/view.php', 2)) . '?track_id=' . $object->track_id;
+                $url_public_ticket = ($conf->global->TICKET_URL_PUBLIC_INTERFACE ? $conf->global->TICKET_URL_PUBLIC_INTERFACE . '/' : dol_buildpath('/public/ticket/view.php', 2)) . '?track_id=' . $object->track_id;
                 $infos_new_ticket = $langs->transnoentities('TicketNewEmailBodyInfosTrackId', '<a href="' . $url_public_ticket . '">' . $object->track_id . '</a>') . "\n";
                 $infos_new_ticket .= $langs->transnoentities('TicketNewEmailBodyInfosTrackUrl') . "\n\n";
 
                 $message .= dol_nl2br($infos_new_ticket);
-                $message .= $conf->global->TICKETS_MESSAGE_MAIL_SIGNATURE ? $conf->global->TICKETS_MESSAGE_MAIL_SIGNATURE : $langs->transnoentities('TicketMessageMailSignatureText');
+                $message .= $conf->global->TICKET_MESSAGE_MAIL_SIGNATURE ? $conf->global->TICKET_MESSAGE_MAIL_SIGNATURE : $langs->transnoentities('TicketMessageMailSignatureText');
 
                 $sendto = GETPOST('email','alpha');
 
-                $from = $conf->global->MAIN_INFO_SOCIETE_NOM . '<' . $conf->global->TICKETS_NOTIFICATION_EMAIL_FROM . '>';
+                $from = $conf->global->MAIN_INFO_SOCIETE_NOM . '<' . $conf->global->TICKET_NOTIFICATION_EMAIL_FROM . '>';
                 $replyto = $from;
 
                 $message = dol_nl2br($message);
 
-                if (!empty($conf->global->TICKETS_DISABLE_MAIL_AUTOCOPY_TO)) {
+                if (!empty($conf->global->TICKET_DISABLE_MAIL_AUTOCOPY_TO)) {
                     $old_MAIN_MAIL_AUTOCOPY_TO = $conf->global->MAIN_MAIL_AUTOCOPY_TO;
                     $conf->global->MAIN_MAIL_AUTOCOPY_TO = '';
                 }
@@ -231,14 +231,14 @@ if ($action == 'create_ticket' && GETPOST('add_ticket')) {
                 } else {
                     $result = $mailfile->sendfile();
                 }
-                if (!empty($conf->global->TICKETS_DISABLE_MAIL_AUTOCOPY_TO)) {
+                if (!empty($conf->global->TICKET_DISABLE_MAIL_AUTOCOPY_TO)) {
                     $conf->global->MAIN_MAIL_AUTOCOPY_TO = $old_MAIN_MAIL_AUTOCOPY_TO;
                 }
 
 
-                // Send email to TICKETS_NOTIFICATION_EMAIL_TO
+                // Send email to TICKET_NOTIFICATION_EMAIL_TO
 
-                $sendto = $conf->global->TICKETS_NOTIFICATION_EMAIL_TO;
+                $sendto = $conf->global->TICKET_NOTIFICATION_EMAIL_TO;
 
                 if ($sendto)
                 {
@@ -276,12 +276,12 @@ if ($action == 'create_ticket' && GETPOST('add_ticket')) {
 	                $message_admin .= '<p>' . $langs->trans('Message') . ' : <br>' . $object->message . '</p>';
 	                $message_admin .= '<p><a href="' . dol_buildpath('/ticket/card.php', 2) . '?track_id=' . $object->track_id . '">' . $langs->trans('SeeThisTicketIntomanagementInterface') . '</a></p>';
 
-	                $from = $conf->global->MAIN_INFO_SOCIETE_NOM . '<' . $conf->global->TICKETS_NOTIFICATION_EMAIL_FROM . '>';
+	                $from = $conf->global->MAIN_INFO_SOCIETE_NOM . '<' . $conf->global->TICKET_NOTIFICATION_EMAIL_FROM . '>';
 	                $replyto = $from;
 
 	                $message_admin = dol_nl2br($message_admin);
 
-	                if (!empty($conf->global->TICKETS_DISABLE_MAIL_AUTOCOPY_TO)) {
+	                if (!empty($conf->global->TICKET_DISABLE_MAIL_AUTOCOPY_TO)) {
 	                    $old_MAIN_MAIL_AUTOCOPY_TO = $conf->global->MAIN_MAIL_AUTOCOPY_TO;
 	                    $conf->global->MAIN_MAIL_AUTOCOPY_TO = '';
 	                }
@@ -292,7 +292,7 @@ if ($action == 'create_ticket' && GETPOST('add_ticket')) {
 	                } else {
 	                    $result = $mailfile->sendfile();
 	                }
-	                if (!empty($conf->global->TICKETS_DISABLE_MAIL_AUTOCOPY_TO)) {
+	                if (!empty($conf->global->TICKET_DISABLE_MAIL_AUTOCOPY_TO)) {
 	                    $conf->global->MAIN_MAIL_AUTOCOPY_TO = $old_MAIN_MAIL_AUTOCOPY_TO;
 	                }
                 }
@@ -329,7 +329,7 @@ llxHeaderTicket($langs->trans("CreateTicket"), "", 0, 0, $arrayofjs, $arrayofcss
 $form = new Form($db);
 $formticket = new FormTicket($db);
 
-if (!$conf->global->TICKETS_ENABLE_PUBLIC_INTERFACE) {
+if (!$conf->global->TICKET_ENABLE_PUBLIC_INTERFACE) {
     print '<div class="error">' . $langs->trans('TicketPublicInterfaceForbidden') . '</div>';
     $db->close();
     exit();
diff --git a/htdocs/public/ticket/index.php b/htdocs/public/ticket/index.php
index 96a3980ddd6..bb0499f43e6 100644
--- a/htdocs/public/ticket/index.php
+++ b/htdocs/public/ticket/index.php
@@ -49,11 +49,11 @@ $arrayofjs = array();
 $arrayofcss = array('/ticket/css/styles.css.php');
 llxHeaderTicket($langs->trans("Tickets"), "", 0, 0, $arrayofjs, $arrayofcss);
 
-if (!$conf->global->TICKETS_ENABLE_PUBLIC_INTERFACE) {
+if (!$conf->global->TICKET_ENABLE_PUBLIC_INTERFACE) {
     print '<div class="error">' . $langs->trans('TicketPublicInterfaceForbidden') . '</div>';
 } else {
     print '<div style="margin: 0 auto; width:60%">';
-    print '<p style="text-align: center">' . ($conf->global->TICKETS_PUBLIC_TEXT_HOME ? $conf->global->TICKETS_PUBLIC_TEXT_HOME : $langs->trans("TicketPublicDesc")) . '</p>';
+    print '<p style="text-align: center">' . ($conf->global->TICKET_PUBLIC_TEXT_HOME ? $conf->global->TICKET_PUBLIC_TEXT_HOME : $langs->trans("TicketPublicDesc")) . '</p>';
     print '<div class="corps">';
     print '<div class="index_create"><a href="create_ticket.php" class="button orange bigrounded"><strong>&nbsp;' . dol_escape_htmltag($langs->trans("CreateTicket")) . '</strong></a></div>';
     print '<div class="index_display"><a href="list.php" class="button blue bigrounded"><strong>&nbsp;' . dol_escape_htmltag($langs->trans("ShowListTicketWithTrackId")) . '</strong></a></div>';
diff --git a/htdocs/public/ticket/list.php b/htdocs/public/ticket/list.php
index e5e9b98cec4..d8290849f55 100644
--- a/htdocs/public/ticket/list.php
+++ b/htdocs/public/ticket/list.php
@@ -144,7 +144,7 @@ $arrayofjs = array();
 $arrayofcss = array('/ticket/css/styles.css.php');
 llxHeaderTicket($langs->trans("Tickets"), "", 0, 0, $arrayofjs, $arrayofcss);
 
-if (!$conf->global->TICKETS_ENABLE_PUBLIC_INTERFACE) {
+if (!$conf->global->TICKET_ENABLE_PUBLIC_INTERFACE) {
     print '<div class="error">' . $langs->trans('TicketPublicInterfaceForbidden') . '</div>';
     $db->close();
     exit();
diff --git a/htdocs/public/ticket/view.php b/htdocs/public/ticket/view.php
index 473a1dfae40..5383133c42e 100644
--- a/htdocs/public/ticket/view.php
+++ b/htdocs/public/ticket/view.php
@@ -133,7 +133,7 @@ $arrayofcss = array('/ticket/css/styles.css.php');
 
 llxHeaderTicket($langs->trans("Tickets"), "", 0, 0, $arrayofjs, $arrayofcss);
 
-if (!$conf->global->TICKETS_ENABLE_PUBLIC_INTERFACE) {
+if (!$conf->global->TICKET_ENABLE_PUBLIC_INTERFACE) {
     print '<div class="error">' . $langs->trans('TicketPublicInterfaceForbidden') . '</div>';
     $db->close();
     exit();
diff --git a/htdocs/ticket/card.php b/htdocs/ticket/card.php
index 9207ea02860..78337253b1b 100644
--- a/htdocs/ticket/card.php
+++ b/htdocs/ticket/card.php
@@ -166,7 +166,7 @@ if ($action == 'view' || $action == 'add_message' || $action == 'close' || $acti
 
     if ($res > 0) {
         // or for unauthorized internals users
-        if (!$user->societe_id && ($conf->global->TICKETS_LIMIT_VIEW_ASSIGNED_ONLY && $object->fk_user_assign != $user->id) && !$user->rights->ticket->manage) {
+        if (!$user->societe_id && ($conf->global->TICKET_LIMIT_VIEW_ASSIGNED_ONLY && $object->fk_user_assign != $user->id) && !$user->rights->ticket->manage) {
             accessforbidden('', 0);
         }
 
@@ -271,7 +271,7 @@ if ($action == 'view' || $action == 'add_message' || $action == 'close' || $acti
             dol_fiche_end();
         }
 
-        if (!$user->societe_id && $conf->global->TICKETS_LIMIT_VIEW_ASSIGNED_ONLY) {
+        if (!$user->societe_id && $conf->global->TICKET_LIMIT_VIEW_ASSIGNED_ONLY) {
             $object->next_prev_filter = "te.fk_user_assign = '" . $user->id . "'";
         } elseif ($user->societe_id > 0) {
             $object->next_prev_filter = "te.fk_soc = '" . $user->societe_id . "'";
diff --git a/htdocs/ticket/class/actions_ticket.class.php b/htdocs/ticket/class/actions_ticket.class.php
index fe4ea373e1e..72e010eb1f4 100644
--- a/htdocs/ticket/class/actions_ticket.class.php
+++ b/htdocs/ticket/class/actions_ticket.class.php
@@ -195,14 +195,14 @@ class ActionsTicket
                     }
 
                     // Auto assign user
-                    if ($conf->global->TICKETS_AUTO_ASSIGN_USER_CREATE) {
+                    if ($conf->global->TICKET_AUTO_ASSIGN_USER_CREATE) {
                         $result = $object->assignUser($user, $user->id, 1);
                         $object->add_contact($user->id, "SUPPORTTEC", 'internal');
                     }
 
                     // Auto assign contrat
                     $contractid = 0;
-                    if ($conf->global->TICKETS_AUTO_ASSIGN_CONTRACT_CREATE) {
+                    if ($conf->global->TICKET_AUTO_ASSIGN_CONTRACT_CREATE) {
                         $contrat = new Contrat($this->db);
                         $contrat->socid = $object->fk_soc;
                         $list = $contrat->getListOfContracts();
@@ -217,7 +217,7 @@ class ActionsTicket
                     }
 
                     // Auto create fiche intervention
-                    if ($conf->global->TICKETS_AUTO_CREATE_FICHINTER_CREATE)
+                    if ($conf->global->TICKET_AUTO_CREATE_FICHINTER_CREATE)
                     {
                         $fichinter = new Fichinter($this->db);
                         $fichinter->socid = $object->fk_soc;
@@ -637,7 +637,7 @@ class ActionsTicket
                         $subject = GETPOST('subject') ? GETPOST('subject') : '[' . $label_title . '- ticket #' . $object->track_id . '] ' . $langs->trans('TicketNewMessage');
 
                         $message_intro = $langs->trans('TicketNotificationEmailBody', "#" . $object->id);
-                        $message_signature = GETPOST('mail_signature') ? GETPOST('mail_signature') : $conf->global->TICKETS_MESSAGE_MAIL_SIGNATURE;
+                        $message_signature = GETPOST('mail_signature') ? GETPOST('mail_signature') : $conf->global->TICKET_MESSAGE_MAIL_SIGNATURE;
 
                         $message = $langs->trans('TicketMessageMailIntroText');
                         $message .= "\n\n";
@@ -673,9 +673,9 @@ class ActionsTicket
                         $message .= "\n" . $langs->trans('TicketNotificationEmailBodyInfosTrackUrlinternal') . ' : ' . '<a href="' . $url_internal_ticket . '">' . $object->track_id . '</a>' . "\n";
 
                         // Add global email address recipient
-                        // altairis: use new TICKETS_NOTIFICATION_EMAIL_TO configuration variable
-                        if ($conf->global->TICKETS_NOTIFICATION_ALSO_MAIN_ADDRESS && !in_array($conf->global->TICKETS_NOTIFICATION_EMAIL_TO, $sendto)) {
-                            if(!empty($conf->global->TICKETS_NOTIFICATION_EMAIL_TO)) $sendto[] = $conf->global->TICKETS_NOTIFICATION_EMAIL_TO;
+                        // altairis: use new TICKET_NOTIFICATION_EMAIL_TO configuration variable
+                        if ($conf->global->TICKET_NOTIFICATION_ALSO_MAIN_ADDRESS && !in_array($conf->global->TICKET_NOTIFICATION_EMAIL_TO, $sendto)) {
+                            if(!empty($conf->global->TICKET_NOTIFICATION_EMAIL_TO)) $sendto[] = $conf->global->TICKET_NOTIFICATION_EMAIL_TO;
                         }
 
                         // altairis: dont try to send email if no recipient
@@ -709,8 +709,8 @@ class ActionsTicket
                             $label_title = empty($conf->global->MAIN_APPLICATION_TITLE) ? $mysoc->name : $conf->global->MAIN_APPLICATION_TITLE;
                             $subject = GETPOST('subject') ? GETPOST('subject') : '[' . $label_title . '- ticket #' . $object->track_id . '] ' . $langs->trans('TicketNewMessage');
 
-                            $message_intro = GETPOST('mail_intro') ? GETPOST('mail_intro') : $conf->global->TICKETS_MESSAGE_MAIL_INTRO;
-                            $message_signature = GETPOST('mail_signature') ? GETPOST('mail_signature') : $conf->global->TICKETS_MESSAGE_MAIL_SIGNATURE;
+                            $message_intro = GETPOST('mail_intro') ? GETPOST('mail_intro') : $conf->global->TICKET_MESSAGE_MAIL_INTRO;
+                            $message_signature = GETPOST('mail_signature') ? GETPOST('mail_signature') : $conf->global->TICKET_MESSAGE_MAIL_SIGNATURE;
 
                             // We put intro after
                             $message = GETPOST('message');
@@ -731,9 +731,9 @@ class ActionsTicket
                             }
 
                             // If public interface is not enable, use link to internal page into mail
-                            $url_public_ticket = (!empty($conf->global->TICKETS_ENABLE_PUBLIC_INTERFACE) ?
-                            		(!empty($conf->global->TICKETS_URL_PUBLIC_INTERFACE) ?
-                            			$conf->global->TICKETS_URL_PUBLIC_INTERFACE . '/view.php' :
+                            $url_public_ticket = (!empty($conf->global->TICKET_ENABLE_PUBLIC_INTERFACE) ?
+                            		(!empty($conf->global->TICKET_URL_PUBLIC_INTERFACE) ?
+                            			$conf->global->TICKET_URL_PUBLIC_INTERFACE . '/view.php' :
                             			dol_buildpath('/public/ticket/view.php', 2)
                             		) :
                             		dol_buildpath('/ticket/card.php', 2)
@@ -757,8 +757,8 @@ class ActionsTicket
                             }
 
                             // altairis: Add global email address reciepient
-                            if ($conf->global->TICKETS_NOTIFICATION_ALSO_MAIN_ADDRESS && !in_array($conf->global->TICKETS_NOTIFICATION_EMAIL_TO, $sendto)) {
-                                if(!empty($conf->global->TICKETS_NOTIFICATION_EMAIL_TO)) $sendto[] = $conf->global->TICKETS_NOTIFICATION_EMAIL_TO;
+                            if ($conf->global->TICKET_NOTIFICATION_ALSO_MAIN_ADDRESS && !in_array($conf->global->TICKET_NOTIFICATION_EMAIL_TO, $sendto)) {
+                                if(!empty($conf->global->TICKET_NOTIFICATION_EMAIL_TO)) $sendto[] = $conf->global->TICKET_NOTIFICATION_EMAIL_TO;
                             }
 
                             // altairis: dont try to send email when no recipient
@@ -867,11 +867,11 @@ class ActionsTicket
 
                     $message .= "\n\n";
 
-                    $message_signature = GETPOST('mail_signature') ? GETPOST('mail_signature') : $conf->global->TICKETS_MESSAGE_MAIL_SIGNATURE;
+                    $message_signature = GETPOST('mail_signature') ? GETPOST('mail_signature') : $conf->global->TICKET_MESSAGE_MAIL_SIGNATURE;
 
                     // Add global email address reciepient
-                    if ($conf->global->TICKETS_NOTIFICATION_ALSO_MAIN_ADDRESS && !in_array($conf->global->TICKETS_NOTIFICATION_EMAIL_FROM, $sendto)) {
-                        $sendto[] = $conf->global->TICKETS_NOTIFICATION_EMAIL_FROM;
+                    if ($conf->global->TICKET_NOTIFICATION_ALSO_MAIN_ADDRESS && !in_array($conf->global->TICKET_NOTIFICATION_EMAIL_FROM, $sendto)) {
+                        $sendto[] = $conf->global->TICKET_NOTIFICATION_EMAIL_FROM;
                     }
 
                     $this->sendTicketMessageByEmail($subject, $message, '', $sendto);
@@ -893,7 +893,7 @@ class ActionsTicket
                     $message .= GETPOST('message');
                     $message .= "\n\n";
 
-                    $message_signature = GETPOST('mail_signature') ? GETPOST('mail_signature') : $conf->global->TICKETS_MESSAGE_MAIL_SIGNATURE;
+                    $message_signature = GETPOST('mail_signature') ? GETPOST('mail_signature') : $conf->global->TICKET_MESSAGE_MAIL_SIGNATURE;
                     foreach ($external_contacts as $key => $info_sendto) {
                         if ($info_sendto['email'] != '') {
                             $sendto[] = trim($info_sendto['firstname'] . " " . $info_sendto['lastname']) . " <" . $info_sendto['email'] . ">";
@@ -903,7 +903,7 @@ class ActionsTicket
                         $message .= (!empty($recipient) ? $langs->trans('TicketNotificationRecipient') . ' : ' . $recipient . "\n" : '');
                     }
 
-                    $url_public_ticket = ($conf->global->TICKETS_URL_PUBLIC_INTERFACE ? $conf->global->TICKETS_URL_PUBLIC_INTERFACE . '/view.php' : dol_buildpath('/public/ticket/view.php', 2)) . '?track_id=' . $object->track_id;
+                    $url_public_ticket = ($conf->global->TICKET_URL_PUBLIC_INTERFACE ? $conf->global->TICKET_URL_PUBLIC_INTERFACE . '/view.php' : dol_buildpath('/public/ticket/view.php', 2)) . '?track_id=' . $object->track_id;
                     $message .= "\n\n" . $langs->trans('TicketNewEmailBodyInfosTrackUrlCustomer') . ' : ' . $url_public_ticket . "\n";
 
                     // Add signature
@@ -1310,14 +1310,14 @@ class ActionsTicket
      *
      * @param string $subject          Email subject
      * @param string $message          Email message
-     * @param int    $send_internal_cc Receive a copy on internal email ($conf->global->TICKETS_NOTIFICATION_EMAIL_FROM)
+     * @param int    $send_internal_cc Receive a copy on internal email ($conf->global->TICKET_NOTIFICATION_EMAIL_FROM)
      * @param array  $array_receiver   Array of receiver. exemple array('name' => 'John Doe', 'email' => 'john@doe.com', etc...)
      */
     public function sendTicketMessageByEmail($subject, $message, $send_internal_cc = 0, $array_receiver = array())
     {
         global $conf, $langs;
 
-        if ($conf->global->TICKETS_DISABLE_ALL_MAILS) {
+        if ($conf->global->TICKET_DISABLE_ALL_MAILS) {
             dol_syslog(get_class($this) . '::sendTicketMessageByEmail: Emails are disable into ticket setup by option TICKETSUP_DISABLE_ALL_MAILS', LOG_WARNING);
             return '';
         }
@@ -1337,10 +1337,10 @@ class ActionsTicket
         }
 
         if ($send_internal_cc) {
-            $sendtocc = $conf->global->TICKETS_NOTIFICATION_EMAIL_FROM;
+            $sendtocc = $conf->global->TICKET_NOTIFICATION_EMAIL_FROM;
         }
 
-        $from = $conf->global->TICKETS_NOTIFICATION_EMAIL_FROM;
+        $from = $conf->global->TICKET_NOTIFICATION_EMAIL_FROM;
         if (is_array($array_receiver) && count($array_receiver) > 0) {
             foreach ($array_receiver as $key => $receiver) {
                 // Create form object
@@ -1355,7 +1355,7 @@ class ActionsTicket
                 $message_to_send = dol_nl2br($message);
 
                 // Envoi du mail
-                if (!empty($conf->global->TICKETS_DISABLE_MAIL_AUTOCOPY_TO)) {
+                if (!empty($conf->global->TICKET_DISABLE_MAIL_AUTOCOPY_TO)) {
                     $old_MAIN_MAIL_AUTOCOPY_TO = $conf->global->MAIN_MAIL_AUTOCOPY_TO;
                     $conf->global->MAIN_MAIL_AUTOCOPY_TO = '';
                 }
@@ -1377,7 +1377,7 @@ class ActionsTicket
                         }
                     }
                 }
-                if (!empty($conf->global->TICKETS_DISABLE_MAIL_AUTOCOPY_TO)) {
+                if (!empty($conf->global->TICKET_DISABLE_MAIL_AUTOCOPY_TO)) {
                     $conf->global->MAIN_MAIL_AUTOCOPY_TO = $old_MAIN_MAIL_AUTOCOPY_TO;
                 }
             }
diff --git a/htdocs/ticket/class/ticket.class.php b/htdocs/ticket/class/ticket.class.php
index 1882904ab46..de7f39049f8 100644
--- a/htdocs/ticket/class/ticket.class.php
+++ b/htdocs/ticket/class/ticket.class.php
@@ -1525,7 +1525,7 @@ class Ticket extends CommonObject
         dol_syslog(get_class($this) . "::create_ticket_log sql=" . $sql, LOG_DEBUG);
         $resql = $this->db->query($sql);
         if ($resql) {
-            if ($conf->global->TICKETS_ACTIVATE_LOG_BY_EMAIL && !$noemail) {
+            if ($conf->global->TICKET_ACTIVATE_LOG_BY_EMAIL && !$noemail) {
                 $this->sendLogByEmail($user, $message);
             }
 
@@ -1591,14 +1591,14 @@ class Ticket extends CommonObject
                     $url_internal_ticket = dol_buildpath('/ticket/card.php', 2) . '?track_id=' . $this->track_id;
                     $message .= "\n" . $langs->transnoentities('TicketNotificationEmailBodyInfosTrackUrlinternal') . ' : ' . '<a href="' . $url_internal_ticket . '">' . $this->track_id . '</a>' . "\n";
                 } else {
-                    $url_public_ticket = ($conf->global->TICKETS_URL_PUBLIC_INTERFACE ? $conf->global->TICKETS_URL_PUBLIC_INTERFACE . '/' : dol_buildpath('/public/ticket/view.php', 2)) . '?track_id=' . $this->track_id;
+                    $url_public_ticket = ($conf->global->TICKET_URL_PUBLIC_INTERFACE ? $conf->global->TICKET_URL_PUBLIC_INTERFACE . '/' : dol_buildpath('/public/ticket/view.php', 2)) . '?track_id=' . $this->track_id;
                     $message .= "\n" . $langs->transnoentities('TicketNewEmailBodyInfosTrackUrlCustomer') . ' : ' . '<a href="' . $url_public_ticket . '">' . $this->track_id . '</a>' . "\n";
                 }
 
                 $message .= "\n";
                 $message .= $langs->transnoentities('TicketEmailPleaseDoNotReplyToThisEmail') . "\n";
 
-                $from = $conf->global->MAIN_INFO_SOCIETE_NOM . '<' . $conf->global->TICKETS_NOTIFICATION_EMAIL_FROM . '>';
+                $from = $conf->global->MAIN_INFO_SOCIETE_NOM . '<' . $conf->global->TICKET_NOTIFICATION_EMAIL_FROM . '>';
                 $replyto = $from;
 
                 // Init to avoid errors
@@ -1608,7 +1608,7 @@ class Ticket extends CommonObject
 
                 $message = dol_nl2br($message);
 
-                if (!empty($conf->global->TICKETS_DISABLE_MAIL_AUTOCOPY_TO)) {
+                if (!empty($conf->global->TICKET_DISABLE_MAIL_AUTOCOPY_TO)) {
                     $old_MAIN_MAIL_AUTOCOPY_TO = $conf->global->MAIN_MAIL_AUTOCOPY_TO;
                     $conf->global->MAIN_MAIL_AUTOCOPY_TO = '';
                 }
@@ -1622,7 +1622,7 @@ class Ticket extends CommonObject
                         $nb_sent++;
                     }
                 }
-                if (!empty($conf->global->TICKETS_DISABLE_MAIL_AUTOCOPY_TO)) {
+                if (!empty($conf->global->TICKET_DISABLE_MAIL_AUTOCOPY_TO)) {
                     $conf->global->MAIN_MAIL_AUTOCOPY_TO = $old_MAIN_MAIL_AUTOCOPY_TO;
                 }
             }
@@ -2244,7 +2244,7 @@ class Ticket extends CommonObject
 
                     $message = dol_nl2br($message);
 
-                    if (!empty($conf->global->TICKETS_DISABLE_MAIL_AUTOCOPY_TO)) {
+                    if (!empty($conf->global->TICKET_DISABLE_MAIL_AUTOCOPY_TO)) {
                         $old_MAIN_MAIL_AUTOCOPY_TO = $conf->global->MAIN_MAIL_AUTOCOPY_TO;
                         $conf->global->MAIN_MAIL_AUTOCOPY_TO = '';
                     }
@@ -2276,7 +2276,7 @@ class Ticket extends CommonObject
                         $this->error = $mailfile->error;
                         //dol_syslog("Notify::send ".$this->error, LOG_ERR);
                     }
-                    if (!empty($conf->global->TICKETS_DISABLE_MAIL_AUTOCOPY_TO)) {
+                    if (!empty($conf->global->TICKET_DISABLE_MAIL_AUTOCOPY_TO)) {
                         $conf->global->MAIN_MAIL_AUTOCOPY_TO = $old_MAIN_MAIL_AUTOCOPY_TO;
                     }
                 }
diff --git a/htdocs/ticket/contact.php b/htdocs/ticket/contact.php
index 71b5c65b137..e96fb015c04 100644
--- a/htdocs/ticket/contact.php
+++ b/htdocs/ticket/contact.php
@@ -138,7 +138,7 @@ if ($id > 0 || !empty($track_id) || !empty($ref)) {
             dol_fiche_end();
         }
 
-        if (!$user->societe_id && $conf->global->TICKETS_LIMIT_VIEW_ASSIGNED_ONLY) {
+        if (!$user->societe_id && $conf->global->TICKET_LIMIT_VIEW_ASSIGNED_ONLY) {
             $object->next_prev_filter = "te.fk_user_assign = '" . $user->id . "'";
         } elseif ($user->societe_id > 0) {
             $object->next_prev_filter = "te.fk_soc = '" . $user->societe_id . "'";
diff --git a/htdocs/ticket/css/styles.css.php b/htdocs/ticket/css/styles.css.php
index ffcff73bb78..f8368f7e5f2 100644
--- a/htdocs/ticket/css/styles.css.php
+++ b/htdocs/ticket/css/styles.css.php
@@ -50,7 +50,7 @@ html {
 
 html {
 <?php
-if (! empty($conf->global->TICKETS_SHOW_MODULE_LOGO)) {
+if (! empty($conf->global->TICKET_SHOW_MODULE_LOGO)) {
     print 'background: url("../public/img/bg_ticket.png") no-repeat 95% 90%;';
 }
 ?>
diff --git a/htdocs/ticket/document.php b/htdocs/ticket/document.php
index b5ba65b9eba..e31cd98912d 100644
--- a/htdocs/ticket/document.php
+++ b/htdocs/ticket/document.php
@@ -105,7 +105,7 @@ if ($object->id)
         dol_fiche_end();
     }
 
-    if (!$user->societe_id && $conf->global->TICKETS_LIMIT_VIEW_ASSIGNED_ONLY) {
+    if (!$user->societe_id && $conf->global->TICKET_LIMIT_VIEW_ASSIGNED_ONLY) {
         $object->next_prev_filter = "te.fk_user_assign = '" . $user->id . "'";
     } elseif ($user->societe_id > 0) {
         $object->next_prev_filter = "te.fk_soc = '" . $user->societe_id . "'";
diff --git a/htdocs/ticket/history.php b/htdocs/ticket/history.php
index 59dc7fdd95d..c982acf3a3a 100644
--- a/htdocs/ticket/history.php
+++ b/htdocs/ticket/history.php
@@ -90,7 +90,7 @@ if ($action == 'view') {
             accessforbidden('', 0);
         }
         // or for unauthorized internals users
-        if (!$user->societe_id && ($conf->global->TICKETS_LIMIT_VIEW_ASSIGNED_ONLY && $object->fk_user_assign != $user->id) && !$user->rights->ticket->manage) {
+        if (!$user->societe_id && ($conf->global->TICKET_LIMIT_VIEW_ASSIGNED_ONLY && $object->fk_user_assign != $user->id) && !$user->rights->ticket->manage) {
             accessforbidden('', 0);
         }
 
@@ -102,7 +102,7 @@ if ($action == 'view') {
             dol_fiche_end();
         }
 
-        if (!$user->societe_id && $conf->global->TICKETS_LIMIT_VIEW_ASSIGNED_ONLY) {
+        if (!$user->societe_id && $conf->global->TICKET_LIMIT_VIEW_ASSIGNED_ONLY) {
             $object->next_prev_filter = "te.fk_user_assign = '" . $user->id . "'";
         } elseif ($user->societe_id > 0) {
             $object->next_prev_filter = "te.fk_soc = '" . $user->societe_id . "'";
diff --git a/htdocs/ticket/index.php b/htdocs/ticket/index.php
index ca4ec8a7005..92fe366c65c 100644
--- a/htdocs/ticket/index.php
+++ b/htdocs/ticket/index.php
@@ -139,7 +139,7 @@ if ($user->societe_id > 0) {
     $sql .= " AND t.fk_soc='" . $user->societe_id . "'";
 } else {
     // For internals users,
-    if (!empty($conf->global->TICKETS_LIMIT_VIEW_ASSIGNED_ONLY) && !$user->rights->ticket->manage) {
+    if (!empty($conf->global->TICKET_LIMIT_VIEW_ASSIGNED_ONLY) && !$user->rights->ticket->manage) {
         $sql .= " AND t.fk_user_assign=" . $user->id;
     }
 }
@@ -283,7 +283,7 @@ if ($user->societe_id > 0) {
     $sql .= " AND t.fk_soc='" . $user->societe_id . "'";
 } else {
     // Restricted to assigned user only
-    if ($conf->global->TICKETS_LIMIT_VIEW_ASSIGNED_ONLY && !$user->rights->ticket->manage) {
+    if ($conf->global->TICKET_LIMIT_VIEW_ASSIGNED_ONLY && !$user->rights->ticket->manage) {
         $sql .= " AND t.fk_user_assign=" . $user->id;
     }
 }
diff --git a/htdocs/ticket/list.php b/htdocs/ticket/list.php
index b3df986cde7..cc3291a5e00 100644
--- a/htdocs/ticket/list.php
+++ b/htdocs/ticket/list.php
@@ -216,7 +216,7 @@ foreach($search as $key => $val)
 if ($search_all) $sql.= natural_search(array_keys($fieldstosearchall), $search_all);
 if ($search_fk_soc)     $sql.= natural_search('fk_soc', $search_fk_soc);
 if ($search_fk_project) $sql.= natural_search('fk_project', $search_fk_project);
-if (!$user->societe_id && ($mode == "my_assign" || (!$user->admin && $conf->global->TICKETS_LIMIT_VIEW_ASSIGNED_ONLY))) {
+if (!$user->societe_id && ($mode == "my_assign" || (!$user->admin && $conf->global->TICKET_LIMIT_VIEW_ASSIGNED_ONLY))) {
     $sql.= " AND t.fk_user_assign=".$user->id;
 }
 

From 2113965b57e1e2dd27cd728c4969a28ed2926894 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 6 Jul 2018 14:26:21 +0200
Subject: [PATCH 09/10] Update html.formactions.class.php

---
 htdocs/core/class/html.formactions.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/core/class/html.formactions.class.php b/htdocs/core/class/html.formactions.class.php
index a39b4840017..bd22470d952 100644
--- a/htdocs/core/class/html.formactions.class.php
+++ b/htdocs/core/class/html.formactions.class.php
@@ -196,7 +196,7 @@ class FormActions
 
 			if (! empty($conf->agenda->enabled))
 			{
-				$buttontoaddnewevent = '<a href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create&datep='.dol_print_date(dol_now(),'dayhourlog').'&origin='.$typeelement.'&originid='.$object->id.($object->socid>0?'&socid='.$object->socid:'').($projectid>0?'&projectid='.$projectid:'').($socid>0?'&socid='.$socid:'').'&backtopage='.urlencode($urlbacktopage).'">';
+				$buttontoaddnewevent = '<a href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create&datep='.dol_print_date(dol_now(),'dayhourlog').'&origin='.$typeelement.'&originid='.$object->id.($object->socid>0?'&socid='.$object->socid:($socid>0?'&socid='.$socid:'')).($projectid>0?'&projectid='.$projectid:'').'&backtopage='.urlencode($urlbacktopage).'">';
 				$buttontoaddnewevent.= $langs->trans("AddEvent");
 				$buttontoaddnewevent.= '</a>';
 			}

From ed6ec8138d6624a346d0d985cf2439b8b7d790c8 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 6 Jul 2018 16:06:15 +0200
Subject: [PATCH 10/10] Fix filter on invoice status

---
 htdocs/compta/facture/list.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/compta/facture/list.php b/htdocs/compta/facture/list.php
index d5d320e6d32..75dce3c01a3 100644
--- a/htdocs/compta/facture/list.php
+++ b/htdocs/compta/facture/list.php
@@ -442,7 +442,7 @@ if ($search_montant_localtax2 != '') $sql.= natural_search('f.localtax2', $searc
 if ($search_montant_ttc != '') $sql.= natural_search('f.total_ttc', $search_montant_ttc, 1);
 if ($search_categ_cus > 0) $sql.= " AND cc.fk_categorie = ".$db->escape($search_categ_cus);
 if ($search_categ_cus == -2)   $sql.= " AND cc.fk_categorie IS NULL";
-if ($search_status != '')
+if ($search_status != '-1' && $search_status != '')
 {
 	if (is_numeric($search_status) && $search_status >= 0)
 	{