Store directly sequence type to sequence
issue10122 review351381002
This commit is contained in:
+5
-3
@@ -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'])
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -78,7 +78,6 @@
|
||||
|
||||
<record model="ir.sequence.type" id="sequence_type_asset">
|
||||
<field name="name">Asset</field>
|
||||
<field name="code">account.asset</field>
|
||||
</record>
|
||||
<record model="ir.sequence.type-res.group"
|
||||
id="sequence_type_asset_group_admin">
|
||||
@@ -93,7 +92,7 @@
|
||||
|
||||
<record model="ir.sequence" id="sequence_asset">
|
||||
<field name="name">Asset</field>
|
||||
<field name="code">account.asset</field>
|
||||
<field name="sequence_type" ref="sequence_type_asset"/>
|
||||
</record>
|
||||
|
||||
<record model="ir.rule.group" id="rule_group_asset">
|
||||
|
||||
Reference in New Issue
Block a user