pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[MERGE] merge with mma branch(Hide department id in all other states rather than draft and confirm)

Browse Source 
bzr revid: psi@tinyerp.com-20120301055849-4c20k8j37w5w8n7t
This commit is contained in:
Purnendu Singh (OpenERP)
2012-03-01 11:28:49 +05:30
parent b138e14b1f 120a4a9fd7
commit da74d3cde0
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/hr_holidays/hr_holidays_view.xml
+2 -2
View File
@@ -76,7 +76,7 @@
<notebook colspan="4"> <notebook colspan="4">
<page string="General"> <page string="General">
<field name="holiday_status_id" on_change="onchange_sec_id(holiday_status_id)" context="{'employee_id':employee_id}"/> <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_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="date_to" on_change="onchange_date_from(date_to, date_from)" required="1"/>
<field name="number_of_days_temp"/> <field name="number_of_days_temp"/>
@@ -121,7 +121,7 @@
<notebook colspan="4"> <notebook colspan="4">
<page string="General"> <page string="General">
<field name="holiday_status_id" on_change="onchange_sec_id(holiday_status_id)" context="{'employee_id':employee_id}"/> <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="number_of_days_temp"/>
<field name="double_validation" invisible="1"/> <field name="double_validation" invisible="1"/>
<newline/> <newline/>