Use the same domain for stock account on MultiValue than ModelStorage
issue10996 review393101002 (grafted from 132804bc63514f42bcc05f07b85afae52621d2fe) --HG-- branch : 6.0
This commit is contained in:
1 parent
74a2e198b5
commit
4e72686ec2
1 file changed
+6
-9
+6
-9
@@ -22,9 +22,7 @@ class Category(metaclass=PoolMeta):
|
||||
domain=[
|
||||
('closed', '!=', True),
|
||||
('type.stock', '=', True),
|
||||
('id', 'not in', [
|
||||
Eval('account_stock_in', -1),
|
||||
Eval('account_stock_out', -1)]),
|
||||
('type.statement', '=', 'balance'),
|
||||
('company', '=', Eval('context', {}).get('company', -1)),
|
||||
],
|
||||
states={
|
||||
@@ -32,14 +30,13 @@ class Category(metaclass=PoolMeta):
|
||||
| Eval('account_parent')
|
||||
| ~Eval('accounting', False)),
|
||||
},
|
||||
depends=['account_parent', 'accounting',
|
||||
'account_stock_in', 'account_stock_out']))
|
||||
depends=['account_parent', 'accounting']))
|
||||
account_stock_in = fields.MultiValue(fields.Many2One(
|
||||
'account.account', "Account Stock IN",
|
||||
domain=[
|
||||
('closed', '!=', True),
|
||||
('type.stock', '=', True),
|
||||
('id', '!=', Eval('account_stock', -1)),
|
||||
('type.statement', '=', 'income'),
|
||||
('company', '=', Eval('context', {}).get('company', -1)),
|
||||
],
|
||||
states={
|
||||
@@ -47,13 +44,13 @@ class Category(metaclass=PoolMeta):
|
||||
| Eval('account_parent')
|
||||
| ~Eval('accounting', False)),
|
||||
},
|
||||
depends=['account_parent', 'accounting', 'account_stock']))
|
||||
depends=['account_parent', 'accounting']))
|
||||
account_stock_out = fields.MultiValue(fields.Many2One(
|
||||
'account.account', "Account Stock OUT",
|
||||
domain=[
|
||||
('closed', '!=', True),
|
||||
('type.stock', '=', True),
|
||||
('id', '!=', Eval('account_stock', -1)),
|
||||
('type.statement', '=', 'income'),
|
||||
('company', '=', Eval('context', {}).get('company', -1)),
|
||||
],
|
||||
states={
|
||||
@@ -61,7 +58,7 @@ class Category(metaclass=PoolMeta):
|
||||
| Eval('account_parent')
|
||||
| ~Eval('accounting', False)),
|
||||
},
|
||||
depends=['account_parent', 'accounting', 'account_stock']))
|
||||
depends=['account_parent', 'accounting']))
|
||||
|
||||
@classmethod
|
||||
def multivalue_model(cls, field):
|
||||
|
||||
Reference in new issue
Block a user