diff --git a/account.py b/account.py
index 2aae7c18d8..13919f823c 100644
--- a/account.py
+++ b/account.py
@@ -4,7 +4,7 @@ from trytond import backend
from trytond.i18n import gettext
from trytond.model import ModelSQL, fields
from trytond.model.exceptions import AccessError
-from trytond.pyson import Eval, If, Bool
+from trytond.pyson import Eval, If, Bool, Id
from trytond.pool import PoolMeta, Pool
from trytond.tools.multivalue import migrate_property
from trytond.modules.company.model import CompanyValueMixin
@@ -50,7 +50,8 @@ class Configuration(metaclass=PoolMeta):
domain=[
('company', 'in', [
Eval('context', {}).get('company', -1), None]),
- ('code', '=', 'account.asset'),
+ ('sequence_type', '=',
+ Id('account_asset', 'sequence_type_asset')),
]))
asset_bymonthday = fields.MultiValue(asset_bymonthday)
asset_bymonth = fields.MultiValue(asset_bymonth)
@@ -91,7 +92,8 @@ class ConfigurationAssetSequence(ModelSQL, CompanyValueMixin):
'ir.sequence', "Asset Reference Sequence", required=True,
domain=[
('company', 'in', [Eval('company', -1), None]),
- ('code', '=', 'account.asset'),
+ ('sequence_type', '=',
+ Id('account_asset', 'sequence_type_asset')),
],
depends=['company'])
diff --git a/asset.py b/asset.py
index a879d4ab36..20d20607aa 100644
--- a/asset.py
+++ b/asset.py
@@ -638,14 +638,13 @@ class Asset(Workflow, ModelSQL, ModelView):
Fill the number field with asset sequence.
'''
pool = Pool()
- Sequence = pool.get('ir.sequence')
Config = pool.get('account.configuration')
config = Config(1)
for asset in assets:
if asset.number:
continue
- asset.number = Sequence.get_id(config.asset_sequence.id)
+ asset.number = config.asset_sequence.get()
cls.save(assets)
@classmethod
diff --git a/asset.xml b/asset.xml
index 72738419cb..6aacfb65f9 100644
--- a/asset.xml
+++ b/asset.xml
@@ -78,7 +78,6 @@
Asset
- account.asset
@@ -93,7 +92,7 @@
Asset
- account.asset
+