From a2b80564099aeab843cbbcc9b03025e91469c7ab Mon Sep 17 00:00:00 2001
From: "Pinakin Nayi (OpenERP)" <pna@tinyerp.com>
Date: Fri, 18 May 2012 16:33:49 +0530
Subject: [PATCH] [IMP]hr_recruitment: Improve name, tooltips

bzr revid: pna@tinyerp.com-20120518110349-idx1knrdrsncocde
---
 addons/hr_recruitment/i18n/hr_recruitment.pot      | 14 +++++++-------
 .../hr_recruitment/report/hr_recruitment_report.py |  9 ++++-----
 .../report/hr_recruitment_report_view.xml          |  5 +++--
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/addons/hr_recruitment/i18n/hr_recruitment.pot b/addons/hr_recruitment/i18n/hr_recruitment.pot
index 7d141991480..13e5cec0c62 100644
--- a/addons/hr_recruitment/i18n/hr_recruitment.pot
+++ b/addons/hr_recruitment/i18n/hr_recruitment.pot
@@ -54,14 +54,9 @@ msgstr ""
 msgid "Sources of Applicants"
 msgstr ""
 
-#. module: hr_recruitment
-#: field:hr.recruitment.report,delay_open:0
-msgid "Avg. Delay to Open"
-msgstr ""
-
 #. module: hr_recruitment
 #: field:hr.recruitment.report,nbr:0
-msgid "# of Cases"
+msgid "# of Applications"
 msgstr ""
 
 #. module: hr_recruitment
@@ -828,7 +823,12 @@ msgstr ""
 
 #. module: hr_recruitment
 #: field:hr.recruitment.report,salary_prop_avg:0
-msgid "Avg Salary Proposed"
+msgid "Avg. Proposed Salary"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.recruitment.report,salary_exp_avg:0
+msgid "Avg. Expected Salary"
 msgstr ""
 
 #. module: hr_recruitment
diff --git a/addons/hr_recruitment/report/hr_recruitment_report.py b/addons/hr_recruitment/report/hr_recruitment_report.py
index 1a596dfa2c6..e888da9ead7 100644
--- a/addons/hr_recruitment/report/hr_recruitment_report.py
+++ b/addons/hr_recruitment/report/hr_recruitment_report.py
@@ -40,7 +40,7 @@ class hr_recruitment_report(osv.osv):
 
     _columns = {
         'user_id': fields.many2one('res.users', 'User', readonly=True),
-        'nbr': fields.integer('# of Cases', readonly=True),
+        'nbr': fields.integer('# of Applications', readonly=True),
         'state': fields.selection(AVAILABLE_STATES, 'State', size=16, readonly=True),
         'month':fields.selection([('01', 'January'), ('02', 'February'), \
                                   ('03', 'March'), ('04', 'April'),\
@@ -59,12 +59,11 @@ class hr_recruitment_report(osv.osv):
         'department_id': fields.many2one('hr.department','Department',readonly=True),
         'priority': fields.selection(hr_recruitment.AVAILABLE_PRIORITIES, 'Appreciation'),
         'salary_prop' : fields.float("Salary Proposed", digits_compute=dp.get_precision('Account')),
-        'salary_prop_avg' : fields.float("Avg Salary Proposed", group_operator="avg", digits_compute=dp.get_precision('Account')),
+        'salary_prop_avg' : fields.float("Avg. Proposed Salary", group_operator="avg", digits_compute=dp.get_precision('Account')),
         'salary_exp' : fields.float("Salary Expected", digits_compute=dp.get_precision('Account')),
+        'salary_exp_avg' : fields.float("Avg. Expected Salary", group_operator="avg", digits_compute=dp.get_precision('Account')),        
         'partner_id': fields.many2one('res.partner', 'Partner',readonly=True),
         'available': fields.float("Availability"),
-        'delay_open': fields.float('Avg. Delay to Open', digits=(16,2), readonly=True, group_operator="avg",
-                                       help="Number of Days to close the project issue"),
         'delay_close': fields.float('Avg. Delay to Close', digits=(16,2), readonly=True, group_operator="avg",
                                        help="Number of Days to close the project issue"),
     }
@@ -93,7 +92,7 @@ class hr_recruitment_report(osv.osv):
                      sum(salary_proposed) as salary_prop,
                      (sum(salary_proposed)/count(*)) as salary_prop_avg,
                      sum(salary_expected) as salary_exp,
-                     extract('epoch' from (s.date_open-s.create_date))/(3600*24) as  delay_open,
+                     (sum(salary_expected)/count(*)) as salary_exp_avg,
                      extract('epoch' from (s.date_closed-s.create_date))/(3600*24) as  delay_close,
                      count(*) as nbr
                  from hr_applicant s
diff --git a/addons/hr_recruitment/report/hr_recruitment_report_view.xml b/addons/hr_recruitment/report/hr_recruitment_report_view.xml
index 112258ac4af..03be4d720ff 100644
--- a/addons/hr_recruitment/report/hr_recruitment_report_view.xml
+++ b/addons/hr_recruitment/report/hr_recruitment_report_view.xml
@@ -19,13 +19,14 @@
                 <field name="year" invisible="1"/>
                 <field name="day" invisible="1"/>
                 <field name="month" invisible="1"/>
-                <field name="nbr" sum="# Cases"/>
+                <field name="nbr" sum="# of Applications"/>
                 <field name="available" sum="Available"/>
                 <field name="salary_exp" sum="Expected Salary"/>
+                <field name="salary_exp_avg" sum="Avg Expected Salary" />
                 <field name="salary_prop" sum="Proposed Salary" />
                 <field name="salary_prop_avg" sum="Avg Proposed Salary" />
-                <field name="delay_open" avg='Avg Delay to Open'/>
                 <field name="delay_close" avg='Avg Delay to Close'/>
+                <field name="priority"/>
             </tree>
         </field>
     </record>