From 5e363e936cd3cebc7f72c4f6ec07b2e0e3570d6b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 10 Apr 2019 12:35:27 +0200
Subject: [PATCH] Fix debug ticket module

---
 htdocs/ticket/class/ticketstats.class.php |  6 +++---
 htdocs/ticket/stats/index.php             | 17 +++++------------
 2 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/htdocs/ticket/class/ticketstats.class.php b/htdocs/ticket/class/ticketstats.class.php
index 2f2e04baba9..469d44bc6d5 100644
--- a/htdocs/ticket/class/ticketstats.class.php
+++ b/htdocs/ticket/class/ticketstats.class.php
@@ -63,13 +63,13 @@ class TicketStats extends Stats
 
         $this->where = " fk_statut > 0";
         $this->where .= " AND entity = " . $conf->entity;
-        if ($this->socid) {
+        if ($this->socid > 0) {
             $this->where .= " AND fk_soc = " . $this->socid;
         }
         if (is_array($this->userid) && count($this->userid) > 0) {
-            $this->where .= ' AND fk_user IN (' . join(',', $this->userid) . ')';
+            $this->where .= ' AND fk_user_create IN (' . join(',', $this->userid) . ')';
         } elseif ($this->userid > 0) {
-            $this->where .= ' AND fk_user = ' . $this->userid;
+            $this->where .= ' AND fk_user_create = ' . $this->userid;
         }
     }
 
diff --git a/htdocs/ticket/stats/index.php b/htdocs/ticket/stats/index.php
index 15f3a3cb897..de4ad035faf 100644
--- a/htdocs/ticket/stats/index.php
+++ b/htdocs/ticket/stats/index.php
@@ -24,6 +24,7 @@
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/ticket/class/actions_ticket.class.php';
 require_once DOL_DOCUMENT_ROOT.'/ticket/class/ticketstats.class.php';
+require_once DOL_DOCUMENT_ROOT.'/ticket/class/ticket.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/dolgraph.class.php';
 
 $WIDTH=DolGraph::getDefaultGraphSizeForStats('width');
@@ -57,7 +58,7 @@ $langs->loadLangs(array('orders', 'companies', 'other', 'tickets'));
  */
 
 $form=new Form($db);
-//$formticket=new FormTicket($db);
+$object=new Ticket($db);
 
 $title=$langs->trans("Statistics");
 $dir=$conf->ticket->dir_temp;
@@ -69,7 +70,7 @@ print load_fiche_titre($title, '', 'title_ticket.png');
 dol_mkdir($dir);
 
 $stats = new TicketStats($db, $socid, ($userid>0?$userid:0));
-if ($object_status != '' && $object_status >= -1) $stats->where .= ' AND c.fk_statut IN ('.$db->escape($object_status).')';
+if ($object_status != '' && $object_status >= -1) $stats->where .= ' AND fk_statut IN ('.$db->escape($object_status).')';
 
 
 // Build graphic number of object
@@ -242,16 +243,8 @@ print '<tr><td class="left">'.$langs->trans("CreatedBy").'</td><td class="left">
 print $form->select_dolusers($userid, 'userid', 1, '', 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth300');
 // Status
 print '<tr><td class="left">'.$langs->trans("Status").'</td><td class="left">';
-$liststatus=array(
-        Ticket::STATUS_NOT_READ=>$langs->trans("StatusNotRead"),
-        Ticket::STATUS_READ=>$langs->trans("StatusRead"),
-        Ticket::STATUS_ASSIGNED=>$langs->trans("StatusAssigned"),
-        Ticket::STATUS_IN_PROGRESS=>$langs->trans("StatusInProgress"),
-        Ticket::STATUS_ANSWERED=>$langs->trans("StatusAnswered"),
-        Ticket::STATUS_CLOSED=>$langs->trans("StatusClosed"),
-        Ticket::STATUS_WAITING=>$langs->trans("StatusWaiting")
-    );
-print $form->selectarray('object_status', $liststatus, GETPOST('object_status', 'int'), -4);
+$liststatus = $object->fields['fk_statut']['arrayofkeyval'];
+print $form->selectarray('object_status', $liststatus, GETPOST('object_status', 'int'), -4, 0, 0, '', 1);
 print '</td></tr>';
 // Year
 print '<tr><td class="left">'.$langs->trans("Year").'</td><td class="left">';