From 880ecda09841de776c06a81db206aa7dfe80efcb Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 10 Nov 2019 12:23:21 +0100
Subject: [PATCH] Fix name of tables

---
 ...up_category.key.sql => llx_c_ticket_category.key.sql} | 0
 ..._ticketsup_category.sql => llx_c_ticket_category.sql} | 0
 ...up_severity.key.sql => llx_c_ticket_severity.key.sql} | 0
 ..._ticketsup_severity.sql => llx_c_ticket_severity.sql} | 0
 ..._ticketsup_type.key.sql => llx_c_ticket_type.key.sql} | 0
 .../{llx_c_ticketsup_type.sql => llx_c_ticket_type.sql}  | 0
 htdocs/install/upgrade2.php                              | 9 ++++++++-
 htdocs/langs/en_US/ticket.lang                           | 3 ++-
 htdocs/langs/fr_FR/ticket.lang                           | 2 +-
 9 files changed, 11 insertions(+), 3 deletions(-)
 rename htdocs/install/mysql/tables/{llx_c_ticketsup_category.key.sql => llx_c_ticket_category.key.sql} (100%)
 rename htdocs/install/mysql/tables/{llx_c_ticketsup_category.sql => llx_c_ticket_category.sql} (100%)
 rename htdocs/install/mysql/tables/{llx_c_ticketsup_severity.key.sql => llx_c_ticket_severity.key.sql} (100%)
 rename htdocs/install/mysql/tables/{llx_c_ticketsup_severity.sql => llx_c_ticket_severity.sql} (100%)
 rename htdocs/install/mysql/tables/{llx_c_ticketsup_type.key.sql => llx_c_ticket_type.key.sql} (100%)
 rename htdocs/install/mysql/tables/{llx_c_ticketsup_type.sql => llx_c_ticket_type.sql} (100%)

diff --git a/htdocs/install/mysql/tables/llx_c_ticketsup_category.key.sql b/htdocs/install/mysql/tables/llx_c_ticket_category.key.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_c_ticketsup_category.key.sql
rename to htdocs/install/mysql/tables/llx_c_ticket_category.key.sql
diff --git a/htdocs/install/mysql/tables/llx_c_ticketsup_category.sql b/htdocs/install/mysql/tables/llx_c_ticket_category.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_c_ticketsup_category.sql
rename to htdocs/install/mysql/tables/llx_c_ticket_category.sql
diff --git a/htdocs/install/mysql/tables/llx_c_ticketsup_severity.key.sql b/htdocs/install/mysql/tables/llx_c_ticket_severity.key.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_c_ticketsup_severity.key.sql
rename to htdocs/install/mysql/tables/llx_c_ticket_severity.key.sql
diff --git a/htdocs/install/mysql/tables/llx_c_ticketsup_severity.sql b/htdocs/install/mysql/tables/llx_c_ticket_severity.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_c_ticketsup_severity.sql
rename to htdocs/install/mysql/tables/llx_c_ticket_severity.sql
diff --git a/htdocs/install/mysql/tables/llx_c_ticketsup_type.key.sql b/htdocs/install/mysql/tables/llx_c_ticket_type.key.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_c_ticketsup_type.key.sql
rename to htdocs/install/mysql/tables/llx_c_ticket_type.key.sql
diff --git a/htdocs/install/mysql/tables/llx_c_ticketsup_type.sql b/htdocs/install/mysql/tables/llx_c_ticket_type.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_c_ticketsup_type.sql
rename to htdocs/install/mysql/tables/llx_c_ticket_type.sql
diff --git a/htdocs/install/upgrade2.php b/htdocs/install/upgrade2.php
index 232cee40440..cdae711873b 100644
--- a/htdocs/install/upgrade2.php
+++ b/htdocs/install/upgrade2.php
@@ -4481,7 +4481,14 @@ function migrate_delete_old_files($db, $langs, $conf)
         '/societe/class/api_contact.class.php',
         '/societe/class/api_thirdparty.class.php',
         '/support/online.php',
-        '/takepos/class/actions_takepos.class.php'
+        '/takepos/class/actions_takepos.class.php',
+
+    	'/install/mysql/tables/llx_c_ticketsup_category.key.sql',
+    	'/install/mysql/tables/llx_c_ticketsup_category.sql',
+    	'/install/mysql/tables/llx_c_ticketsup_severity.key.sql',
+    	'/install/mysql/tables/llx_c_ticketsup_severity.sql',
+    	'/install/mysql/tables/llx_c_ticketsup_type.key.sql',
+    	'/install/mysql/tables/llx_c_ticketsup_type.sql'
     );
 
     foreach ($filetodeletearray as $filetodelete) {
diff --git a/htdocs/langs/en_US/ticket.lang b/htdocs/langs/en_US/ticket.lang
index 7a408e8952a..c346c492c41 100644
--- a/htdocs/langs/en_US/ticket.lang
+++ b/htdocs/langs/en_US/ticket.lang
@@ -33,7 +33,8 @@ TicketDictSeverity=Ticket - Severities
 TicketTypeShortBUGSOFT=Dysfonctionnement logiciel
 TicketTypeShortBUGHARD=Dysfonctionnement matériel
 TicketTypeShortCOM=Commercial question
-TicketTypeShortINCIDENT=Request for assistance
+TicketTypeShortHELP=Request for functionnal help
+TicketTypeShortISSUE=Issue, bug or problem
 TicketTypeShortPROJET=Project
 TicketTypeShortOTHER=Other
 
diff --git a/htdocs/langs/fr_FR/ticket.lang b/htdocs/langs/fr_FR/ticket.lang
index 9154449ab20..0170e12c4c9 100644
--- a/htdocs/langs/fr_FR/ticket.lang
+++ b/htdocs/langs/fr_FR/ticket.lang
@@ -33,7 +33,7 @@ TicketDictSeverity=Ticket - Sévérités
 TicketTypeShortBUGSOFT=Dysfonctionnement logiciel
 TicketTypeShortBUGHARD=Dysfonctionnement matériel
 TicketTypeShortCOM=Question commerciale
-TicketTypeShortINCIDENT=Demande d'assistance
+TicketTypeShortISSUE=Incident ou problem
 TicketTypeShortPROJET=Projet
 TicketTypeShortOTHER=Autre