Merge branch 'julm' into membership_grouped

Conflicts:
	remembership.py

diff --cc remembership.py
index a8ae67c,849afcf..999f8c8
--- 1/remembership.py
--- 2/remembership.py
+++ b/remembership.py
@@@ -61,20 -54,27 +55,27 @@@ class Partner(osv.osv)
                  line_id = member_line_obj.search(cr, uid, [('partner', '=', partner_id),('date_cancel','=',False)],
                              limit=1, order='date_from', context=context)
                  if line_id:
-                         res[partner.id]['membership_start'] = member_line_obj.read(cr, uid, line_id[0],
-                                 ['date_from'], context=context)['date_from']
+                     res[partner.id]['membership_start'] = member_line_obj.read(cr, uid, line_id[0],
+                             ['date_from'], context=context)['date_from']
+                     if partner.associate_member:
+                         print ("DEV: [_membership_date] [associate] date_from: %s" % str(res[partner.id]['membership_start']))
+                     else:
+                         print ("DEV: [_membership_date] date_from: %s" % str(res[partner.id]['membership_start']))
 -            
 +
              if name == 'membership_stop':
                  line_id1 = member_line_obj.search(cr, uid, [('partner', '=', partner_id),('date_cancel','=',False)],
                              limit=1, order='date_to desc', context=context)
                  if line_id1:
-                       res[partner.id]['membership_stop'] = member_line_obj.read(cr, uid, line_id1[0],
-                                 ['date_to'], context=context)['date_to']
+                     res[partner.id]['membership_stop'] = member_line_obj.read(cr, uid, line_id1[0],
+                               ['date_to'], context=context)['date_to']
+                     if partner.associate_member:
+                         print ("DEV: [_membership_date] [associate] date_to: %s" % str(res[partner.id]['membership_stop']))
+                     else:
+                         print ("DEV: [_membership_date] date_to: %s" % str(res[partner.id]['membership_stop']))
 -            
 +
              if name == 'membership_cancel':
                  if partner.membership_state == 'canceled':
-                     # NOTE: hmm, partner_id et pas partner.id ?
-                     line_id2 = member_line_obj.search(cr, uid, [('partner', '=', partner_id)], limit=1, order='date_cancel', context=context)
+                     line_id2 = member_line_obj.search(cr, uid, [('partner', '=', partner.id)], limit=1, order='date_cancel', context=context)
                      if line_id2:
                          res[partner.id]['membership_cancel'] = member_line_obj.read(cr, uid, line_id2[0], ['date_cancel'], context=context)['date_cancel']
          return res