pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[MERGE] merge to get changes

Browse Source 
bzr revid: psi@tinyerp.com-20120705084212-ws7xo0ph2pzc7you
This commit is contained in:
Purnendu Singh (OpenERP)
2012-07-05 14:12:12 +05:30
parent 60bd221cf7 4e08b80952
commit 1d690c693e
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/hr/hr_view.xml
+2 -2
View File
@@ -8,7 +8,7 @@
groups="base.group_hr_manager,base.group_hr_user,base.group_user"/>
<menuitem id="menu_hr_main" parent="menu_hr_root" name="Human Resources" sequence="0"/>
<menuitem id="menu_hr_configuration" name="Configuration" parent="hr.menu_hr_root" groups="base.group_hr_manager" sequence="50"/>
<menuitem id="menu_hr_management" name="Human Resources" parent="hr.menu_hr_configuration" sequence="25"/>
<menuitem id="menu_hr_management" name="Human Resources" parent="hr.menu_hr_configuration" groups="base.group_no_one" sequence="25"/>
<!--Employee form view -->
<record id="view_employee_form" model="ir.ui.view">
@@ -341,7 +341,7 @@
</record>
<menuitem action="open_view_categ_tree"
id="menu_view_employee_category_tree" parent="menu_hr_management" sequence="2"/>
id="menu_view_employee_category_tree" parent="menu_hr_management" groups="base.group_no_one" sequence="2"/>
<record id="view_hr_job_form" model="ir.ui.view">
<field name="name">hr.job.form</field>
addons/hr_recruitment/hr_recruitment_view.xml
+1 -1
View File
@@ -122,7 +122,7 @@
states="open,pending" class="oe_highlight"/>
<button name="case_open" string="Open" type="object"
states="draft,pending" class="oe_highlight"/>
<button name="case_pending" string="Pending" type="object"
<button name="case_pending" string="Pending" type="object" invisible="1"
states="open"/>
<button name="case_reset" string="Reset to New" type="object"
states="done,cancel"/>