changeset ae25dcd2736b in modules/stock:default
details: https://hg.tryton.org/modules/stock?cmd=changeset;node=ae25dcd2736b
description:
Store directly sequence type to sequence
issue10122
review351381002
diffstat:
configuration.py | 38 +++++++++++++++++++++++++-------------
inventory.py | 5 ++---
inventory.xml | 3 +--
shipment.py | 23 +++++++++--------------
shipment.xml | 27 +++++++++++----------------
5 files changed, 48 insertions(+), 48 deletions(-)
diffs (346 lines):
diff -r 4e6eb11ec091 -r ae25dcd2736b 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)
@@ -51,7 +51,8 @@
domain=[
('company', 'in',
[Eval('context', {}).get('company', -1), None]),
- ('code', '=', 'stock.shipment.in'),
+ ('sequence_type', '=',
+ Id('stock', 'sequence_type_shipment_in')),
],
help="Used to generate the number given to supplier shipments."))
shipment_in_return_sequence = fields.MultiValue(fields.Many2One(
@@ -59,7 +60,8 @@
domain=[
('company', 'in',
[Eval('context', {}).get('company', -1), None]),
- ('code', '=', 'stock.shipment.in.return'),
+ ('sequence_type', '=',
+ Id('stock', 'sequence_type_shipment_in_return')),
],
help="Used to generate the number given to supplier return "
"shipments."))
@@ -68,7 +70,8 @@
domain=[
('company', 'in',
[Eval('context', {}).get('company', -1), None]),
- ('code', '=', 'stock.shipment.out'),
+ ('sequence_type', '=',
+ Id('stock', 'sequence_type_shipment_out')),
],
help="Used to generate the number given to customer "
"shipments."))
@@ -77,7 +80,8 @@
domain=[
('company', 'in',
[Eval('context', {}).get('company', -1), None]),
- ('code', '=', 'stock.shipment.out.return'),
+ ('sequence_type', '=',
+ Id('stock', 'sequence_type_shipment_out_return')),
],
help="Used to generate the number given to customer return "
"shipments."))
@@ -86,7 +90,8 @@
domain=[
('company', 'in',
[Eval('context', {}).get('company', -1), None]),
- ('code', '=', 'stock.shipment.internal'),
+ ('sequence_type', '=',
+ Id('stock', 'sequence_type_shipment_internal')),
],
help="Used to generate the number given to internal "
"shipments."))
@@ -95,7 +100,8 @@
domain=[
('company', 'in',
[Eval('context', {}).get('company', -1), None]),
- ('code', '=', 'stock.inventory'),
+ ('sequence_type', '=',
+ Id('stock', 'sequence_type_inventory')),
],
help="Used to generate the number given to inventories."))
shipment_internal_transit = fields.MultiValue(shipment_internal_transit)
@@ -129,42 +135,48 @@
'ir.sequence', "Supplier Shipment Sequence", required=True,
domain=[
('company', 'in', [Eval('company', -1), None]),
- ('code', '=', 'stock.shipment.in'),
+ ('sequence_type', '=',
+ Id('stock', 'sequence_type_shipment_in')),
],
depends=['company'])
shipment_in_return_sequence = fields.Many2One(
'ir.sequence', "Supplier Return Shipment Sequence", required=True,
domain=[
('company', 'in', [Eval('company', -1), None]),
- ('code', '=', 'stock.shipment.in.return'),
+ ('sequence_type', '=',
+ Id('stock', 'sequence_type_shipment_in_return')),
],
depends=['company'])
shipment_out_sequence = fields.Many2One(
'ir.sequence', "Customer Shipment Sequence", required=True,
domain=[
('company', 'in', [Eval('company', -1), None]),
- ('code', '=', 'stock.shipment.out'),
+ ('sequence_type', '=',
+ Id('stock', 'sequence_type_shipment_out')),
],
depends=['company'])
shipment_out_return_sequence = fields.Many2One(
'ir.sequence', "Customer Return Shipment Sequence", required=True,
domain=[
('company', 'in', [Eval('company', -1), None]),
- ('code', '=', 'stock.shipment.out.return'),
+ ('sequence_type', '=',
+ Id('stock', 'sequence_type_shipment_out_return')),
],
depends=['company'])
shipment_internal_sequence = fields.Many2One(
'ir.sequence', "Internal Shipment Sequence", required=True,
domain=[
('company', 'in', [Eval('company', -1), None]),
- ('code', '=', 'stock.shipment.internal'),
+ ('sequence_type', '=',
+ Id('stock', 'sequence_type_shipment_internal')),
],
depends=['company'])
inventory_sequence = fields.Many2One(
'ir.sequence', "Inventory Sequence", required=True,
domain=[
('company', 'in', [Eval('company', -1), None]),
- ('code', '=', 'stock.inventory'),
+ ('sequence_type', '=',
+ Id('stock', 'sequence_type_inventory')),
],
depends=['company'])
diff -r 4e6eb11ec091 -r ae25dcd2736b inventory.py
--- a/inventory.py Sun Mar 07 12:43:09 2021 +0100
+++ b/inventory.py Thu Mar 11 23:00:10 2021 +0100
@@ -204,14 +204,13 @@
@classmethod
def create(cls, vlist):
pool = Pool()
- Sequence = pool.get('ir.sequence')
Configuration = pool.get('stock.configuration')
config = Configuration(1)
vlist = [x.copy() for x in vlist]
for values in vlist:
if values.get('number') is None:
- values['number'] = Sequence.get_id(
- config.inventory_sequence.id)
+ values['number'] = (
+ config.inventory_sequence.get())
inventories = super(Inventory, cls).create(vlist)
cls.complete_lines(inventories, fill=False)
return inventories
diff -r 4e6eb11ec091 -r ae25dcd2736b inventory.xml
--- a/inventory.xml Sun Mar 07 12:43:09 2021 +0100
+++ b/inventory.xml Thu Mar 11 23:00:10 2021 +0100
@@ -158,7 +158,6 @@
<record model="ir.sequence.type" id="sequence_type_inventory">
<field name="name">Inventory</field>
- <field name="code">stock.inventory</field>
</record>
<record model="ir.sequence.type-res.group"
id="sequence_type_inventory_group_admin">
@@ -173,7 +172,7 @@
<record model="ir.sequence" id="sequence_inventory">
<field name="name">Inventory</field>
- <field name="code">stock.inventory</field>
+ <field name="sequence_type" ref="sequence_type_inventory"/>
</record>
</data>
diff -r 4e6eb11ec091 -r ae25dcd2736b shipment.py
--- a/shipment.py Sun Mar 07 12:43:09 2021 +0100
+++ b/shipment.py Thu Mar 11 23:00:10 2021 +0100
@@ -380,14 +380,13 @@
@classmethod
def create(cls, vlist):
pool = Pool()
- Sequence = pool.get('ir.sequence')
Config = pool.get('stock.configuration')
vlist = [x.copy() for x in vlist]
config = Config(1)
for values in vlist:
if values.get('number') is None:
- values['number'] = Sequence.get_id(config.shipment_in_sequence)
+ values['number'] = config.shipment_in_sequence.get()
shipments = super(ShipmentIn, cls).create(vlist)
cls._set_move_planned_date(shipments)
return shipments
@@ -728,15 +727,14 @@
@classmethod
def create(cls, vlist):
pool = Pool()
- Sequence = pool.get('ir.sequence')
Config = pool.get('stock.configuration')
vlist = [x.copy() for x in vlist]
config = Config(1)
for values in vlist:
if values.get('number') is None:
- values['number'] = Sequence.get_id(
- config.shipment_in_return_sequence.id)
+ values['number'] = (
+ config.shipment_in_return_sequence.get())
shipments = super(ShipmentInReturn, cls).create(vlist)
cls._set_move_planned_date(shipments)
return shipments
@@ -1406,15 +1404,14 @@
@classmethod
def create(cls, vlist):
pool = Pool()
- Sequence = pool.get('ir.sequence')
Config = pool.get('stock.configuration')
vlist = [x.copy() for x in vlist]
config = Config(1)
for values in vlist:
if values.get('number') is None:
- values['number'] = Sequence.get_id(
- config.shipment_out_sequence.id)
+ values['number'] = (
+ config.shipment_out_sequence.get())
shipments = super(ShipmentOut, cls).create(vlist)
cls._set_move_planned_date(shipments)
return shipments
@@ -1798,15 +1795,14 @@
@classmethod
def create(cls, vlist):
pool = Pool()
- Sequence = pool.get('ir.sequence')
Config = pool.get('stock.configuration')
vlist = [x.copy() for x in vlist]
config = Config(1)
for values in vlist:
if values.get('number') is None:
- values['number'] = Sequence.get_id(
- config.shipment_out_return_sequence.id)
+ values['number'] = (
+ config.shipment_out_return_sequence.get())
shipments = super(ShipmentOutReturn, cls).create(vlist)
cls._set_move_planned_date(shipments)
return shipments
@@ -2259,15 +2255,14 @@
@classmethod
def create(cls, vlist):
pool = Pool()
- Sequence = pool.get('ir.sequence')
Config = pool.get('stock.configuration')
vlist = [x.copy() for x in vlist]
config = Config(1)
for values in vlist:
if values.get('number') is None:
- values['number'] = Sequence.get_id(
- config.shipment_internal_sequence.id)
+ values['number'] = (
+ config.shipment_internal_sequence.get())
shipments = super().create(vlist)
cls._set_move_planned_date(shipments)
return shipments
diff -r 4e6eb11ec091 -r ae25dcd2736b shipment.xml
--- a/shipment.xml Sun Mar 07 12:43:09 2021 +0100
+++ b/shipment.xml Thu Mar 11 23:00:10 2021 +0100
@@ -400,7 +400,6 @@
<!-- Sequence shipment out -->
<record model="ir.sequence.type" id="sequence_type_shipment_out">
<field name="name">Customer Shipment</field>
- <field name="code">stock.shipment.out</field>
</record>
<record model="ir.sequence.type-res.group"
id="sequence_type_shipment_out_group_admin">
@@ -414,13 +413,12 @@
</record>
<record model="ir.sequence" id="sequence_shipment_out">
- <field name="name">Customer Shipment</field>
- <field name="code">stock.shipment.out</field>
+ <field name="name">Customer Shipment</field>
+ <field name="sequence_type" ref="sequence_type_shipment_out"/>
</record>
<record model="ir.sequence.type" id="sequence_type_shipment_in">
<field name="name">Supplier Shipment</field>
- <field name="code">stock.shipment.in</field>
</record>
<record model="ir.sequence.type-res.group"
id="sequence_type_shipment_in_group_admin">
@@ -434,13 +432,12 @@
</record>
<record model="ir.sequence" id="sequence_shipment_in">
- <field name="name">Supplier Shipment</field>
- <field name="code">stock.shipment.in</field>
+ <field name="name">Supplier Shipment</field>
+ <field name="sequence_type" ref="sequence_type_shipment_in"/>
</record>
<record model="ir.sequence.type" id="sequence_type_shipment_internal">
<field name="name">Internal Shipment</field>
- <field name="code">stock.shipment.internal</field>
</record>
<record model="ir.sequence.type-res.group"
id="sequence_type_shipment_internal_group_admin">
@@ -454,13 +451,12 @@
</record>
<record model="ir.sequence" id="sequence_shipment_internal">
- <field name="name">Internal Shipment</field>
- <field name="code">stock.shipment.internal</field>
+ <field name="name">Internal Shipment</field>
+ <field name="sequence_type" ref="sequence_type_shipment_internal"/>
</record>
<record model="ir.sequence.type"
id="sequence_type_shipment_out_return">
<field name="name">Customer Return Shipment</field>
- <field name="code">stock.shipment.out.return</field>
</record>
<record model="ir.sequence.type-res.group"
id="sequence_type_shipment_out_return_group_admin">
@@ -474,14 +470,13 @@
</record>
<record model="ir.sequence" id="sequence_shipment_out_return">
- <field name="name">Customer Return Shipment</field>
- <field name="code">stock.shipment.out.return</field>
+ <field name="name">Customer Return Shipment</field>
+ <field name="sequence_type"
ref="sequence_type_shipment_out_return"/>
</record>
<!-- Sequence shipment in return -->
<record model="ir.sequence.type" id="sequence_type_shipment_in_return">
- <field name="name">Supplier Return Shipment</field>
- <field name="code">stock.shipment.in.return</field>
+ <field name="name">Supplier Return Shipment</field>
</record>
<record model="ir.sequence.type-res.group"
id="sequence_type_shipment_in_return_group_admin">
@@ -495,8 +490,8 @@
</record>
<record model="ir.sequence" id="sequence_shipment_in_return">
- <field name="name">Supplier Return Shipment</field>
- <field name="code">stock.shipment.in.return</field>
+ <field name="name">Supplier Return Shipment</field>
+ <field name="sequence_type"
ref="sequence_type_shipment_in_return"/>
</record>
<record model="ir.model.access" id="access_shipment_in">
