Pinakin Nayi (OpenERP) has proposed merging
lp:~openerp-commiter/openobject-addons/trunk-hr_improvements-sbh-recruitment-pna
into lp:~openerp-dev/openobject-addons/trunk-hr_improvements-sbh.
Requested reviews:
OpenERP R&D Team (openerp-dev)
For more details, see:
https://code.launchpad.net/~openerp-commiter/openobject-addons/trunk-hr_improvements-sbh-recruitment-pna/+merge/106359
Hello ,
Hr improvements - Recruitment Analysis Report (tooltip,rename)
Thank You ,
pna
--
https://code.launchpad.net/~openerp-commiter/openobject-addons/trunk-hr_improvements-sbh-recruitment-pna/+merge/106359
Your team OpenERP R&D Team is requested to review the proposed merge of
lp:~openerp-commiter/openobject-addons/trunk-hr_improvements-sbh-recruitment-pna
into lp:~openerp-dev/openobject-addons/trunk-hr_improvements-sbh.
=== modified file 'hr_recruitment/i18n/hr_recruitment.pot'
--- hr_recruitment/i18n/hr_recruitment.pot 2012-02-08 01:08:30 +0000
+++ hr_recruitment/i18n/hr_recruitment.pot 2012-05-18 11:25:28 +0000
@@ -55,13 +55,8 @@
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 @@
#. 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
=== modified file 'hr_recruitment/report/hr_recruitment_report.py'
--- hr_recruitment/report/hr_recruitment_report.py 2012-03-07 05:49:19 +0000
+++ hr_recruitment/report/hr_recruitment_report.py 2012-05-18 11:25:28 +0000
@@ -40,7 +40,7 @@
_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 @@
'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 @@
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
=== modified file 'hr_recruitment/report/hr_recruitment_report_view.xml'
--- hr_recruitment/report/hr_recruitment_report_view.xml 2012-05-07 18:13:46 +0000
+++ hr_recruitment/report/hr_recruitment_report_view.xml 2012-05-18 11:25:28 +0000
@@ -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>
_______________________________________________
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
