Order cancelled document without number last

Closes #12899

modules/account_invoice/invoice.py

@@ -490,7 +490,9 @@ class Invoice(Workflow, ModelSQL, ModelView, TaxableMixin, InvoiceReportMixin):
     @classmethod
     def order_number(cls, tables):
         table, _ = tables[None]
-        return [CharLength(table.number), table.number]
+        return [
+            ~((table.state == 'cancelled') & (table.number == Null)),
+            CharLength(table.number), table.number]
 
     @staticmethod
     def default_type():

modules/production/production.py

@@ -5,6 +5,7 @@ from datetime import timedelta
 from decimal import Decimal
 from itertools import chain, groupby
 
+from sql import Null
 from sql.conditionals import Coalesce
 from sql.functions import CharLength
 
@@ -282,7 +283,9 @@ class Production(ShipmentAssignMixin, Workflow, ModelSQL, ModelView):
     @classmethod
     def order_number(cls, tables):
         table, _ = tables[None]
-        return [CharLength(table.number), table.number]
+        return [
+            ~((table.state == 'cancelled') & (table.number == Null)),
+            CharLength(table.number), table.number]
 
     @classmethod
     def order_effective_date(cls, tables):

modules/purchase/purchase.py

@@ -5,7 +5,7 @@ from collections import defaultdict
 from decimal import Decimal
 from itertools import chain, groupby
 
-from sql import Literal
+from sql import Literal, Null
 from sql.aggregate import Count
 from sql.functions import CharLength
 
