From 809d9bc76c2dfe69d610d325f83ed932aacb20d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Wed, 14 Sep 2022 19:27:28 +0200 Subject: [PATCH] Order first by length field filled by sequence issue11638 review437311003 --- shipment.py | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/shipment.py b/shipment.py index bee40e80f4..5bf46c3058 100644 --- a/shipment.py +++ b/shipment.py @@ -8,6 +8,7 @@ from itertools import groupby from sql import Null from sql.conditionals import Coalesce +from sql.functions import CharLength from trytond.i18n import gettext from trytond.model import ModelSQL, ModelView, Workflow, dualmethod, fields @@ -288,6 +289,11 @@ class ShipmentIn(ShipmentMixin, Workflow, ModelSQL, ModelView): [sql_table.state], ['cancelled'], where=sql_table.state == 'cancel')) + @classmethod + def order_number(cls, tables): + table, _ = tables[None] + return [CharLength(table.number), table.number] + @classmethod def order_effective_date(cls, tables): table, _ = tables[None] @@ -724,6 +730,11 @@ class ShipmentInReturn(ShipmentAssignMixin, Workflow, ModelSQL, ModelView): [sql_table.state], ['cancelled'], where=sql_table.state == 'cancel')) + @classmethod + def order_number(cls, tables): + table, _ = tables[None] + return [CharLength(table.number), table.number] + @classmethod def order_effective_date(cls, tables): table, _ = tables[None] @@ -1158,6 +1169,11 @@ class ShipmentOut(ShipmentAssignMixin, Workflow, ModelSQL, ModelView): [sql_table.state], ['cancelled'], where=sql_table.state == 'cancel')) + @classmethod + def order_number(cls, tables): + table, _ = tables[None] + return [CharLength(table.number), table.number] + @classmethod def order_effective_date(cls, tables): table, _ = tables[None] @@ -1770,6 +1786,11 @@ class ShipmentOutReturn(ShipmentMixin, Workflow, ModelSQL, ModelView): # Migration from 6.4: remove required on contact_address table.not_null_action('contact_address', 'remove') + @classmethod + def order_number(cls, tables): + table, _ = tables[None] + return [CharLength(table.number), table.number] + @classmethod def order_effective_date(cls, tables): table, _ = tables[None] @@ -2290,6 +2311,11 @@ class ShipmentInternal(ShipmentAssignMixin, Workflow, ModelSQL, ModelView): [sql_table.state], ['cancelled'], where=sql_table.state == 'cancel')) + @classmethod + def order_number(cls, tables): + table, _ = tables[None] + return [CharLength(table.number), table.number] + @classmethod def order_effective_date(cls, tables): table, _ = tables[None]