[MERGE]: Merged pja branch

bzr revid: atp@tinyerp.com-20121106152644-cl3xcd54dlbteg9n

addons/hr_holidays/hr_holidays.py

@@ -224,6 +224,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  holiday in self.browse(cr, uid, ids, context=context):
+            if holiday.state == 'validate' and holiday.employee_id.user_id.id == uid:
+                raise osv.except_osv(_('Warning!'),_('You cannot modify leave request, Once the leave Request has been approved'))
+        return res
 
     def set_to_draft(self, cr, uid, ids, context=None):
         self.write(cr, uid, ids, {

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