From 7b36123c19af45181c5b3f7fca481c04bef6fa02 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20=C3=89vrard?= Date: Thu, 13 Jun 2024 10:06:18 +0200 Subject: [PATCH] Order xxx2Many targets by id origin instead of order name [PREVIEW] https://bugs.tryton.org/12795 Fix PCLAS-950 --- trytond/trytond/model/fields/many2many.py | 5 ++++- trytond/trytond/model/fields/one2many.py | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/trytond/trytond/model/fields/many2many.py b/trytond/trytond/model/fields/many2many.py index 0a9bc355cf1..8fc7b9d1eb3 100644 --- a/trytond/trytond/model/fields/many2many.py +++ b/trytond/trytond/model/fields/many2many.py @@ -145,7 +145,10 @@ def get(self, ids, model, name, values=None): if (not isinstance(origin_field, Function) or hasattr(Relation, 'order_' + self.field)): - order = [(self.origin, None)] + if origin_field._type == 'reference': + order = [(self.origin, None)] + else: + order = [(self.origin + '.id', None)] else: order = [] if self.order is None: diff --git a/trytond/trytond/model/fields/one2many.py b/trytond/trytond/model/fields/one2many.py index 4858eae3c1e..82eafa20d0a 100644 --- a/trytond/trytond/model/fields/one2many.py +++ b/trytond/trytond/model/fields/one2many.py @@ -151,7 +151,10 @@ def get(self, ids, model, name, values=None): if (not isinstance(field, Function) or hasattr(Target, 'order_' + self.field)): - order = [(self.field, None)] + if field._type == 'reference': + order = [(self.field, None)] + else: + order = [(self.field + '.id', None)] else: order = [] if self.order: