From a3e9f600ee5cec7ac196c1bc93e7aeb8b4bb609d Mon Sep 17 00:00:00 2001
From: Raphael Collet <rco@openerp.com>
Date: Wed, 13 Jun 2012 15:18:34 +0200
Subject: [PATCH] [IMP] hr: improve English in tooltips, cleanup menus and form
 view of hr.job

bzr revid: rco@openerp.com-20120613131834-hjholbe4nsrh35t5
---
 addons/hr/hr.py                               |  9 ++-
 addons/hr/hr_view.xml                         | 63 ++++++++++---------
 addons/hr/i18n/hr.pot                         |  4 +-
 addons/hr_recruitment/hr_recruitment_menu.xml |  2 +-
 4 files changed, 41 insertions(+), 37 deletions(-)

diff --git a/addons/hr/hr.py b/addons/hr/hr.py
index a5adc50e9af..758c5573a6a 100644
--- a/addons/hr/hr.py
+++ b/addons/hr/hr.py
@@ -93,13 +93,15 @@ class hr_job(osv.osv):
     _description = "Job Description"
     _columns = {
         'name': fields.char('Job Name', size=128, required=True, select=True),
-        'expected_employees': fields.function(_no_of_employee, string='Total Employees', help='Expected number of employees in total for this job position after new recruitment.',
+        'expected_employees': fields.function(_no_of_employee, string='Total Employees',
+            help='Expected number of employees for this job position after new recruitment.',
             store = {
                 'hr.job': (lambda self,cr,uid,ids,c=None: ids, ['no_of_recruitment'], 10),
                 'hr.employee': (_get_job_position, ['job_id'], 10),
             },
             multi='no_of_employee'),
-        'no_of_employee': fields.function(_no_of_employee, string="Number of Employees", help='Number of employees currently having this job position.',
+        'no_of_employee': fields.function(_no_of_employee, string="Number of Employees",
+            help='Number of employees currently occupying this job position.',
             store = {
                 'hr.employee': (_get_job_position, ['job_id'], 10),
             },
@@ -110,7 +112,8 @@ class hr_job(osv.osv):
         'requirements': fields.text('Requirements'),
         'department_id': fields.many2one('hr.department', 'Department'),
         'company_id': fields.many2one('res.company', 'Company'),
-        'state': fields.selection([('open', 'In Position'),('recruit', 'In Recruitement')], 'Status', readonly=True, required=True, help='By default all job are \'In position\', set it \'In Recruitment\' if recruitment process is going on for this job position.'),
+        'state': fields.selection([('open', 'In Position'), ('recruit', 'In Recruitement')], 'Status', readonly=True, required=True,
+            help="By default 'In position', set it to 'In Recruitment' if recruitment process is going on for this job position."),
     }
     _defaults = {
         'expected_employees': 1,
diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index 799fe79bfc3..a76299e8978 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -8,8 +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" groups="base.group_hr_manager"/>
-        <menuitem id="menu_view_employee_category_configuration_form" parent="hr.menu_hr_management" name="Employees" sequence="1" />
+        <menuitem id="menu_hr_management" name="Human Resources" parent="hr.menu_hr_configuration" sequence="25"/>
 
         <!--
         ==========
@@ -349,34 +348,36 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Job" version="7.0">                
-                <header>
-                    <button name="job_recruitement" string="In Recruitement" states="open" type="object"/>
-                    <button name="job_open" string="Recruitment Done" states="recruit" type="object"/>
-                    <field name="state" widget="statusbar" statusbar_visible="recruit,open"/>
-                </header>
-                <sheet string="Job" layout="auto">
-                    <group col="6" colspan="4">
-                    <field name="name" />
-                    <field name="department_id" />
-                    <field name="company_id" widget="selection" groups="base.group_multi_company"/>
-                    <newline/>
-                    <field name="no_of_recruitment" on_change="on_change_expected_employee(no_of_recruitment,no_of_employee)"/>
-                    <field name="no_of_employee"/>
-                    <field name="expected_employees"/>
-                    </group>
-                    <newline/>
-                    <notebook colspan="4">
-                        <page string="Description">
-                            <separator colspan="4" string="Job Description"/>
-                            <field name="description" colspan="4" nolabel="1"/>
-                            <separator colspan="4" string="Requirements"/>
-                            <field name="requirements" colspan="4" nolabel="1"/>
-                        </page>
-                        <page string="Employees">
-                            <field name="employee_ids" colspan="4" nolabel="1" widget="many2many" mode="tree,form"/>
-                        </page>
-                    </notebook>
-                </sheet>
+                    <header>
+                        <button name="job_recruitement" string="In Recruitement" states="open" type="object"/>
+                        <button name="job_open" string="Recruitment Done" states="recruit" type="object"/>
+                        <field name="state" widget="statusbar" statusbar_visible="recruit,open"/>
+                    </header>
+                    <sheet string="Job">
+                        <group>
+                            <group>
+                                <field name="name" />
+                                <field name="department_id" />
+                                <field name="company_id" widget="selection" groups="base.group_multi_company"/>
+                            </group>
+                            <group>
+                                <field name="no_of_recruitment" on_change="on_change_expected_employee(no_of_recruitment,no_of_employee)"/>
+                                <field name="no_of_employee"/>
+                                <field name="expected_employees"/>
+                            </group>
+                        </group>
+                        <notebook>
+                            <page string="Description">
+                                <label for="description"/>
+                                <field name="description"/>
+                                <label for="requirements"/>
+                                <field name="requirements"/>
+                            </page>
+                            <page string="Employees">
+                                <field name="employee_ids" widget="many2many" mode="tree,form"/>
+                            </page>
+                        </notebook>
+                    </sheet>
                 </form>
             </field>
         </record>
@@ -435,7 +436,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_configuration" id="base.menu_hr_job" action="action_hr_job" sequence="6"/>
+        <menuitem parent="hr.menu_hr_configuration" id="menu_hr_job" action="action_hr_job" sequence="6"/>
 
     </data>
 </openerp>
diff --git a/addons/hr/i18n/hr.pot b/addons/hr/i18n/hr.pot
index 15bc696e705..b04780b980a 100644
--- a/addons/hr/i18n/hr.pot
+++ b/addons/hr/i18n/hr.pot
@@ -197,7 +197,7 @@ msgstr ""
 
 #. module: hr
 #: help:hr.job,expected_employees:0
-msgid "Expected number of employees in total for this job position after new recruitment."
+msgid "Expected number of employees for this job position after new recruitment."
 msgstr ""
 
 #. module: hr
@@ -702,7 +702,7 @@ msgstr ""
 
 #. module: hr
 #: field:hr.job,no_of_employee:0
-msgid "Number of employees currently having this job position."
+msgid "Number of employees currently occupying this job position."
 msgstr ""
 
 #. module: hr
diff --git a/addons/hr_recruitment/hr_recruitment_menu.xml b/addons/hr_recruitment/hr_recruitment_menu.xml
index 59aa56af1da..112adb9b5fb 100644
--- a/addons/hr_recruitment/hr_recruitment_menu.xml
+++ b/addons/hr_recruitment/hr_recruitment_menu.xml
@@ -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_configuration" id="base.menu_hr_job" action="hr.action_hr_job" sequence="2"/>
+	    <menuitem parent="hr.menu_hr_configuration" id="hr.menu_hr_job" action="hr.action_hr_job" sequence="2"/>
 
 
     </data>