From d63e68bbcb510a46d1a16b4d930d5fe2a5aadf8b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Thu, 28 Aug 2025 13:51:07 +0200 Subject: [PATCH] Update box_last_modified_ticket.php (#35111) --- htdocs/core/boxes/box_last_modified_ticket.php | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/htdocs/core/boxes/box_last_modified_ticket.php b/htdocs/core/boxes/box_last_modified_ticket.php index 7016d62449c..30219438d5b 100644 --- a/htdocs/core/boxes/box_last_modified_ticket.php +++ b/htdocs/core/boxes/box_last_modified_ticket.php @@ -1,9 +1,9 @@ - * 2016 Christophe Battarel - * Copyright (C) 2019-2021 Frédéric France - * Copyright (C) 2024 MDW + * Copyright (C) 2016 Christophe Battarel + * Copyright (C) 2019-2025 Frédéric France + * Copyright (C) 2024 MDW * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -79,7 +79,8 @@ class box_last_modified_ticket extends ModeleBoxes ); if ($user->hasRight('ticket', 'read')) { - $sql = "SELECT t.rowid as id, t.ref, t.track_id, t.fk_soc, t.fk_user_create, t.fk_user_assign, t.subject, t.message, t.fk_statut as status, t.type_code, t.category_code, t.severity_code, t.datec, t.tms as datem, t.date_read, t.date_close, t.origin_email "; + $sql = "SELECT t.rowid as id, t.ref, t.track_id, t.fk_soc, t.fk_user_create, t.fk_user_assign, t.subject, t.message, t.fk_statut as status"; + $sql .= ", t.type_code, t.category_code, t.severity_code, t.datec, GREATEST(t.tms, tef.tms) as datem, t.date_read, t.date_close, t.origin_email "; $sql .= ", type.label as type_label, category.label as category_label, severity.label as severity_label"; $sql .= ", s.nom as company_name, s.email as socemail, s.client, s.fournisseur"; $sql .= " FROM ".MAIN_DB_PREFIX."ticket as t"; @@ -95,7 +96,7 @@ class box_last_modified_ticket extends ModeleBoxes $sql .= " AND t.fk_soc = ".((int) $user->socid); } - $sql .= " ORDER BY t.tms DESC, t.rowid DESC"; + $sql .= " ORDER BY datem DESC, t.rowid DESC"; $sql .= $this->db->plimit($max, 0); $resql = $this->db->query($sql); @@ -116,8 +117,6 @@ class box_last_modified_ticket extends ModeleBoxes $ticket->subject = $objp->subject; $ticket->date_creation = $datec; $ticket->date_modification = $datem; - //$ticket->fk_statut = $objp->status; - //$ticket->fk_statut = $objp->status; $ticket->status = $objp->status; $ticket->statut = $objp->status; if ($objp->fk_soc > 0) {