[MERGE] Merg menu changes
bzr revid: sbh@tinyerp.com-20120530063110-6iqbobajqubjrqpx
This commit is contained in:
commit
1ba82b81a1
|
@ -435,7 +435,7 @@
|
|||
</record>
|
||||
|
||||
<menuitem name="Recruitment" id="base.menu_crm_case_job_req_main" parent="menu_hr_root" groups="base.group_hr_user"/>
|
||||
<menuitem parent="hr.menu_hr_management" id="base.menu_hr_job" action="action_hr_job" sequence="6"/>
|
||||
<menuitem parent="hr.menu_hr_configuration" id="base.menu_hr_job" action="action_hr_job" sequence="6"/>
|
||||
|
||||
</data>
|
||||
</openerp>
|
||||
|
|
|
@ -163,6 +163,7 @@
|
|||
<button name="button_cancel" string="Cancel" states="draft,wait,progress" type="object"/>
|
||||
<div class="oe_right">
|
||||
<field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,progress,wait,done" statusbar_colors='{"progress":"blue"}'/>
|
||||
|
||||
</div>
|
||||
<div class="oe_clear"/>
|
||||
</div>
|
||||
|
|
|
@ -54,7 +54,7 @@
|
|||
parent="base.menu_crm_case_job_req_main"
|
||||
id="menu_crm_case_categ0_act_job" action="crm_case_categ0_act_job" sequence="1"/>
|
||||
|
||||
<menuitem parent="hr.menu_hr_management" id="base.menu_hr_job" action="hr.action_hr_job" sequence="2"/>
|
||||
<menuitem parent="hr.menu_hr_configuration" id="base.menu_hr_job" action="hr.action_hr_job" sequence="2"/>
|
||||
|
||||
|
||||
</data>
|
||||
|
|
Loading…
Reference in New Issue