[MERGE]:hr configuration
bzr revid: apa@tinyerp.com-20120913063035-ghidl2su7hsul54t
This commit is contained in:
commit
5f7466d75a
|
@ -332,6 +332,7 @@
|
|||
<field name="view_type">form</field>
|
||||
<field name="view_mode">tree,form</field>
|
||||
<field name="domain">[('category_ids','=', active_ids)]</field>
|
||||
<field name="context">{'default_category_ids': active_ids}</field>
|
||||
</record>
|
||||
|
||||
<record id="hr_employee_category_open" model="ir.values">
|
||||
|
|
|
@ -99,8 +99,8 @@
|
|||
<menuitem
|
||||
id="menu_hr_payroll_structure_view"
|
||||
action="action_view_hr_payroll_structure_list_form"
|
||||
parent="hr.menu_hr_configuration"
|
||||
sequence="20"
|
||||
parent="payroll_configure"
|
||||
sequence="2"
|
||||
/>
|
||||
<record id="action_view_hr_payroll_structure_tree" model="ir.actions.act_window">
|
||||
<field name="name">Salary Structures Hierarchy</field>
|
||||
|
|
|
@ -337,7 +337,7 @@
|
|||
<field name="no_of_recruitment" version="7.0" position="after">
|
||||
<label for="survey_id" groups="base.group_user"/>
|
||||
<div groups="base.group_user">
|
||||
<field name="survey_id" class="oe_inline"/>
|
||||
<field name="survey_id" class="oe_inline" domain="[('type','=','Human Resources')]"/>
|
||||
<button class="oe_inline"
|
||||
string="Interview"
|
||||
name="action_print_survey" type="object"
|
||||
|
|
Loading…
Reference in New Issue