From e699d022437f10f1533147155bd4bb3b03c2c7cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20=C3=89vrard?= Date: Mon, 2 Apr 2012 12:23:55 +0200 Subject: [PATCH] product, list_price and revenue should be visible for projects --- work.py | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/work.py b/work.py index 5c581044f2..b0c8a03719 100644 --- a/work.py +++ b/work.py @@ -35,20 +35,15 @@ class Work(ModelSQL, ModelView): product = fields.Many2One('product.product', 'Product', states={ - 'invisible': Eval('type') != 'task', - }, on_change=['product', 'party', 'hours', 'company'], - depends=['type', 'party', 'hours', 'company']) + 'invisible': ~Eval('timesheet_available'), + }, + depends=['timesheet_available'], + on_change=['product', 'party', 'hours', 'company']) list_price = fields.Numeric('List Price', - digits=(16, Eval('currency_digits', 2)), - states={ - 'invisible': Eval('type') != 'task', - 'required': Eval('type') == 'task', - }, depends=['type', 'currency_digits']) + digits=(16, Eval('currency_digits', 2)), depends=['currency_digits']) revenue = fields.Function(fields.Numeric('Revenue', digits=(16, Eval('currency_digits', 2)), - states={ - 'invisible': Eval('type') != 'project', - }, depends=['type', 'currency_digits']), 'get_revenue') + depends=['currency_digits']), 'get_revenue') cost = fields.Function(fields.Numeric('Cost', digits=(16, Eval('currency_digits', 2)), depends=['currency_digits']), 'get_cost')