From 8f44c6b46a5564f39580e28a5960aa4e07310db5 Mon Sep 17 00:00:00 2001 From: Maxime Richez Date: Mon, 12 Feb 2024 23:22:23 +0100 Subject: [PATCH] Order journal by matching sequence when searching for match Journals are ordered by default by name instead of matching sequence. Closes #13001 (grafted from 8208738ff1889474331276024c531f914946856e) --HG-- branch : 7.0 --- modules/account/journal.py | 7 ++++++- modules/account/view/journal_tree.xml | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/modules/account/journal.py b/modules/account/journal.py index b22673ac3c..38ae0bcec7 100644 --- a/modules/account/journal.py +++ b/modules/account/journal.py @@ -156,7 +156,12 @@ class Journal( @classmethod def find(cls, pattern): - for journal in cls.search([]): + for journal in cls.search( + [], + order=[ + ('matching_sequence', 'ASC'), + ('id', 'ASC'), + ]): if journal.match(pattern): return journal diff --git a/modules/account/view/journal_tree.xml b/modules/account/view/journal_tree.xml index 37436cd6c1..6ba968cc75 100644 --- a/modules/account/view/journal_tree.xml +++ b/modules/account/view/journal_tree.xml @@ -1,7 +1,7 @@ - +