Kuldeep Joshi(OpenERP) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-hr-menu-kjo into
lp:~openerp-dev/openobject-addons/trunk-hr_improvements-sbh.
Requested reviews:
Bhumika (OpenERP) (sbh-openerp)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-hr-menu-kjo/+merge/106149
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-hr-menu-kjo/+merge/106149
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/trunk-hr_improvements-sbh.
=== modified file 'hr/hr_view.xml'
--- hr/hr_view.xml 2012-04-26 09:18:33 +0000
+++ hr/hr_view.xml 2012-05-17 12:16:22 +0000
@@ -10,7 +10,6 @@
<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" groups="base.group_no_one"/>
<menuitem id="menu_view_employee_category_configuration_form" parent="hr.menu_hr_management" name="Employees" sequence="1" />
- <menuitem id="base.menu_hr_reports" parent="hr.menu_hr_root" sequence="40" name="Reporting"/>
<!--
==========
@@ -312,7 +311,7 @@
</record>
<menuitem action="open_view_categ_form" id="menu_view_employee_category_form"
- parent="hr.menu_hr_configuration" sequence="1"/>
+ parent="hr.menu_hr_configuration" sequence="1" groups="base.group_no_one"/>
<record id="open_view_categ_tree" model="ir.actions.act_window">
<field name="name">Categories Structure</field>
@@ -433,7 +432,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="menu_hr_job" action="action_hr_job" sequence="6"/>
+ <menuitem parent="hr.menu_hr_management" id="base.menu_hr_job" action="action_hr_job" sequence="6"/>
</data>
</openerp>
=== modified file 'hr_attendance/wizard/hr_attendance_sign_in_out_view.xml'
--- hr_attendance/wizard/hr_attendance_sign_in_out_view.xml 2012-05-10 13:21:50 +0000
+++ hr_attendance/wizard/hr_attendance_sign_in_out_view.xml 2012-05-17 12:16:22 +0000
@@ -1,29 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<openerp>
<data>
- <record id="view_hr_attendance_sigh_in_out" model="ir.ui.view">
- <field name="name">hr.sign.in.out.form</field>
- <field name="model">hr.sign.in.out</field>
- <field name="type">form</field>
- <field name="arch" type="xml">
- <form string="Sign in / Sign out">
- <separator colspan="4" string="Sign in / Sign out"/>
- <label colspan="4" nolabel="1" string="If you need your staff to sign in when they arrive at work and sign out again at the end of the day, OpenERP allows you to manage this with this tool. If each employee has been linked to a system user, then they can encode their time with this action button."/>
- <newline/>
- <group colspan="4" >
- <field name="name" />
- <field name="state" />
- </group>
- <separator colspan="4"/>
- <group colspan="4" col="6">
- <button icon="gtk-cancel" special="cancel" string="Cancel"/>
- <button icon="terp-gtk-jump-to-ltr" string="Sign in" name="si_check" type="object"/>
- <button icon="terp-gtk-jump-to-rtl" string="Sign out" name="so_check" type="object"/>
- </group>
- </form>
- </field>
- </record>
-
<record id="view_hr_attendance_message" model="ir.ui.view">
<field name="name">hr.sign.in.out.form</field>
<field name="model">hr.sign.in.out</field>
@@ -38,19 +15,6 @@
</field>
</record>
- <record id="action_hr_attendance_sigh_in_out" model="ir.actions.act_window">
- <field name="name">Sign in / Sign out</field>
- <field name="res_model">hr.sign.in.out</field>
- <field name="view_type">form</field>
- <field name="view_mode">tree,form</field>
- <field name="view_id" ref="view_hr_attendance_sigh_in_out"/>
- <field name="target">new</field>
- <field name="help">Sign in / Sign out. In some companies, staff have to sign in when they arrive at work and sign out again at the end of the day. If each employee has been linked to a system user, then they can encode their time with this action button.</field>
- </record>
-
- <menuitem action="action_hr_attendance_sigh_in_out" id="menu_hr_attendance_sigh_in_out"
- parent="menu_hr_attendance" sequence="4"/>
-
<record id="view_hr_attendance_so_ask" model="ir.ui.view">
<field name="name">hr.sign.in.out.ask.form</field>
<field name="model">hr.sign.in.out.ask</field>
=== modified file 'hr_evaluation/hr_evaluation_view.xml'
--- hr_evaluation/hr_evaluation_view.xml 2012-03-26 11:48:47 +0000
+++ hr_evaluation/hr_evaluation_view.xml 2012-05-17 12:16:22 +0000
@@ -285,7 +285,7 @@
<field name="help">Each employee may be assigned an Appraisal Plan. Such a plan defines the frequency and the way you manage your periodic personnel evaluation. You will be able to define steps and attach interviews to each step. OpenERP manages all kind of evaluations: bottom-up, top-down, self-evaluation and final evaluation by the manager.</field>
</record>
- <menuitem name="Appraisal" parent="menu_eval_hr" id="menu_open_view_hr_evaluation_tree"
+ <menuitem name="Appraisals" parent="menu_eval_hr" id="menu_open_view_hr_evaluation_tree"
action="open_view_hr_evaluation_tree" groups="base.group_hr_user"/>
<record model="ir.ui.view" id="view_hr_evaluation_interview_form">
=== modified file 'hr_evaluation/report/hr_evaluation_report_view.xml'
--- hr_evaluation/report/hr_evaluation_report_view.xml 2012-04-25 14:11:35 +0000
+++ hr_evaluation/report/hr_evaluation_report_view.xml 2012-05-17 12:16:22 +0000
@@ -101,7 +101,6 @@
<field name="search_view_id" ref="view_evaluation_report_search"/>
</record>
- <menuitem id="hr.menu_hr_reporting" name="Reporting" parent="hr.menu_hr_root" sequence="10"/>
<menuitem action="action_evaluation_report_all" id="menu_evaluation_report_all" parent="hr.menu_hr_reporting" sequence="3" groups="base.group_hr_manager"/>
</data>
=== modified file 'hr_expense/report/hr_expense_report_view.xml'
--- hr_expense/report/hr_expense_report_view.xml 2012-04-25 14:11:35 +0000
+++ hr_expense/report/hr_expense_report_view.xml 2012-05-17 12:16:22 +0000
@@ -118,7 +118,6 @@
<field name="search_view_id" ref="view_hr_expense_report_search"/>
</record>
- <menuitem id="hr.menu_hr_reporting" name="Reporting" parent="hr.menu_hr_root" sequence="10"/>
<menuitem action="action_hr_expense_report_all" id="menu_hr_expense_report_all" parent="hr.menu_hr_reporting" sequence="2"/>
</data>
=== modified file 'hr_holidays/wizard/hr_holidays_summary_department_view.xml'
--- hr_holidays/wizard/hr_holidays_summary_department_view.xml 2012-04-25 14:11:35 +0000
+++ hr_holidays/wizard/hr_holidays_summary_department_view.xml 2012-05-17 12:16:22 +0000
@@ -32,11 +32,9 @@
<field name="target">new</field>
</record>
- <menuitem id="menu_hr_leaves_reports" parent="base.menu_hr_reports" sequence="10" name="Leaves"/>
-
<menuitem
name="Leaves by Department"
- parent="menu_hr_leaves_reports"
+ parent="menu_hr_reporting_holidays"
action="action_hr_holidays_summary_dept"
id="menu_account_central_journal"
icon="STOCK_PRINT"/>
=== modified file 'hr_recruitment/hr_recruitment_menu.xml'
--- hr_recruitment/hr_recruitment_menu.xml 2011-12-19 16:54:40 +0000
+++ hr_recruitment/hr_recruitment_menu.xml 2012-05-17 12:16:22 +0000
@@ -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="base.menu_crm_case_job_req_main" id="menu_hr_job" action="hr.action_hr_job" sequence="2"/>
+ <menuitem parent="hr.menu_hr_management" id="base.menu_hr_job" action="hr.action_hr_job" sequence="2"/>
</data>
=== modified file 'hr_recruitment/report/hr_recruitment_report_view.xml'
--- hr_recruitment/report/hr_recruitment_report_view.xml 2012-04-25 14:11:35 +0000
+++ hr_recruitment/report/hr_recruitment_report_view.xml 2012-05-17 12:16:22 +0000
@@ -129,7 +129,6 @@
<field name="context">{'search_default_year':1,'search_default_month':1,'search_default_department':1,'group_by_no_leaf':1,'group_by':[]}</field>
<field name="search_view_id" ref="view_hr_recruitment_report_search"/>
</record>
- <menuitem id="hr.menu_hr_reporting" name="Reporting" parent="hr.menu_hr_root" sequence="10" groups="base.group_hr_manager,base.group_hr_user"/>
<menuitem action="action_hr_recruitment_report_all" id="menu_hr_recruitment_report_all" parent="hr.menu_hr_reporting" sequence="1"/>
</data>
=== modified file 'hr_timesheet/hr_timesheet_view.xml'
--- hr_timesheet/hr_timesheet_view.xml 2012-04-25 14:11:35 +0000
+++ hr_timesheet/hr_timesheet_view.xml 2012-05-17 12:16:22 +0000
@@ -111,7 +111,7 @@
</field>
</record>
- <menuitem id="menu_hr_timesheet_reports" parent="base.menu_hr_reports" sequence="5" name="Timesheet"/>
+ <menuitem id="menu_hr_timesheet_reports" parent="hr.menu_hr_reporting" sequence="5" name="Timesheet"/>
</data>
=== modified file 'hr_timesheet/wizard/hr_timesheet_print_employee_view.xml'
--- hr_timesheet/wizard/hr_timesheet_print_employee_view.xml 2012-04-25 14:11:35 +0000
+++ hr_timesheet/wizard/hr_timesheet_print_employee_view.xml 2012-05-17 12:16:22 +0000
@@ -34,7 +34,7 @@
<menuitem action="action_hr_timesheet_employee"
id="menu_hr_timesheet_employee"
- parent="menu_hr_timesheet_reports"
+ parent="menu_hr_reporting_timesheet"
sequence="2" icon="STOCK_PRINT"/>
=== modified file 'hr_timesheet/wizard/hr_timesheet_print_users_view.xml'
--- hr_timesheet/wizard/hr_timesheet_print_users_view.xml 2012-03-05 13:08:10 +0000
+++ hr_timesheet/wizard/hr_timesheet_print_users_view.xml 2012-05-17 12:16:22 +0000
@@ -37,7 +37,7 @@
<menuitem action="action_hr_timesheet_users"
id="menu_hr_timesheet_users"
- parent="menu_hr_timesheet_reports"
+ parent="menu_hr_reporting_timesheet"
groups="base.group_hr_manager" sequence="3" icon="STOCK_PRINT"/>
=== modified file 'hr_timesheet_invoice/wizard/hr_timesheet_analytic_profit_view.xml'
--- hr_timesheet_invoice/wizard/hr_timesheet_analytic_profit_view.xml 2012-04-25 14:11:35 +0000
+++ hr_timesheet_invoice/wizard/hr_timesheet_analytic_profit_view.xml 2012-05-17 12:16:22 +0000
@@ -38,7 +38,7 @@
<menuitem action="action_hr_timesheet_analytic_profit"
id="menu_hr_timesheet_analytic_profit"
- parent="hr_timesheet.menu_hr_timesheet_reports" icon="STOCK_PRINT"/>
+ parent="hr_timesheet.menu_hr_reporting_timesheet" icon="STOCK_PRINT"/>
</data>
</openerp>
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
