diff options
| author | Purnendu Singh (OpenERP) <psi@tinyerp.com> | 2012-03-01 11:28:49 +0530 |
|---|---|---|
| committer | Purnendu Singh (OpenERP) <psi@tinyerp.com> | 2012-03-01 11:28:49 +0530 |
| commit | da74d3cde02496cf8a8ff2ab2b71f736808c8a3c (patch) | |
| tree | db0df5a45ae23cdc630cb051dbffc050abcb0cab | |
| parent | b138e14b1f2043c1edb11cb0ccf7e88e85fe427e (diff) | |
| parent | 120a4a9fd76abc284f22766b32b1683dbc73a24e (diff) | |
[MERGE] merge with mma branch(Hide department id in all other states rather than draft and confirm)
bzr revid: psi@tinyerp.com-20120301055849-4c20k8j37w5w8n7t
| -rw-r--r-- | addons/hr_holidays/hr_holidays_view.xml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml index 302ca4fe6ee..3f8490942f3 100644 --- a/addons/hr_holidays/hr_holidays_view.xml +++ b/addons/hr_holidays/hr_holidays_view.xml @@ -76,7 +76,7 @@ <notebook colspan="4"> <page string="General"> <field name="holiday_status_id" on_change="onchange_sec_id(holiday_status_id)" context="{'employee_id':employee_id}"/> - <field name="department_id" attrs="{'readonly':[('holiday_type','=','category')]}"/> + <field name="department_id" attrs="{'readonly':['|', ('holiday_type','=','category'), ('state','not in' ,('draft', 'confirm'))]}"/> <field name="date_from" on_change="onchange_date_from(date_to, date_from)" required="1"/> <field name="date_to" on_change="onchange_date_from(date_to, date_from)" required="1"/> <field name="number_of_days_temp"/> @@ -121,7 +121,7 @@ <notebook colspan="4"> <page string="General"> <field name="holiday_status_id" on_change="onchange_sec_id(holiday_status_id)" context="{'employee_id':employee_id}"/> - <field name="department_id" attrs="{'readonly':[('holiday_type','=','category')]}"/> + <field name="department_id" attrs="{'readonly':['|', ('holiday_type','=','category'), ('state','not in' ,('draft', 'confirm'))]}"/> <field name="number_of_days_temp"/> <field name="double_validation" invisible="1"/> <newline/> |