odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[MERGE] merge from dev3 

bzr revid: ara@tinyerp.com-20110217112123-wwp1i98s2zjd2kvv
This commit is contained in:
ARA (OpenERP) 2011-02-17 16:51:23 +05:30
parent 990befd610 966c8c4475
commit 46c1818aea
2 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
addons/hr_holidays/hr_holidays_view.xml
View File

@ -81,7 +81,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"/>
<field name="department_id" attrs="{'invisible':[('holiday_type','=','category')]}" />
<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"/>
@ -125,7 +125,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"/>
<field name="department_id" attrs="{'invisible':[('holiday_type','=','category')]}" />
<field name="number_of_days_temp"/>
<newline/>
<field name="manager_id"/>

5
addons/hr_recruitment/hr_recruitment_data.xml
View File

@ -66,10 +66,5 @@
<field name="object_id" search="[('model','=','hr.applicant')]" model="ir.model"/>
</record>
<!-- Department(section_id) -->
<record model="crm.case.section" id="section_hr_department">
<field name="name">HR Department</field>
<field name="code">HR</field>
</record>
</data>
</openerp>