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

[Merge] hr improvements 

bzr revid: fp@tinyerp.com-20111114112021-neqf57c8kd0cfu0s
This commit is contained in:
Fabien Pinckaers 2011-11-14 12:20:21 +01:00
parent 4d77356d91 108b74d8a3
commit f79e0d1f59
3 changed files with 48 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
addons/hr/hr_demo.xml
View File

@ -54,17 +54,40 @@
<field name="category_ids" eval="[(6, 0, [ref('category_sr_exec'),ref('category_ceo')])]"/>
</record>
<record id="employee2" model="hr.employee">
<field name="name">Quentin Paolino</field>
<field name="calendar_id" ref="resource.timesheet_group1"/>
<field name="user_id" ref="base.user_demo"/>
<field name="category_ids" eval="[(6, 0, [ref('category_jr_exec'),ref('category_managers')])]"/>
</record>
<record id="employee3" model="hr.employee">
<field name="name">Antoine Philippe</field>
<field name="calendar_id" ref="resource.timesheet_group1"/>
<field name="user_id" ref="base.user_root"/>
<field name="parent_id" ref="employee1"/>
<field name="category_ids" eval="[(6, 0, [ref('category_trainee'),ref('category_employee')])]"/>
</record>
<record id="employee2" model="hr.employee">
<field name="name">Quentin Paolino</field>
<field name="calendar_id" ref="resource.timesheet_group1"/>
<field name="user_id" ref="base.user_demo"/>
<field name="parent_id" ref="employee3"/>
<field name="category_ids" eval="[(6, 0, [ref('category_jr_exec'),ref('category_managers')])]"/>
</record>
<record id="employee4" model="hr.employee">
<field name="name">John Smith</field>
<field name="calendar_id" ref="resource.timesheet_group1"/>
<field name="parent_id" ref="employee1"/>
<field name="category_ids" eval="[(6, 0, [ref('category_sr_exec'),ref('category_ceo')])]"/>
</record>
<record id="employee5" model="hr.employee">
<field name="name"> Thomas McQueen</field>
<field name="calendar_id" ref="resource.timesheet_group1"/>
<field name="parent_id" ref="employee4"/>
<field name="category_ids" eval="[(6, 0, [ref('category_jr_exec'),ref('category_managers')])]"/>
</record>
<record id="employee6" model="hr.employee">
<field name="name">Vanessa Dupont</field>
<field name="calendar_id" ref="resource.timesheet_group1"/>
<field name="parent_id" ref="employee4"/>
<field name="category_ids" eval="[(6, 0, [ref('category_trainee'),ref('category_employee')])]"/>
</record>

19
addons/hr/hr_department_demo.xml
View File

@ -26,31 +26,34 @@
<field name="name">IT</field>
<field name="parent_id" ref="dep_technical"/>
<field name="company_id" ref="base.main_company"/>
<field name="manager_id" ref="employee2"/>
</record>
<record id="dep_marketing" model="hr.department">
<field name="name">Marketing</field>
<field name="parent_id" ref="dep_management"/>
<field name="company_id" ref="base.main_company"/>
<field name="manager_id" ref="employee2"/>
</record>
<record id="dep_sales" model="hr.department">
<field name="name">Sales</field>
<field name="company_id" ref="base.main_company"/>
<field name="parent_id" ref="dep_management"/>
<field name="manager_id" ref="employee4"/>
</record>
<record id="dep_sales_europe" model="hr.department">
<field name="name">Sales Europe</field>
<field name="company_id" ref="base.main_company"/>
<field name="parent_id" ref="dep_sales"/>
<field name="manager_id" ref="employee5"/>
</record>
<record id="dep_sales_america" model="hr.department">
<field name="name">Sales America</field>
<field name="company_id" ref="base.main_company"/>
<field name="parent_id" ref="dep_sales"/>
<field name="manager_id" ref="employee6"/>
</record>
<!-- HR Jobs -->
@ -106,7 +109,19 @@
</record>
<record id="employee3" model="hr.employee">
<field name="department_id" ref="dep_sales"/>
<field name="department_id" ref="hr.dep_management"/>
</record>
<record id="employee4" model="hr.employee">
<field name="department_id" ref="hr.dep_management"/>
</record>
<record id="employee5" model="hr.employee">
<field name="department_id" ref="hr.dep_sales"/>
</record>
<record id="employee6" model="hr.employee">
<field name="department_id" ref="hr.dep_sales"/>
</record>
</data>

1
addons/hr/hr_view.xml
View File

@ -344,6 +344,7 @@
<field name="res_model">hr.employee</field>
<field name="view_type">form</field>
<field name="view_mode">tree,form</field>
<field name="domain">[('category_ids','=', active_ids)]</field>
</record>
<record id="hr_employee_category_open" model="ir.values">