Jalpesh Patel(OpenERP) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-ps-tests-hr-others-atp-click_favorite-pja
into lp:~openerp-dev/openobject-addons/trunk-ps-tests-hr-others-atp.
Requested reviews:
Atul Patel(OpenERP) (atp-openerp)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-ps-tests-hr-others-atp-click_favorite-pja/+merge/133064
Hello sir,
I have fix problem of click on favorite it given trace back and improve
hr holiday problem leave request don't modify in validate state.
Thanks!
pja
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-ps-tests-hr-others-atp-click_favorite-pja/+merge/133064
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/trunk-ps-tests-hr-others-atp.
=== modified file 'hr_holidays/hr_holidays.py'
--- hr_holidays/hr_holidays.py 2012-10-12 11:42:58 +0000
+++ hr_holidays/hr_holidays.py 2012-11-06 13:38:20 +0000
@@ -211,6 +211,13 @@
'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, {
=== modified file 'mail/__init__.py'
--- mail/__init__.py 2012-10-18 15:23:22 +0000
+++ mail/__init__.py 2012-11-06 13:38:20 +0000
@@ -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
_______________________________________________
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
