Merge lp:~openerp-dev/openobject-addons/6.1-opw-579655-dhs into lp:openobject-addons/6.1

Proposed by Dhruti Shastri(OpenERP)
Status: Needs review
Proposed branch: lp:~openerp-dev/openobject-addons/6.1-opw-579655-dhs
Merge into: lp:openobject-addons/6.1
Diff against target: 20 lines (+10/-0)
1 file modified
crm/crm_meeting.py (+10/-0)
To merge this branch: bzr merge lp:~openerp-dev/openobject-addons/6.1-opw-579655-dhs
Reviewer Review Type Date Requested Status
Naresh(OpenERP) Pending
Review via email: mp+127251@code.launchpad.net
To post a comment you must log in.

Unmerged revisions

7010. By Dhruti Shastri(OpenERP)

[FIX][crm] : Calender Atendee deleted on deletion of meeting

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'crm/crm_meeting.py'
2--- crm/crm_meeting.py 2011-10-16 01:28:00 +0000
3+++ crm/crm_meeting.py 2012-10-01 12:00:29 +0000
4@@ -79,6 +79,16 @@
5 'active': 1,
6 'user_id': lambda self, cr, uid, ctx: uid,
7 }
8+
9+ def unlink(self,cr, uid, ids, context=None):
10+
11+ cr.execute('select create_uid from crm_meeting where id in %s',(tuple(ids),))
12+ creat_ids = map(lambda x: x[0], cr.fetchall())
13+ if uid in creat_ids:
14+ self.unlink(cr, uid,id, context=None)
15+ else :
16+ raise osv.except_osv(_('Warning !'),_('You cannot delete Meeting Created by Other User'))
17+ return True
18
19 def case_open(self, cr, uid, ids, *args):
20 """Confirms meeting