From dca61f06a3edbd7bcf795748c1d003cf4e5b3aea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Thu, 11 Mar 2021 23:00:10 +0100 Subject: [PATCH] Store directly sequence type to sequence issue10122 review351381002 --- configuration.py | 6 +++--- sale.py | 3 +-- sale.xml | 3 +-- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/configuration.py b/configuration.py index 5685118d14..6a1ec87a77 100644 --- a/configuration.py +++ b/configuration.py @@ -4,7 +4,7 @@ from trytond import backend from trytond.model import (ModelView, ModelSQL, ModelSingleton, ValueMixin, fields) from trytond.pool import Pool -from trytond.pyson import Eval +from trytond.pyson import Eval, Id from trytond.tools.multivalue import migrate_property from trytond.modules.company.model import ( CompanyMultiValueMixin, CompanyValueMixin) @@ -42,7 +42,7 @@ class Configuration( domain=[ ('company', 'in', [Eval('context', {}).get('company', -1), None]), - ('code', '=', 'sale.sale'), + ('sequence_type', '=', Id('sale', 'sequence_type_sale')), ])) sale_invoice_method = fields.MultiValue(sale_invoice_method) get_sale_invoice_methods = get_sale_methods('invoice_method') @@ -74,7 +74,7 @@ class ConfigurationSequence(ModelSQL, CompanyValueMixin): 'ir.sequence', "Sale Sequence", required=True, domain=[ ('company', 'in', [Eval('company', -1), None]), - ('code', '=', 'sale.sale'), + ('sequence_type', '=', Id('sale', 'sequence_type_sale')), ], depends=['company']) diff --git a/sale.py b/sale.py index 63ade066bc..cd84884440 100644 --- a/sale.py +++ b/sale.py @@ -761,14 +761,13 @@ class Sale( Fill the number field with the sale sequence ''' pool = Pool() - Sequence = pool.get('ir.sequence') Config = pool.get('sale.configuration') config = Config(1) for sale in sales: if sale.number: continue - sale.number = Sequence.get_id(config.sale_sequence.id) + sale.number = config.sale_sequence.get() cls.save(sales) @classmethod diff --git a/sale.xml b/sale.xml index dc7d2fb00b..9c8166a8f9 100644 --- a/sale.xml +++ b/sale.xml @@ -362,7 +362,6 @@ this repository contains the full copyright notices and license terms. --> Sale - sale.sale @@ -377,7 +376,7 @@ this repository contains the full copyright notices and license terms. --> Sale - sale.sale +