From 1a43b58f8ab3cfda3a7dd4d2c779e993c0fbd64d Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@inodbox.com>
Date: Mon, 25 Nov 2019 10:03:35 +0100
Subject: [PATCH 1/3] FIX compatibility with Multicompany

---
 htdocs/public/ticket/create_ticket.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/htdocs/public/ticket/create_ticket.php b/htdocs/public/ticket/create_ticket.php
index b2434e7d826..a6d18937da4 100644
--- a/htdocs/public/ticket/create_ticket.php
+++ b/htdocs/public/ticket/create_ticket.php
@@ -53,7 +53,6 @@ $object = new Ticket($db);
 $extrafields = new ExtraFields($db);
 $extralabels = $extrafields->fetch_name_optionals_label($object->table_element);
 
-
 /*
  * Actions
  */
@@ -359,7 +358,7 @@ if ($action != "infos_success") {
     $formticket->withfile = 2;
     $formticket->action = 'create_ticket';
 
-    $formticket->param = array('returnurl' => $_SERVER['PHP_SELF']);
+    $formticket->param = array('returnurl' => $_SERVER['PHP_SELF'].($conf->entity > 1 ? '?entity='.$conf->entity : ''));
 
     if (empty($defaultref)) {
         $defaultref = '';

From 60f19d134c0794ae4a78d703e7d9bc2dd5fcc48c Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Tue, 26 Nov 2019 03:58:01 +0100
Subject: [PATCH 2/3] Fix Ticket - Align language type with datas for
 translation

---
 htdocs/langs/en_US/ticket.lang | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/htdocs/langs/en_US/ticket.lang b/htdocs/langs/en_US/ticket.lang
index 70bd8220af0..f0e0ff8b726 100644
--- a/htdocs/langs/en_US/ticket.lang
+++ b/htdocs/langs/en_US/ticket.lang
@@ -33,8 +33,9 @@ TicketDictSeverity=Ticket - Severities
 TicketTypeShortBUGSOFT=Dysfonctionnement logiciel
 TicketTypeShortBUGHARD=Dysfonctionnement matériel
 TicketTypeShortCOM=Commercial question
-TicketTypeShortINCIDENT=Request for assistance
-TicketTypeShortPROJET=Project
+TicketTypeShortISSUE=Request for assistance
+TicketTypeShortREQUEST=Change or enhancement request
+TicketTypeShortPROJECT=Project
 TicketTypeShortOTHER=Other
 
 TicketSeverityShortLOW=Low

From 6cc61fef9c3001da486b5bc6a03c243c7b5664f5 Mon Sep 17 00:00:00 2001
From: Alexandre SPANGARO <aspangaro.dolibarr@gmail.com>
Date: Tue, 26 Nov 2019 04:32:38 +0100
Subject: [PATCH 3/3] Fix Ticket - Deprecated <center>

---
 htdocs/core/class/html.formticket.class.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/core/class/html.formticket.class.php b/htdocs/core/class/html.formticket.class.php
index 747b2dbdf8b..1e51d54f37e 100644
--- a/htdocs/core/class/html.formticket.class.php
+++ b/htdocs/core/class/html.formticket.class.php
@@ -419,14 +419,14 @@ class FormTicket
 
         if ($withdolfichehead) dol_fiche_end();
 
-        print '<br><center>';
+		print '<div class="center">';
         print '<input class="button" type="submit" name="add" value="' . $langs->trans(($this->withthreadid > 0 ? "SendResponse" : "NewTicket")) . '" />';
 
         if ($this->withcancel) {
-            print " &nbsp; &nbsp; ";
+            print " &nbsp; &nbsp; &nbsp;";
             print "<input class=\"button\" type=\"submit\" name=\"cancel\" value=\"" . $langs->trans("Cancel") . "\">";
         }
-        print "</center>\n";
+		print '</div>';
 
         print "</form>\n";
         print "<!-- End form TICKET -->\n";