@@ -349,7 +349,9 @@ class Purchase(
     @classmethod
     def order_number(cls, tables):
         table, _ = tables[None]
-        return [CharLength(table.number), table.number]
+        return [
+            ~((table.state == 'cancelled') & (table.number == Null)),
+            CharLength(table.number), table.number]
 
     @classmethod
     def default_warehouse(cls):

modules/purchase_blanket_agreement/purchase.py

@@ -5,6 +5,7 @@ import functools
 from decimal import Decimal
 from itertools import groupby
 
+from sql import Null
 from sql.functions import CharLength
 
 from trytond.i18n import gettext
@@ -250,7 +251,9 @@ class BlanketAgreement(Workflow, ModelSQL, ModelView):
     @classmethod
     def order_number(cls, tables):
         table, _ = tables[None]
-        return [CharLength(table.number), table.number]
+        return [
+            ~((table.state == 'cancelled') & (table.state == Null)),
+            CharLength(table.number), table.number]
 
     @classmethod
     def default_currency(cls, **pattern):

modules/purchase_request_quotation/purchase.py

@@ -4,6 +4,7 @@ import datetime
 from functools import wraps
 from itertools import groupby
 
+from sql import Null
 from sql.conditionals import Case
 from sql.functions import CharLength
 
@@ -178,7 +179,9 @@ class Quotation(Workflow, ModelSQL, ModelView):
     @classmethod
     def order_number(cls, tables):
         table, _ = tables[None]
-        return [CharLength(table.number), table.number]
+        return [
+            ~((table.state == 'cancelled') & (table.number == Null)),
+            CharLength(table.number), table.number]
 
     @classmethod
     def default_company(cls):

modules/purchase_requisition/purchase.py

@@ -3,6 +3,7 @@
 from decimal import Decimal
 from itertools import chain
 
+from sql import Null
 from sql.functions import CharLength
 
 from trytond.i18n import gettext
@@ -206,7 +207,9 @@ class PurchaseRequisition(Workflow, ModelSQL, ModelView):
     @classmethod
     def order_number(cls, tables):
         table, _ = tables[None]
-        return [CharLength(table.number), table.number]
+        return [
+            ~((table.state == 'cancelled') & (table.number == Null)),
+            CharLength(table.number), table.number]
 
     @classmethod
     def default_state(cls):

modules/sale/sale.py

@@ -6,6 +6,7 @@ from decimal import Decimal
 from functools import partial
 from itertools import chain, groupby
 
+from sql import Null
 from sql.functions import CharLength
 
 from trytond.i18n import gettext
@@ -391,7 +392,9 @@ class Sale(
     @classmethod
     def order_number(cls, tables):
         table, _ = tables[None]
-        return [CharLength(table.number), table.number]
+        return [
+            ~((table.state == 'cancelled') & (table.number == Null)),
+            CharLength(table.number), table.number]
 
     @classmethod
     def default_payment_term(cls, **pattern):

modules/sale_blanket_agreement/sale.py

@@ -5,6 +5,7 @@ import functools
 from decimal import Decimal
 from itertools import groupby
 
+from sql import Null
 from sql.functions import CharLength
 
 from trytond.i18n import gettext
@@ -251,7 +252,9 @@ class BlanketAgreement(Workflow, ModelSQL, ModelView):
     @classmethod
     def order_number(cls, tables):
         table, _ = tables[None]
-        return [CharLength(table.number), table.number]
+        return [
+            ~((table.state == 'cancelled') & (table.number == Null)),
+            CharLength(table.number), table.number]
 
     @classmethod
     def default_currency(cls, **pattern):

modules/sale_complaint/complaint.py

@@ -4,6 +4,7 @@
 from collections import defaultdict
 from decimal import Decimal
 
+from sql import Null
 from sql.functions import CharLength
 
 from trytond.i18n import gettext
@@ -215,7 +216,9 @@ class Complaint(Workflow, ModelSQL, ModelView):
     @classmethod
     def order_number(cls, tables):
         table, _ = tables[None]
-        return [CharLength(table.number), table.number]
+        return [
+            ~((table.state == 'cancelled') & (table.number == Null)),
+            CharLength(table.number), table.number]
 
     @staticmethod
     def default_date():

modules/sale_point/sale.py

@@ -3,7 +3,7 @@
 from collections import defaultdict
 from decimal import Decimal
 
-from sql import Literal, Union
+from sql import Literal, Null, Union
 from sql.aggregate import Sum
 from sql.conditionals import Coalesce
 from sql.functions import CharLength
@@ -208,7 +208,9 @@ class POSSale(Workflow, ModelSQL, ModelView, TaxableMixin):
     @classmethod
     def order_number(cls, tables):
         table, _ = tables[None]
-        return [CharLength(table.number), table.number]
+        return [
+            ~((table.state == 'cancelled') & (table.number == Null)),
+            CharLength(table.number), table.number]
 
     @classmethod
     def default_company(cls):

modules/sale_subscription/subscription.py

@@ -226,7 +226,9 @@ class Subscription(Workflow, ModelSQL, ModelView):
     @classmethod
     def order_number(cls, tables):
         table, _ = tables[None]
-        return [CharLength(table.number), table.number]
+        return [
+            ~((table.state == 'cancelled') & (table.number == Null)),
+            CharLength(table.number), table.number]
 
     @classmethod
     def default_company(cls):

modules/stock/inventory.py

@@ -2,6 +2,7 @@
 # this repository contains the full copyright notices and license terms.
 from collections import defaultdict
 
+from sql import Null
 from sql.functions import CharLength
 
 from trytond.i18n import gettext
@@ -115,7 +116,9 @@ class Inventory(Workflow, ModelSQL, ModelView):
     @classmethod
     def order_number(cls, tables):
         table, _ = tables[None]
-        return [CharLength(table.number), table.number]
+        return [
+            ~((table.state == 'cancelled') & (table.number == Null)),
+            CharLength(table.number), table.number]
 
     @staticmethod
     def default_state():

modules/stock/shipment.py

@@ -76,7 +76,9 @@ class ShipmentMixin:
     @classmethod
     def order_number(cls, tables):
         table, _ = tables[None]
-        return [CharLength(table.number), table.number]
+        return [
+            ~((table.state == 'cancelled') & (table.number == Null)),
+            CharLength(table.number), table.number]
 
     @classmethod
     def order_effective_date(cls, tables):