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

[MERGE]:hr config 

bzr revid: apa@tinyerp.com-20120731065916-xrrwten6evmt3nbs
This commit is contained in:
Amit Patel (OpenERP) 2012-07-31 12:29:16 +05:30
parent b3830bf5f3 b48531d1da
commit 02ad31ff37
2 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
addons/hr/res_config_view.xml
View File

@ -20,10 +20,14 @@
or
<button string="Cancel" type="object" name="cancel" class="oe_link"/>
</header>
<separator string="Additional Features"/>
<separator string="Human Resources Management"/>
<group>
<label for="id" string="Additional Features"/>
<div>
<div>
<field name="module_hr_holidays" class="oe_inline"/>
<label for="module_hr_holidays"/>
</div>
<div>
<field name="module_hr_expense" class="oe_inline"/>
<label for="module_hr_expense"/>
@ -33,17 +37,13 @@
<label for="module_hr_evaluation"/>
</div>
<div>
<field name="module_hr_holidays" class="oe_inline"/>
<label for="module_hr_holidays"/>
<field name="module_hr_contract" class="oe_inline"/>
<label for="module_hr_contract"/>
</div>
<div>
<field name="module_hr_recruitment" class="oe_inline"/>
<label for="module_hr_recruitment"/>
</div>
<div>
<field name="module_hr_contract" class="oe_inline"/>
<label for="module_hr_contract"/>
</div>
<div name="hr_payroll">
<field name="module_hr_payroll" class="oe_inline"/>
<label for="module_hr_payroll"/>
@ -53,9 +53,8 @@
</div>
</div>
</group>
<separator string="Timesheets"/>
<group name="timesheet_grp">
<label for="id" string="Timesheet Features"/>
<label for="id" string="Time Tracking"/>
<div>
<div>
<field name="module_hr_attendance" on_change="onchange_hr_attendance(module_hr_attendance)" class="oe_inline"/>

3
addons/hr_recruitment/res_config_view.xml
View File

@ -8,9 +8,8 @@
<field name="inherit_id" ref="hr.view_human_resources_configuration"/>
<field name="arch" type="xml">
<group name="timesheet_grp" position="after">
<separator string="Recruitment"/>
<group>
<label for="id" string="Recruitment Features"/>
<label for="id" string="Recruitment"/>
<div>
<div>
<field name="module_document_ftp" class="oe_inline"/>