From 86e5cb39e955da538e456c7a674fe3979e3d4e2e Mon Sep 17 00:00:00 2001 From: "pankita shah (Open ERP)" Date: Tue, 6 Nov 2012 11:39:06 +0530 Subject: [PATCH 1/6] [FIX] traceback when send mail in interview request bzr revid: shp@tinyerp.com-20121106060906-a5s23miwxc5i0zg5 --- addons/hr_evaluation/hr_evaluation.py | 1 + 1 file changed, 1 insertion(+) diff --git a/addons/hr_evaluation/hr_evaluation.py b/addons/hr_evaluation/hr_evaluation.py index b13e90cd627..eece0c7497e 100644 --- a/addons/hr_evaluation/hr_evaluation.py +++ b/addons/hr_evaluation/hr_evaluation.py @@ -291,6 +291,7 @@ survey_request() class hr_evaluation_interview(osv.osv): _name = 'hr.evaluation.interview' _inherits = {'survey.request': 'request_id'} + _inherit = 'mail.thread' _rec_name = 'request_id' _description = 'Appraisal Interview' _columns = { From 13ccbc9f6ee28d1888eff671847f5636b5a76c88 Mon Sep 17 00:00:00 2001 From: "Jalpesh Patel (OpenERP)" Date: Tue, 6 Nov 2012 15:07:24 +0530 Subject: [PATCH 2/6] [IMP]fix proble of click favorite bzr revid: pja@tinyerp.com-20121106093724-m597jx8m1z73qaxq --- addons/mail/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/mail/__init__.py b/addons/mail/__init__.py index aea7ee62cbc..003369be38f 100644 --- a/addons/mail/__init__.py +++ b/addons/mail/__init__.py @@ -22,12 +22,12 @@ import mail_message_subtype import mail_alias import mail_followers +import mail_favorite import mail_message import mail_mail import mail_thread import mail_group import mail_vote -import mail_favorite import res_partner import res_users import report From a1fa0d61d69fd8ade6da41fb42c44d4b6d172962 Mon Sep 17 00:00:00 2001 From: "Jalpesh Patel (OpenERP)" Date: Tue, 6 Nov 2012 18:50:25 +0530 Subject: [PATCH 3/6] [IMP]don't modify leave request in validate state bzr revid: pja@tinyerp.com-20121106132025-9wrimitdry3bi7kk --- addons/hr_holidays/hr_holidays.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/addons/hr_holidays/hr_holidays.py b/addons/hr_holidays/hr_holidays.py index 0977f3729b4..6fee61f2696 100644 --- a/addons/hr_holidays/hr_holidays.py +++ b/addons/hr_holidays/hr_holidays.py @@ -211,6 +211,13 @@ class hr_holidays(osv.osv): 'number_of_days_temp': 0, } return result + + def write(self,cr, uid, ids,vals, context=None): + res = super(hr_holidays, self).write(cr, uid, ids,vals, context=context) + for val in self.browse(cr, uid, ids, context=context): + if val.state == 'validate' and val.employee_id.user_id.id == uid : + raise osv.except_osv(_('Warning!'),_('"You cannot modify leave request in approved state"')) + return res def set_to_draft(self, cr, uid, ids, context=None): self.write(cr, uid, ids, { From 54fb04a3682281dc1c43459887b7612ac2808d87 Mon Sep 17 00:00:00 2001 From: "Atul Patel (OpenERP)" Date: Tue, 6 Nov 2012 19:25:15 +0530 Subject: [PATCH 4/6] [FIX]: Add constraints to fix same day overlaps problem bzr revid: atp@tinyerp.com-20121106135515-3pp7rsrtnspvb28g --- addons/hr_holidays/hr_holidays.py | 13 +++++++++++++ addons/hr_holidays/hr_holidays_demo.xml | 8 ++++---- 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/addons/hr_holidays/hr_holidays.py b/addons/hr_holidays/hr_holidays.py index 0977f3729b4..8d4f874b464 100644 --- a/addons/hr_holidays/hr_holidays.py +++ b/addons/hr_holidays/hr_holidays.py @@ -112,6 +112,14 @@ class hr_holidays(osv.osv): result[hol.id] = hol.number_of_days_temp return result + def _check_date(self, cr, uid, ids): + for holiday in self.browse(cr, uid, ids): + holiday_ids = self.search(cr, uid, [('date_from', '<=', holiday.date_to), ('date_to', '>=', holiday.date_from), ('employee_id', '=', holiday.employee_id.id), ('id', '<>', holiday.id)]) + if holiday_ids: + return False + return True + + _columns = { 'name': fields.char('Description', size=64), 'state': fields.selection([('draft', 'To Submit'), ('cancel', 'Cancelled'),('confirm', 'To Approve'), ('refuse', 'Refused'), ('validate1', 'Second Approval'), ('validate', 'Approved')], @@ -145,6 +153,11 @@ class hr_holidays(osv.osv): 'user_id': lambda obj, cr, uid, context: uid, 'holiday_type': 'employee' } + + _constraints = [ + (_check_date, 'You can not have 2 Leaves that overlaps on same day!', ['date_from','date_to']), + ] + _sql_constraints = [ ('type_value', "CHECK( (holiday_type='employee' AND employee_id IS NOT NULL) or (holiday_type='category' AND category_id IS NOT NULL))", "The employee or employee category of this request is missing."), ('date_check2', "CHECK ( (type='add') OR (date_from <= date_to))", "The start date must be before the end date !"), diff --git a/addons/hr_holidays/hr_holidays_demo.xml b/addons/hr_holidays/hr_holidays_demo.xml index 4c9d18683c7..accf8c26935 100644 --- a/addons/hr_holidays/hr_holidays_demo.xml +++ b/addons/hr_holidays/hr_holidays_demo.xml @@ -34,8 +34,8 @@ Summer Vacation - - + + add draft 7 @@ -45,8 +45,8 @@ International Tour - - + + add 7 From cda1256ae89f92ef18aa4e113d2135f34ff1a71d Mon Sep 17 00:00:00 2001 From: "Atul Patel (OpenERP)" Date: Wed, 7 Nov 2012 11:23:10 +0530 Subject: [PATCH 5/6] [FIX]: Fix condition for validate holidays bzr revid: atp@tinyerp.com-20121107055310-2t4j7ftz7ax4ci92 --- addons/hr_holidays/hr_holidays.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/hr_holidays/hr_holidays.py b/addons/hr_holidays/hr_holidays.py index 600e205b0d8..cbaaa42a8fa 100644 --- a/addons/hr_holidays/hr_holidays.py +++ b/addons/hr_holidays/hr_holidays.py @@ -269,7 +269,7 @@ class hr_holidays(osv.osv): def write(self, cr, uid, ids, vals, context=None): res = super(hr_holidays, self).write(cr, uid, ids, vals, context=context) for holiday in self.browse(cr, uid, ids, context=context): - if holiday.state == 'validate' and holiday.employee_id.user_id.id == uid: + if holiday.state == 'validate' and holiday.employee_id.user_id.id != 1: raise osv.except_osv(_('Warning!'),_('You cannot modify leave request, Once the leave Request has been approved')) return res From 58f5269f11c96a1b59db2410ccf6cd50324681fb Mon Sep 17 00:00:00 2001 From: "Atul Patel (OpenERP)" Date: Wed, 7 Nov 2012 11:41:52 +0530 Subject: [PATCH 6/6] [FIX]: fix validation problem bzr revid: atp@tinyerp.com-20121107061152-ch2ti57eezbw2xo8 --- addons/hr_holidays/hr_holidays.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/addons/hr_holidays/hr_holidays.py b/addons/hr_holidays/hr_holidays.py index cbaaa42a8fa..88622f8b6ed 100644 --- a/addons/hr_holidays/hr_holidays.py +++ b/addons/hr_holidays/hr_holidays.py @@ -269,7 +269,8 @@ class hr_holidays(osv.osv): def write(self, cr, uid, ids, vals, context=None): res = super(hr_holidays, self).write(cr, uid, ids, vals, context=context) for holiday in self.browse(cr, uid, ids, context=context): - if holiday.state == 'validate' and holiday.employee_id.user_id.id != 1: + + if holiday.state == 'validate' and holiday.employee_id.user_id.id == uid and uid != 1: raise osv.except_osv(_('Warning!'),_('You cannot modify leave request, Once the leave Request has been approved')) return res