Merge lp:~openerp-dev/openobject-addons/trunk-bug-1187317-Chandni into lp:openobject-addons

Proposed by Chandni Machchhar(OpenERP)
Status: Needs review
Proposed branch: lp:~openerp-dev/openobject-addons/trunk-bug-1187317-Chandni
Merge into: lp:openobject-addons
Diff against target: 24 lines (+3/-3)
1 file modified
membership/membership.py (+3/-3)
To merge this branch: bzr merge lp:~openerp-dev/openobject-addons/trunk-bug-1187317-Chandni
Reviewer Review Type Date Requested Status
OpenERP Core Team Pending
Review via email: mp+167227@code.launchpad.net

Description of the change

Hello,

  I have fix the Indentation problem on membership module.

Thanks,
Chandni.

To post a comment you must log in.

Unmerged revisions

8747. By Chandni Machchhar(OpenERP)

[FIX] Fix the Indentation Problem on membership module.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'membership/membership.py'
--- membership/membership.py 2013-04-15 10:23:49 +0000
+++ membership/membership.py 2013-06-04 10:11:45 +0000
@@ -274,9 +274,9 @@
274 member_line_obj = self.pool.get('membership.membership_line')274 member_line_obj = self.pool.get('membership.membership_line')
275 for partner in self.browse(cr, uid, ids, context=context):275 for partner in self.browse(cr, uid, ids, context=context):
276 if partner.associate_member:276 if partner.associate_member:
277 partner_id = partner.associate_member.id277 partner_id = partner.associate_member.id
278 else:278 else:
279 partner_id = partner.id279 partner_id = partner.id
280 res[partner.id] = {280 res[partner.id] = {
281 'membership_start': False,281 'membership_start': False,
282 'membership_stop': False,282 'membership_stop': False,
@@ -293,7 +293,7 @@
293 line_id1 = member_line_obj.search(cr, uid, [('partner', '=', partner_id),('date_cancel','=',False)],293 line_id1 = member_line_obj.search(cr, uid, [('partner', '=', partner_id),('date_cancel','=',False)],
294 limit=1, order='date_to desc', context=context)294 limit=1, order='date_to desc', context=context)
295 if line_id1:295 if line_id1:
296 res[partner.id]['membership_stop'] = member_line_obj.read(cr, uid, line_id1[0],296 res[partner.id]['membership_stop'] = member_line_obj.read(cr, uid, line_id1[0],
297 ['date_to'], context=context)['date_to']297 ['date_to'], context=context)['date_to']
298298
299 if name == 'membership_cancel':299 if name == 'membership_cancel':

Subscribers

People subscribed via source and target branches

to all changes: