From 8f6f3d764f6661247e6b05100706dae91ac70575 Mon Sep 17 00:00:00 2001 From: Ludovic Canivet Date: Mon, 29 Apr 2019 10:58:00 +0200 Subject: [PATCH 1/4] Display category/Severity/type label instead of code --- htdocs/ticket/list.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/htdocs/ticket/list.php b/htdocs/ticket/list.php index 989bbda8072..3cd594b3eb9 100644 --- a/htdocs/ticket/list.php +++ b/htdocs/ticket/list.php @@ -629,6 +629,9 @@ while ($i < min($num, $limit)) if ($cssforfield || $val['css']) print '"'; print '>'; if ($key == 'fk_statut') print $object->getLibStatut(5); + elseif ($key == 'category_code') print $langs->getLabelFromKey($db, $object->category_code, 'c_ticket_category', 'code', 'label'); + elseif ($key == 'severity_code') print $langs->getLabelFromKey($db, $object->severity_code, 'c_ticket_severity', 'code', 'label'); + elseif ($key == 'type_code') print $langs->getLabelFromKey($db, $object->type_code, 'c_ticket_type', 'code', 'label'); elseif (in_array($val['type'], array('date','datetime','timestamp'))) print $object->showOutputField($val, $key, $db->jdate($obj->$key), ''); else print $object->showOutputField($val, $key, $obj->$key, ''); print ''; From cef5bb15b1e8f876d0cacd70269cab05356bff40 Mon Sep 17 00:00:00 2001 From: Ludovic Canivet Date: Mon, 29 Apr 2019 11:43:25 +0200 Subject: [PATCH 2/4] Search ticket by thirdparty name instead of id --- htdocs/ticket/list.php | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/htdocs/ticket/list.php b/htdocs/ticket/list.php index 3cd594b3eb9..ad6ac18d386 100644 --- a/htdocs/ticket/list.php +++ b/htdocs/ticket/list.php @@ -52,7 +52,7 @@ $id = GETPOST('id', 'int'); $msg_id = GETPOST('msg_id', 'int'); $socid = GETPOST('socid', 'int'); $projectid = GETPOST('projectid', 'int'); -$search_fk_soc=GETPOST('$search_fk_soc', 'int')?GETPOST('$search_fk_soc', 'int'):GETPOST('socid', 'int'); +$search_societe = GETPOST('search_societe', 'alpha'); $search_fk_project=GETPOST('search_fk_project', 'int')?GETPOST('search_fk_project', 'int'):GETPOST('projectid', 'int'); $search_fk_status = GETPOST('search_fk_statut', 'array'); $mode = GETPOST('mode', 'alpha'); @@ -210,6 +210,7 @@ $sql.= " FROM ".MAIN_DB_PREFIX.$object->table_element." as t"; if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label'])) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX.$object->table_element."_extrafields as ef on (t.rowid = ef.fk_object)"; if ($object->ismultientitymanaged == 1) $sql.= " WHERE t.entity IN (".getEntity($object->element).")"; else $sql.=" WHERE 1 = 1"; +$sql.= " AND t.fk_soc = s.rowid"; foreach($search as $key => $val) { @@ -231,7 +232,7 @@ foreach($search as $key => $val) if ($search[$key] != '') $sql.=natural_search($key, $search[$key], $mode_search); } if ($search_all) $sql.= natural_search(array_keys($fieldstosearchall), $search_all); -if ($search_fk_soc) $sql.= natural_search('fk_soc', $search_fk_soc, 2); +if ($search_societe) $sql .= natural_search('s.nom', $search_societe); if ($search_fk_project) $sql.= natural_search('fk_project', $search_fk_project, 2); if (! $user->societe_id && ($mode == "mine" || (!$user->admin && $conf->global->TICKET_LIMIT_VIEW_ASSIGNED_ONLY))) { $sql.= " AND (t.fk_user_assign = ".$user->id; @@ -538,6 +539,10 @@ foreach($object->fields as $key => $val) print Form::multiselectarray('search_fk_statut', $arrayofstatus, array_values($search[$key]), 0, 0, 'minwidth150', 1, 0, '', '', ''); print ''; } + elseif ($key == "fk_soc") + { + print ''; + } else { print ''; } From dfd0e97d20e0e7419e6fb8092f0265ac519bb620 Mon Sep 17 00:00:00 2001 From: Ludovic Canivet Date: Mon, 29 Apr 2019 11:46:14 +0200 Subject: [PATCH 3/4] Search ticket by thirdparty name instead of id 2/2 --- htdocs/ticket/list.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/htdocs/ticket/list.php b/htdocs/ticket/list.php index ad6ac18d386..402f3b717a4 100644 --- a/htdocs/ticket/list.php +++ b/htdocs/ticket/list.php @@ -208,9 +208,10 @@ $sql.=$hookmanager->resPrint; $sql=preg_replace('/, $/', '', $sql); $sql.= " FROM ".MAIN_DB_PREFIX.$object->table_element." as t"; if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label'])) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX.$object->table_element."_extrafields as ef on (t.rowid = ef.fk_object)"; +$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON (t.fk_soc = s.rowid)"; if ($object->ismultientitymanaged == 1) $sql.= " WHERE t.entity IN (".getEntity($object->element).")"; else $sql.=" WHERE 1 = 1"; -$sql.= " AND t.fk_soc = s.rowid"; + foreach($search as $key => $val) { From e3af373cd35bcf6c81b49c7300db1cf6cef8d210 Mon Sep 17 00:00:00 2001 From: Ludovic Canivet Date: Mon, 29 Apr 2019 15:43:34 +0200 Subject: [PATCH 4/4] Fix tms date format on ticket list --- htdocs/ticket/list.php | 1 + 1 file changed, 1 insertion(+) diff --git a/htdocs/ticket/list.php b/htdocs/ticket/list.php index 402f3b717a4..96af20dc591 100644 --- a/htdocs/ticket/list.php +++ b/htdocs/ticket/list.php @@ -638,6 +638,7 @@ while ($i < min($num, $limit)) elseif ($key == 'category_code') print $langs->getLabelFromKey($db, $object->category_code, 'c_ticket_category', 'code', 'label'); elseif ($key == 'severity_code') print $langs->getLabelFromKey($db, $object->severity_code, 'c_ticket_severity', 'code', 'label'); elseif ($key == 'type_code') print $langs->getLabelFromKey($db, $object->type_code, 'c_ticket_type', 'code', 'label'); + elseif ($key == 'tms') print dol_print_date($db->jdate($obj->$key), 'dayhour', 'tzuser'); elseif (in_array($val['type'], array('date','datetime','timestamp'))) print $object->showOutputField($val, $key, $db->jdate($obj->$key), ''); else print $object->showOutputField($val, $key, $obj->$key, ''); print '';