From 4e4f5faf057c871df8ecc425ef4c331c064bd35d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Mon, 12 Mar 2012 22:41:56 +0100 Subject: [PATCH] Allow to use the accounts and taxes of parent category issue1602 review271001 --- product.py | 32 ++++++++++++++++++++++++-------- 1 file changed, 24 insertions(+), 8 deletions(-) diff --git a/product.py b/product.py index 8a589ba4f9..0ff7ec88d9 100644 --- a/product.py +++ b/product.py @@ -13,32 +13,48 @@ class Category(ModelSQL, ModelView): ('company', '=', Eval('context', {}).get('company', 0)), ], states={ - 'invisible': ~Eval('context', {}).get('company'), - })) + 'invisible': (~Eval('context', {}).get('company') + | Eval('account_parent')), + }, + depends=['account_parent'])) account_stock_supplier = fields.Property(fields.Many2One('account.account', 'Account Stock Supplier', domain=[ ('kind', '!=', 'view'), ('company', '=', Eval('context', {}).get('company', 0)), ], states={ - 'invisible': ~Eval('context', {}).get('company'), - })) + 'invisible': (~Eval('context', {}).get('company') + | Eval('account_parent')), + }, + depends=['account_parent'])) account_stock_customer = fields.Property(fields.Many2One('account.account', 'Account Stock Customer', domain=[ ('kind', '!=', 'view'), ('company', '=', Eval('context', {}).get('company', 0)), ], states={ - 'invisible': ~Eval('context', {}).get('company'), - })) + 'invisible': (~Eval('context', {}).get('company') + | Eval('account_parent')), + }, + depends=['account_parent'])) account_stock_lost_found = fields.Property(fields.Many2One( 'account.account', 'Account Stock Lost and Found', domain=[ ('kind', '!=', 'view'), ('company', '=', Eval('context', {}).get('company', 0)), ], states={ - 'invisible': ~Eval('context', {}).get('company'), - })) + 'invisible': (~Eval('context', {}).get('company') + | Eval('account_parent')), + }, + depends=['account_parent'])) + account_stock_used = fields.Function(fields.Many2One('account.account', + 'Account Stock Used'), 'get_account') + account_stock_supplier_used = fields.Function(fields.Many2One( + 'account.account', 'Account Stock Supplier Used'), 'get_account') + account_stock_customer_used = fields.Function(fields.Many2One( + 'account.account', 'Account Stock Customer Used'), 'get_account') + account_stock_lost_found_used = fields.Function(fields.Many2One( + 'account.account', 'Account Stock Lost and Found'), 'get_account') Category()