changeset 792a32cbc685 in modules/account_product:default
details:
https://hg.tryton.org/modules/account_product?cmd=changeset&node=792a32cbc685
description:
Send only the required fields when fetching a readonly view definition
issue11134
review380081002
diffstat:
account.py | 6 ++----
analytic_account.py | 4 ++--
configuration.py | 6 ++----
product.py | 24 ++++++------------------
4 files changed, 12 insertions(+), 28 deletions(-)
diffs (164 lines):
diff -r a7048a900dc9 -r 792a32cbc685 account.py
--- a/account.py Wed Apr 06 23:37:42 2022 +0200
+++ b/account.py Fri Apr 08 19:07:12 2022 +0200
@@ -15,16 +15,14 @@
('closed', '!=', True),
('type.expense', '=', True),
('company', '=', Eval('company')),
- ],
- depends=['company'])
+ ])
category_account_revenue = fields.Many2One(
'account.account', 'Default Revenue Account',
domain=[
('closed', '!=', True),
('type.revenue', '=', True),
('company', '=', Eval('company')),
- ],
- depends=['company'])
+ ])
class CreateChart(metaclass=PoolMeta):
diff -r a7048a900dc9 -r 792a32cbc685 analytic_account.py
--- a/analytic_account.py Wed Apr 06 23:37:42 2022 +0200
+++ b/analytic_account.py Fri Apr 08 19:07:12 2022 +0200
@@ -13,13 +13,13 @@
context={
'company': Eval('company', -1),
},
- depends=['company'])
+ depends={'company'})
product_category = fields.Many2One(
'product.category', "Product Category", ondelete='CASCADE',
context={
'company': Eval('company', -1),
},
- depends=['company'])
+ depends={'company'})
def match(self, pattern):
if 'product_categories' in pattern:
diff -r a7048a900dc9 -r 792a32cbc685 configuration.py
--- a/configuration.py Wed Apr 06 23:37:42 2022 +0200
+++ b/configuration.py Fri Apr 08 19:07:12 2022 +0200
@@ -37,12 +37,10 @@
domain=[
('type.expense', '=', True),
('company', '=', Eval('company', -1)),
- ],
- depends=['company'])
+ ])
default_category_account_revenue = fields.Many2One(
'account.account', "Default Account Revenue",
domain=[
('type.revenue', '=', True),
('company', '=', Eval('company', -1)),
- ],
- depends=['company'])
+ ])
diff -r a7048a900dc9 -r 792a32cbc685 product.py
--- a/product.py Wed Apr 06 23:37:42 2022 +0200
+++ b/product.py Fri Apr 08 19:07:12 2022 +0200
@@ -59,13 +59,11 @@
states={
'readonly': Bool(Eval('childs', [0])) | Bool(Eval('parent')),
},
- depends=['parent'],
help="Check to indicate the category is used for accounting.")
account_parent = fields.Boolean('Use Parent\'s accounts',
states={
'invisible': ~Eval('accounting', False),
},
- depends=['accounting'],
help="Use the accounts defined on the parent category.")
accounts = fields.One2Many(
'product.category.account', 'category', "Accounts")
@@ -79,8 +77,7 @@
'invisible': (~Eval('context', {}).get('company')
| Eval('account_parent')
| ~Eval('accounting', False)),
- },
- depends=['account_parent', 'accounting']))
+ }))
account_revenue = fields.MultiValue(fields.Many2One('account.account',
'Account Revenue', domain=[
('closed', '!=', True),
@@ -91,13 +88,11 @@
'invisible': (~Eval('context', {}).get('company')
| Eval('account_parent')
| ~Eval('accounting', False)),
- },
- depends=['account_parent', 'accounting']))
+ }))
taxes_parent = fields.Boolean('Use the Parent\'s Taxes',
states={
'invisible': ~Eval('accounting', False),
},
- depends=['accounting'],
help="Use the taxes defined on the parent category.")
customer_taxes = fields.Many2Many('product.category-customer-account.tax',
'category', 'tax', 'Customer Taxes',
@@ -111,7 +106,6 @@
| Eval('taxes_parent')
| ~Eval('accounting', False)),
},
- depends=['taxes_parent', 'accounting'],
help="The taxes to apply when selling products of this category.")
supplier_taxes = fields.Many2Many('product.category-supplier-account.tax',
'category', 'tax', 'Supplier Taxes',
@@ -125,7 +119,6 @@
| Eval('taxes_parent')
| ~Eval('accounting', False)),
},
- depends=['taxes_parent', 'accounting'],
help="The taxes to apply when purchasing products of this category.")
supplier_taxes_deductible_rate = fields.Numeric(
"Supplier Taxes Deductible Rate", digits=(14, 10),
@@ -136,8 +129,7 @@
states={
'invisible': (
Eval('taxes_parent') | ~Eval('accounting', False)),
- },
- depends=['taxes_parent', 'accounting'])
+ })
customer_taxes_used = fields.Function(fields.Many2Many(
'account.tax', None, None, "Customer Taxes Used"), 'get_taxes')
supplier_taxes_used = fields.Function(fields.Many2Many(
@@ -149,11 +141,9 @@
cls.parent.domain = [
('accounting', '=', Eval('accounting', False)),
cls.parent.domain or []]
- cls.parent.depends.append('accounting')
cls.parent.states['required'] = Or(
cls.parent.states.get('required', False),
Eval('account_parent', False) | Eval('taxes_parent', False))
- cls.parent.depends.extend(['account_parent', 'taxes_parent'])
@classmethod
def multivalue_model(cls, field):
@@ -272,21 +262,19 @@
context={
'company': Eval('company', -1),
},
- depends=['company'])
+ depends={'company'})
account_expense = fields.Many2One(
'account.account', "Account Expense",
domain=[
('type.expense', '=', True),
('company', '=', Eval('company', -1)),
- ],
- depends=['company'])
+ ])
account_revenue = fields.Many2One(
'account.account', "Account Revenue",
domain=[
('type.revenue', '=', True),
('company', '=', Eval('company', -1)),
- ],
- depends=['company'])
+ ])
@classmethod
def __register__(cls, module_name):
