Merge lp:~openerp-dev/openobject-addons/trunk-migration_leaves_warning-cha into lp:openobject-addons

Proposed by Ajay Chauhan(OpenERP)
Status: Needs review
Proposed branch: lp:~openerp-dev/openobject-addons/trunk-migration_leaves_warning-cha
Merge into: lp:openobject-addons
Diff against target: 12 lines (+1/-1)
1 file modified
hr_holidays/hr_holidays.py (+1/-1)
To merge this branch: bzr merge lp:~openerp-dev/openobject-addons/trunk-migration_leaves_warning-cha
Reviewer Review Type Date Requested Status
Ajay Patel (OpenERP) (community) Approve
OpenERP Core Team Pending
Review via email: mp+140845@code.launchpad.net

Description of the change

Hello,

  I have solved an issue from oerp-migration-usabilitysmallissues. Issue is as follow
 leave request : When I enter a leave request and select a holiday type which I do not have enough days, the warning message is : "Warning!
There are not enough Legal leaves 2013 allocated for employee Cécile Debois; please create an allocation request for this leave type" ------------> Please, do not ask employees to create allocation request by themself !
Warning message should be : There are not enough Legal leaves 2013 allocated for Cécile Debois; please use another leave type or contact a human resource responsible.

Thanks,
Ajay Chauhan

To post a comment you must log in.
Revision history for this message
Ajay Patel (OpenERP) (ajay-openerp) :
review: Approve

Unmerged revisions

8422. By Ajay Chauhan(OpenERP)

[IMP] hr_holidays: change warning message for leave request

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'hr_holidays/hr_holidays.py'
2--- hr_holidays/hr_holidays.py 2012-12-10 11:16:54 +0000
3+++ hr_holidays/hr_holidays.py 2012-12-20 09:18:23 +0000
4@@ -406,7 +406,7 @@
5 if record.employee_id and not record.holiday_status_id.limit:
6 leaves_rest = holi_status_obj.get_days( cr, uid, [record.holiday_status_id.id], record.employee_id.id, False)[record.holiday_status_id.id]['remaining_leaves']
7 if leaves_rest < record.number_of_days_temp:
8- raise osv.except_osv(_('Warning!'), _('There are not enough %s allocated for employee %s; please create an allocation request for this leave type.') % (record.holiday_status_id.name, record.employee_id.name))
9+ raise osv.except_osv(_('Warning!'), _('There are not enough %s allocated for employee %s; please use another leave type or contact a human resource responsible.') % (record.holiday_status_id.name, record.employee_id.name))
10 return True
11
12 # -----------------------------

Subscribers

People subscribed via source and target branches

to all changes: