diff --git a/htdocs/admin/ticketsup.php b/htdocs/admin/ticketsup.php
index ced25a1cd2d..529d64abf9c 100644
--- a/htdocs/admin/ticketsup.php
+++ b/htdocs/admin/ticketsup.php
@@ -34,10 +34,10 @@ if (file_exists("../../main.inc.php")) {
// Libraries
require_once DOL_DOCUMENT_ROOT . "/core/lib/admin.lib.php";
-require_once "../class/ticketsup.class.php";
-require_once "../lib/ticketsup.lib.php";
+require_once DOL_DOCUMENT_ROOT."/ticketsup/class/ticketsup.class.php";
+require_once DOL_DOCUMENT_ROOT."/core/lib/ticketsup.lib.php";
// Translations
-$langs->load("ticketsup@ticketsup");
+$langs->load("ticketsup");
// Access control
if (!$user->admin) {
diff --git a/htdocs/admin/ticketsup_extrafields.php b/htdocs/admin/ticketsup_extrafields.php
index 8a7ae788921..9084cac2ac1 100644
--- a/htdocs/admin/ticketsup_extrafields.php
+++ b/htdocs/admin/ticketsup_extrafields.php
@@ -29,7 +29,8 @@ if (file_exists("../../main.inc.php")) {
} else {
die("Include of main fails");
}
-require_once '../lib/ticketsup.lib.php';
+// Libraries
+require_once DOL_DOCUMENT_ROOT."/core/lib/ticketsup.lib.php";
require_once DOL_DOCUMENT_ROOT . '/core/class/extrafields.class.php';
require_once DOL_DOCUMENT_ROOT . '/core/lib/admin.lib.php';
diff --git a/htdocs/core/lib/ticketsup.lib.php b/htdocs/core/lib/ticketsup.lib.php
index c8bfb006091..d44ca92f68d 100644
--- a/htdocs/core/lib/ticketsup.lib.php
+++ b/htdocs/core/lib/ticketsup.lib.php
@@ -37,18 +37,14 @@ function ticketsupAdminPrepareHead()
$h = 0;
$head = array();
- $head[$h][0] = dol_buildpath("/ticketsup/admin/admin_ticketsup.php", 1);
+ $head[$h][0] = DOL_URL_ROOT.'/admin/admin_ticketsup.php';
$head[$h][1] = $langs->trans("TicketSupSettings");
$head[$h][2] = 'settings';
$h++;
- $head[$h][0] = dol_buildpath("/ticketsup/admin/ticketsup_extrafields.php", 1);
+ $head[$h][0] = DOL_URL_ROOT.'/admin/ticketsup_extrafields.php';
$head[$h][1] = $langs->trans("ExtraFieldsTicketSup");
$head[$h][2] = 'attributes';
$h++;
- $head[$h][0] = dol_buildpath("/ticketsup/admin/about.php", 1);
- $head[$h][1] = $langs->trans("About");
- $head[$h][2] = 'about';
- $h++;
// Show more tabs from modules
// Entries must be declared in modules descriptor with line
@@ -64,9 +60,10 @@ function ticketsupAdminPrepareHead()
}
/**
- * Build tabs for a Ticketsup object
- * @param Ticketsup $object Ticketsup object
- * @return array
+ * Build tabs for a Ticketsup object
+ *
+ * @param Ticketsup $object Object Ticket
+ * @return array Array of tabs
*/
function ticketsup_prepare_head($object)
{
@@ -74,21 +71,21 @@ function ticketsup_prepare_head($object)
$h = 0;
$head = array();
- $head[$h][0] = dol_buildpath('/ticketsup/card.php', 1) . '?action=view&track_id=' . $object->track_id;
+ $head[$h][0] = DOL_URL_ROOT.'/ticketsup/card.php?action=view&track_id=' . $object->track_id;
$head[$h][1] = $langs->trans("Card");
$head[$h][2] = 'tabTicketsup';
$h++;
if (empty($user->socid)) {
- $head[$h][0] = dol_buildpath('/ticketsup/contacts.php', 1) . '?track_id=' . $object->track_id;
+ $head[$h][0] = DOL_URL_ROOT.'/ticketsup/contacts.php?track_id=' . $object->track_id;
$head[$h][1] = $langs->trans('Contacts');
$head[$h][2] = 'tabTicketContacts';
$h++;
}
complete_head_from_modules($conf, $langs, $object, $head, $h, 'ticketsup');
-
-
+
+
// Attached files
include_once DOL_DOCUMENT_ROOT . '/core/lib/files.lib.php';
$upload_dir = $conf->ticketsup->dir_output . "/" . $object->track_id;
@@ -104,15 +101,15 @@ function ticketsup_prepare_head($object)
// History
- $head[$h][0] = dol_buildpath('/ticketsup/history.php', 1) . '?track_id=' . $object->track_id;
+ $head[$h][0] = DOL_URL_ROOT.'/ticketsup/history.php?track_id=' . $object->track_id;
$head[$h][1] = $langs->trans('TicketHistory');
$head[$h][2] = 'tabTicketLogs';
$h++;
-
+
complete_head_from_modules($conf, $langs, $object, $head, $h, 'ticketsup','remove');
-
+
return $head;
}
diff --git a/htdocs/core/modules/ticketsup/mod_ticketsup_simple.php b/htdocs/core/modules/ticketsup/mod_ticketsup_simple.php
index f0293f78d1f..7aa636b0780 100644
--- a/htdocs/core/modules/ticketsup/mod_ticketsup_simple.php
+++ b/htdocs/core/modules/ticketsup/mod_ticketsup_simple.php
@@ -23,7 +23,7 @@
* \brief File with class to manage the numbering module Simple for ticketsup references
*/
-dol_include_once('/ticketsup/core/modules/modules_ticketsup.php');
+require_once DOL_DOCUMENT_ROOT.'/core/modules/modules_ticketsup.php';
/**
* Class to manage the numbering module Simple for ticketsup references
diff --git a/htdocs/core/modules/ticketsup/mod_ticketsup_universal.php b/htdocs/core/modules/ticketsup/mod_ticketsup_universal.php
index cc8b88d7e8d..8c0c8c8fe0c 100644
--- a/htdocs/core/modules/ticketsup/mod_ticketsup_universal.php
+++ b/htdocs/core/modules/ticketsup/mod_ticketsup_universal.php
@@ -22,7 +22,7 @@
* \brief Fichier contenant la classe du modele de numerotation de reference de projet Universal
*/
-dol_include_once('/ticketsup/core/modules/modules_ticketsup.php');
+require_once DOL_DOCUMENT_ROOT.'/core/modules/modules_ticketsup.php';
/**
* Classe du modele de numerotation de reference de projet Universal
diff --git a/htdocs/install/mysql/migration/7.0.0-8.0.0.sql b/htdocs/install/mysql/migration/7.0.0-8.0.0.sql
index 7c82c54fb94..e9543583b03 100644
--- a/htdocs/install/mysql/migration/7.0.0-8.0.0.sql
+++ b/htdocs/install/mysql/migration/7.0.0-8.0.0.sql
@@ -120,4 +120,106 @@ ALTER TABLE llx_societe_rib ADD COLUMN total_amount_of_all_payments double(24,8)
ALTER TABLE llx_societe_rib ADD COLUMN stripe_card_ref varchar(128);
ALTER TABLE llx_societe_rib ADD COLUMN status integer NOT NULL DEFAULT 1;
+CREATE TABLE llx_ticketsup
+(
+ rowid integer AUTO_INCREMENT PRIMARY KEY,
+ entity integer DEFAULT 1,
+ ref varchar(128) NOT NULL,
+ track_id varchar(128) NOT NULL,
+ fk_soc integer DEFAULT 0,
+ fk_project integer DEFAULT 0,
+ origin_email varchar(128),
+ fk_user_create integer,
+ fk_user_assign integer,
+ subject varchar(255),
+ message text,
+ fk_statut integer,
+ resolution integer,
+ progress varchar(100),
+ timing varchar(20),
+ type_code varchar(32),
+ category_code varchar(32),
+ severity_code varchar(32),
+ datec datetime,
+ date_read datetime,
+ date_close datetime,
+ tms timestamp
+)ENGINE=innodb;
+
+ALTER TABLE llx_ticketsup ADD UNIQUE uk_ticketsup_rowid_track_id (rowid, track_id);
+ALTER TABLE llx_ticketsup ADD INDEX id_ticketsup_track_id (track_id);
+
+CREATE TABLE llx_ticketsup_msg
+(
+ rowid integer AUTO_INCREMENT PRIMARY KEY,
+ entity integer DEFAULT 1,
+ fk_track_id varchar(128),
+ fk_user_action integer,
+ datec datetime,
+ message text,
+ private integer DEFAULT 0
+)ENGINE=innodb;
+
+
+ALTER TABLE llx_ticketsup_msg ADD CONSTRAINT fk_ticketsup_msg_fk_track_id FOREIGN KEY (fk_track_id) REFERENCES llx_ticketsup (track_id);
+
+CREATE TABLE llx_ticketsup_logs
+(
+ rowid integer AUTO_INCREMENT PRIMARY KEY,
+ entity integer DEFAULT 1,
+ fk_track_id varchar(128),
+ fk_user_create integer,
+ datec datetime,
+ message text
+)ENGINE=innodb;
+
+ALTER TABLE llx_ticketsup_logs ADD CONSTRAINT fk_ticketsup_logs_fk_track_id FOREIGN KEY (fk_track_id) REFERENCES llx_ticketsup (track_id);
+
+CREATE TABLE llx_ticketsup_extrafields
+(
+ rowid integer AUTO_INCREMENT PRIMARY KEY,
+ tms timestamp,
+ fk_object integer NOT NULL,
+ import_key varchar(14)
+)ENGINE=innodb;
+
+ALTER TABLE llx_c_ticketsup_category ADD INDEX idx_code (code);
+
+CREATE TABLE llx_c_ticketsup_category
+(
+ rowid integer AUTO_INCREMENT PRIMARY KEY,
+ code varchar(32) NOT NULL,
+ pos varchar(32) NOT NULL,
+ label varchar(128) NOT NULL,
+ active integer DEFAULT 1,
+ use_default integer DEFAULT 1,
+ description varchar(255)
+)ENGINE=innodb;
+
+ALTER TABLE llx_c_ticketsup_severity ADD INDEX idx_code (code);
+
+CREATE TABLE llx_c_ticketsup_severity
+(
+ rowid integer AUTO_INCREMENT PRIMARY KEY,
+ code varchar(32) NOT NULL,
+ pos varchar(32) NOT NULL,
+ label varchar(128) NOT NULL,
+ color varchar(10) NOT NULL,
+ active integer DEFAULT 1,
+ use_default integer DEFAULT 1,
+ description varchar(255)
+)ENGINE=innodb;
+
+ALTER TABLE llx_c_ticketsup_type ADD INDEX idx_code (code);
+
+CREATE TABLE llx_c_ticketsup_type
+(
+ rowid integer AUTO_INCREMENT PRIMARY KEY,
+ code varchar(32) NOT NULL,
+ pos varchar(32) NOT NULL,
+ label varchar(128) NOT NULL,
+ active integer DEFAULT 1,
+ use_default integer DEFAULT 1,
+ description varchar(255)
+)ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_ticketsup.key.sql b/htdocs/install/mysql/tables/llx_ticketsup.key.sql
index 4e06a1d8f44..abf853e718c 100755
--- a/htdocs/install/mysql/tables/llx_ticketsup.key.sql
+++ b/htdocs/install/mysql/tables/llx_ticketsup.key.sql
@@ -14,4 +14,5 @@
-- You should have received a copy of the GNU General Public License
-- along with this program. If not, see .
-ALTER TABLE llx_ticketsup ADD UNIQUE uk_matable_field(rowid, track_id);
+ALTER TABLE llx_ticketsup ADD UNIQUE uk_ticketsup_rowid_track_id (rowid, track_id);
+ALTER TABLE llx_ticketsup ADD INDEX id_ticketsup_track_id (track_id);
diff --git a/htdocs/install/mysql/tables/llx_ticketsup_logs.key.sql b/htdocs/install/mysql/tables/llx_ticketsup_logs.key.sql
index 764a6dc313a..180febe01bf 100755
--- a/htdocs/install/mysql/tables/llx_ticketsup_logs.key.sql
+++ b/htdocs/install/mysql/tables/llx_ticketsup_logs.key.sql
@@ -14,4 +14,4 @@
-- You should have received a copy of the GNU General Public License
-- along with this program. If not, see .
-ALTER TABLE llx_ticketsup_logs ADD CONSTRAINT fk_ticketsup_logs_fk_track_id FOREIGN KEY (fk_track_id) REFERENCES llx_ticketsup (fk_track_id);
+ALTER TABLE llx_ticketsup_logs ADD CONSTRAINT fk_ticketsup_logs_fk_track_id FOREIGN KEY (fk_track_id) REFERENCES llx_ticketsup (track_id);