Kuldeep Joshi(OpenERP) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-hr_improvements-sbh-job-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_improvements-sbh-job-kjo/+merge/109564
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-hr_improvements-sbh-job-kjo/+merge/109564
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/trunk-hr_improvements-sbh.
=== modified file 'hr/hr.py'
--- hr/hr.py 2012-06-08 08:41:41 +0000
+++ hr/hr.py 2012-06-11 05:45:26 +0000
@@ -110,7 +110,7 @@
'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'),('done', 'Done')], '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 all job are \'In position\', set it \'In Recruitment\' if recruitment process is going on for this job position.'),
}
_defaults = {
'expected_employees': 1,
@@ -138,10 +138,6 @@
self.write(cr, uid, ids, {'state': 'open', 'no_of_recruitment': 0})
return True
- def job_done(self, cr, uid, ids, *args):
- self.write(cr, uid, ids, {'state': 'done', 'no_of_recruitment': 0})
- return True
-
hr_job()
class hr_employee(osv.osv):
=== modified file 'hr/hr_view.xml'
--- hr/hr_view.xml 2012-06-08 08:41:41 +0000
+++ hr/hr_view.xml 2012-06-11 05:45:26 +0000
@@ -347,7 +347,7 @@
<form layout="manual">
<header>
<button name="job_recruitement" string="In Recruitement" states="open" type="object"/>
- <button name="job_done" string="Recruitment Done" states="recruit" 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">
=== modified file 'hr_holidays/board_hr_manager_holidays_view.xml'
--- hr_holidays/board_hr_manager_holidays_view.xml 2011-11-14 13:17:23 +0000
+++ hr_holidays/board_hr_manager_holidays_view.xml 2012-06-11 05:45:26 +0000
@@ -3,7 +3,7 @@
<data>
<record id="action_view_holiday_status_manager_board" model="ir.actions.act_window">
- <field name="name">Leaves To Validate</field>
+ <field name="name">Leaves To Approved</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">hr.holidays</field>
<field name="view_type">form</field>
=== modified file 'hr_holidays/hr_holidays.py'
--- hr_holidays/hr_holidays.py 2012-06-08 06:37:55 +0000
+++ hr_holidays/hr_holidays.py 2012-06-11 05:45:26 +0000
@@ -397,11 +397,11 @@
for obj in self.browse(cr, uid, ids):
if obj.holiday_status_id.double_validation:
self.message_append_note(cr, uid, [obj.id], _('System notification'),
- _("The %s request has been <b>validated</b>. A second validation is necessary and is now pending.")
+ _("The %s request has been <b>Approved</b>. A second validation is necessary and is now pending.")
% ('leave' if obj.type == 'remove' else 'allocation',), type='notification', context=context)
else:
self.message_append_note(cr, uid, [obj.id], _('System notification'),
- _("The %s request has been <b>validated</b>. The validation process is now over.")
+ _("The %s request has been <b>Approved</b>. The validation process is now over.")
% ('leave' if obj.type == 'remove' else 'allocation',), type='notification', context=context)
def holidays_valid2_notificate(self, cr, uid, ids, context=None):
=== modified file 'hr_holidays/report/holidays_summary_report.py'
--- hr_holidays/report/holidays_summary_report.py 2012-05-30 11:46:07 +0000
+++ hr_holidays/report/holidays_summary_report.py 2012-06-11 05:45:26 +0000
@@ -117,7 +117,7 @@
else:
holiday_type=('validate')
else:
- type="Confirmed and Validated"
+ type="Approved and Confirmed"
holiday_type=('confirm','validate')
date_xml.append('<from>%s</from>\n'% (str(rml_obj.formatLang(som.strftime("%Y-%m-%d"),date=True))))
date_xml.append('<to>%s</to>\n' %(str(rml_obj.formatLang(eom.strftime("%Y-%m-%d"),date=True))))
=== modified file 'hr_holidays/wizard/hr_holidays_summary_employees_view.xml'
--- hr_holidays/wizard/hr_holidays_summary_employees_view.xml 2012-06-07 13:21:46 +0000
+++ hr_holidays/wizard/hr_holidays_summary_employees_view.xml 2012-06-11 05:45:26 +0000
@@ -7,7 +7,7 @@
<field name="model">hr.holidays.summary.employee</field>
<field name="type">form</field>
<field name="arch" type="xml">
- <form string="Employee's Leaves">
+ <form string="Leaves Summary">
<group col="4" colspan="6">
<field name="date_from"/>
<newline/>
@@ -25,7 +25,7 @@
</record>
<record id="action_hr_holidays_summary_employee" model="ir.actions.act_window">
- <field name="name">Employee's Leaves</field>
+ <field name="name">Leaves Summary</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">hr.holidays.summary.employee</field>
<field name="view_type">form</field>
@@ -35,7 +35,7 @@
<record model="ir.values" id="hr_holidays_summary_employee_value">
<field name="model_id" ref="hr.model_hr_employee" />
- <field name="name">Employee's Leaves</field>
+ <field name="name">Leaves Summary</field>
<field name="key2">client_print_multi</field>
<field name="value" eval="'ir.actions.act_window,' + str(ref('action_hr_holidays_summary_employee'))" />
<field name="key">action</field>
_______________________________________________
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
