[tryton-commits] changeset in modules/sale:default Store directly sequence type t...

[Cédric Krier]

changeset 303fc74af291 in modules/sale:default
details: https://hg.tryton.org/modules/sale?cmd=changeset;node=303fc74af291
description:
        Store directly sequence type to sequence

        issue10122
        review351381002
diffstat:

 configuration.py |  6 +++---
 sale.py          |  3 +--
 sale.xml         |  3 +--
 3 files changed, 5 insertions(+), 7 deletions(-)

diffs (69 lines):

diff -r 6ee041520377 -r 303fc74af291 configuration.py
--- a/configuration.py  Sun Mar 07 12:43:09 2021 +0100
+++ b/configuration.py  Thu Mar 11 23:00:10 2021 +0100
@@ -4,7 +4,7 @@
 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 @@
             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 @@
         '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 -r 6ee041520377 -r 303fc74af291 sale.py
--- a/sale.py   Sun Mar 07 12:43:09 2021 +0100
+++ b/sale.py   Thu Mar 11 23:00:10 2021 +0100
@@ -761,14 +761,13 @@
         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 -r 6ee041520377 -r 303fc74af291 sale.xml
--- a/sale.xml  Sun Mar 07 12:43:09 2021 +0100
+++ b/sale.xml  Thu Mar 11 23:00:10 2021 +0100
@@ -362,7 +362,6 @@
 
         <record model="ir.sequence.type" id="sequence_type_sale">
             <field name="name">Sale</field>
-            <field name="code">sale.sale</field>
         </record>
         <record model="ir.sequence.type-res.group"
             id="sequence_type_sale_group_admin">
@@ -377,7 +376,7 @@
 
         <record model="ir.sequence" id="sequence_sale">
             <field name="name">Sale</field>
-            <field name="code">sale.sale</field>
+            <field name="sequence_type" ref="sequence_type_sale"/>
         </record>
 
         <record model="ir.action.report" id="report_sale">