changeset 8ab99d670fe6 in modules/account_stock_continental:6.2
details:
https://hg.tryton.org/modules/account_stock_continental?cmd=changeset&node=8ab99d670fe6
description:
Use the same domain for stock account on MultiValue than ModelStorage
issue10996
review393101002
(grafted from 132804bc63514f42bcc05f07b85afae52621d2fe)
diffstat:
product.py | 15 ++++++---------
1 files changed, 6 insertions(+), 9 deletions(-)
diffs (56 lines):
diff -r c6a3356106e7 -r 8ab99d670fe6 product.py
--- a/product.py Fri Dec 10 22:22:52 2021 +0100
+++ b/product.py Fri Dec 10 22:28:35 2021 +0100
@@ -22,9 +22,7 @@
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 @@
| 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 @@
| 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 @@
| Eval('account_parent')
| ~Eval('accounting', False)),
},
- depends=['account_parent', 'accounting', 'account_stock']))
+ depends=['account_parent', 'accounting']))
@classmethod
def multivalue_model(cls, field):
