changeset 7fb2bfb52117 in trytond:5.6 details: https://hg.tryton.org/trytond?cmd=changeset&node=7fb2bfb52117 description: Use order definition of xxx2Many fields
When empty it must be the order of the target and it must not be encoded as it can not be PYSON. issue10297 review349721004 (grafted from 6df8df6c6c4d3fdfdf8b20d18ae3b2d01181ca4f) diffstat: trytond/model/fields/many2many.py | 4 ++-- trytond/model/fields/one2many.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diffs (27 lines): diff -r 4205d80d5fa7 -r 7fb2bfb52117 trytond/model/fields/many2many.py --- a/trytond/model/fields/many2many.py Wed May 05 22:41:35 2021 +0200 +++ b/trytond/model/fields/many2many.py Wed Apr 21 23:47:30 2021 +0200 @@ -468,8 +468,8 @@ definition['search_context'] = encoder.encode(self.search_context) definition['search_order'] = encoder.encode(self.search_order) definition['sortable'] &= hasattr(model, 'order_' + self.name) - definition['order'] = encoder.encode( - getattr(model, '_order', None) + definition['order'] = ( + getattr(self.get_target(), '_order', None) if self.order is None else self.order) if self.size is not None: definition['size'] = encoder.encode(self.size) diff -r 4205d80d5fa7 -r 7fb2bfb52117 trytond/model/fields/one2many.py --- a/trytond/model/fields/one2many.py Wed May 05 22:41:35 2021 +0200 +++ b/trytond/model/fields/one2many.py Wed Apr 21 23:47:30 2021 +0200 @@ -361,7 +361,7 @@ if self.size is not None: definition['size'] = encoder.encode(self.size) definition['sortable'] &= hasattr(model, 'order_' + self.name) - definition['order'] = encoder.encode( - getattr(model, '_order', None) + definition['order'] = ( + getattr(self.get_target(), '_order', None) if self.order is None else self.order) return definition