[MOD]hr_evaluation : usability improvement

bzr revid: amp@tinyerp.com-20100906113953-wsa583t5cqculash

4 files changed, 10 insertions, 15 deletions

diff --git a/addons/hr_attendance/hr_attendance_view.xml b/addons/hr_attendance/hr_attendance_view.xml
index 8a0e9d79ebc..9768d19c860 100644
--- a/addons/hr_attendance/hr_attendance_view.xml
+++ b/addons/hr_attendance/hr_attendance_view.xml
@@ -113,8 +113,8 @@
             <field name="view_id" ref="view_attendance_reason"/>
         </record>
 
-        <menuitem sequence="9" id="hr.menu_open_view_attendance_reason_config" parent="hr.menu_hr_configuration" name="Leaves" />
-        <menuitem action="open_view_attendance_reason" id="menu_open_view_attendance_reason" parent="hr.menu_open_view_attendance_reason_config"/>
+        <menuitem sequence="2" id="hr.menu_open_view_attendance_reason_new_config" parent="hr.menu_hr_configuration" name="Time Tracking" />
+        <menuitem action="open_view_attendance_reason" id="menu_open_view_attendance_reason" parent="hr.menu_open_view_attendance_reason_new_config"/>
 
         <record id="hr_attendance_employee" model="ir.ui.view">
             <field name="name">hr.employee.form1</field>
diff --git a/addons/hr_evaluation/hr_evaluation.py b/addons/hr_evaluation/hr_evaluation.py
index c6657eff688..7d07e676a24 100644
--- a/addons/hr_evaluation/hr_evaluation.py
+++ b/addons/hr_evaluation/hr_evaluation.py
@@ -34,7 +34,7 @@ class hr_evaluation_plan(osv.osv):
         'company_id': fields.many2one('res.company', 'Company', required=True),
         'phase_ids': fields.one2many('hr_evaluation.plan.phase', 'plan_id', 'Evaluation Phases'),
         'month_first': fields.integer('First Evaluation After'),
-        'month_next': fields.integer('Next Evaluation After'),
+        'month_next': fields.integer('After the Date of Start'),
         'active': fields.boolean('Active')
     }
     _defaults = {
@@ -67,10 +67,10 @@ class hr_evaluation_plan_phase(osv.osv):
         'send_anonymous_employee': fields.boolean('Anonymous Summary',
             help="Send an anonymous summary to the employee"),
         'wait': fields.boolean('Wait Previous Phases',
-            help="Check this box if you want to wait that all preceeding phases " +
+            help="Check this box if you want to wait that all preceding phases " +
               "are finished before launching this phase."),
         'mail_feature': fields.boolean('Send mail for this phase', help="Check this box if you want to send mail to employees"+
-                                       "coming under this phase"),
+                                       " coming under this phase"),
         'mail_body': fields.text('Email'),
         'email_subject':fields.text('char')
     }
diff --git a/addons/hr_evaluation/hr_evaluation_view.xml b/addons/hr_evaluation/hr_evaluation_view.xml
index e10a1ae239b..9dad15ca0df 100644
--- a/addons/hr_evaluation/hr_evaluation_view.xml
+++ b/addons/hr_evaluation/hr_evaluation_view.xml
@@ -26,13 +26,14 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Evaluation Plan">
-                    <group col="6" colspan="4">
+                    <group col="8" colspan="4">
                         <field name="name" select="1"/>
                         <field name="company_id" select="1" widget="selection" groups="base.group_multi_company"/>
-                        <field name="active"/>
                         <field name="month_first"/>
                         <field name="month_next"/>
                         <label string="(months)" align="0.0"/>
+                        <newline/>
+                        <field name="active"/>
                     </group>
                      <notebook colspan="4">
                          <page string="Evaluation Phases">
@@ -72,7 +73,7 @@
             <field name="model">hr_evaluation.plan.phase</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Evaluation Plan Phase">
+                <form string="Evaluation Plan Phases">
                  <notebook>
                    <page string="General">
                     <field name="plan_id" invisible="1"/>
@@ -125,7 +126,7 @@
             <field name="model">hr_evaluation.plan.phase</field>
             <field name="type">tree</field>
             <field name="arch" type="xml">
-                <tree string="Evaluation Plan Phase" editable="bottom" >
+                <tree string="Evaluation Plan Phases" editable="bottom" >
                     <field name="sequence"/>
                     <field name="name"/>
                     <field name="action"/>
diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index 8e6b68ec401..8aaf6f9cbd7 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -6,11 +6,6 @@
             name="Recruitment"
             parent="hr.menu_hr_configuration"
             sequence="2"/>
-        <menuitem
-            id="menu_hr_config_applicant"
-            name="Applicant"
-            parent="menu_hr_recruitment_recruitment"
-            sequence="2"/>
 
     # ------------------------------------------------------
     # Job Categories
@@ -35,7 +30,6 @@
         <field name="context">{}</field>
     </record>
 
-    <menuitem action="hr_job_stage_act" id="menu_hr_job_stage_act" name="Stages" parent="menu_hr_config_applicant"/>
 
     # ------------------------------------------------------
     # Jobs