From 5776b6c9b6ca30d4faf5d33ca3ffdbdaa3400a39 Mon Sep 17 00:00:00 2001 From: Ludovic CHEVALIER Date: Mon, 16 Dec 2013 15:43:04 +0100 Subject: [PATCH] [pos_order_line] new write method --- pos_membership.py | 118 +++++++++++++++++++++++----------------------- 1 file changed, 58 insertions(+), 60 deletions(-) diff --git a/pos_membership.py b/pos_membership.py index 0462200..fcfe106 100644 --- a/pos_membership.py +++ b/pos_membership.py @@ -702,72 +702,70 @@ class pos_order_line(osv.osv): print ("DEV: [pos_membership] [pos_order_line] [write] [super] : res=%s" % str(res)) for line in self.browse(cr, uid, ids, context=context): ml_ids = member_line_obj.search(cr, uid, [('pos_order_line', '=', line.id)], context=context) - if line.product_id and line.product_id.membership and not ml_ids: - date_from = line.product_id.membership_date_from - date_to = line.product_id.membership_date_to - if line.order_id.date_order > date_from and \ - line.order_id.date_order < date_to: - date_from = line.order_id.date_order - if line.product_id.membership_date2date: - date_from = ('date_from' in context - and context['date_from'] - and datetime.strptime(context['date_from'], "%Y-%m-%d") - or date.today()) - date_to = date_from + relativedelta(months = +12) # TODO: parameterize this delta? - date_from = date_from.strftime("%Y-%m-%d") - date_to = date_to .strftime("%Y-%m-%d") - print ("DEV: [pos_membership] [write] date_from: %s" % str(date_from)) - print ("DEV: [pos_membership] [write] date_to : %s" % str(date_to)) - member_line_obj.create(cr, uid - , { 'partner': line.order_id.partner_id and line.order_id.partner_id.id or False - , 'membership_id': line.product_id.id - , 'member_price': line.price_unit - , 'date': time.strftime('%Y-%m-%d') - , 'date_from': date_from - , 'date_to': date_to - , 'pos_order_line': line.id - } - , context=context) + if line.product_id and line.product_id.membership: + member_line_id = member_line_obj.search(cr, uid + , [('partner', '=', line.invoice_id.partner_id.id) + ,('pos_order_line', '=', line.id)] + , limit=1 + , context=context) + for member_line in member_line_obj.browse(cr, uid, member_line_id, context=context): + # NOTE: get member_line created in pos_membership.pos_order_line.create + date_from = member_line.date_from + date_to = member_line.date_to + if line.product_id.membership_date2date: + date_from = ('date_from' in context + and context.get('date_from') + and datetime.strptime(context('date_from'), "%Y-%m-%d") + or date.today()) + date_to = date_from + relativedelta(months = +12) # TODO: parameterize this delta? + date_from = date_from.strftime("%Y-%m-%d") + date_to = date_to .strftime("%Y-%m-%d") + print ("DEV: [pos_membership] [pos_order_line] [write] date_from: %s" % str(date_from)) + print ("DEV: [pos_membership] [pos_order_line] [write] date_to : %s" % str(date_to)) + member_line_obj.write(cr, uid, member_line.id + , {'date_from': date_from + ,'date_to' : date_to + } + , context=context) if line.product_id.membership_grouped: if line.order_id.partner_id.associate_members: associate_member_line_ids = member_line_obj.search(cr, uid - , [ ('pos_order_line', '=', line.id) - , ('partner', '!=', line.order_id.partner_id.id) - ] - , context=context) - for associate_member_line in member_line_obj.browse(cr, uid, associate_member_line_ids, context=context): - print ("DEV: [pos_membership] [write] [associate] date_from: %s" % str(date_from)) - print ("DEV: [pos_membership] [write] [associate] date_to : %s" % str(date_to)) - member_line_obj.write(cr, uid, associate_member_line.id - , {'date_from': date_from - ,'date_to' : date_to - } - , context=context) - else: - print("DEV: mettre une contrainte pour l'objet\ - membership.membership_line interdisant les\ - adhésions groupées reliées à des partenaires\ - sans membres associés") - else: - associate_member_line_ids = member_line_obj.search(cr, uid , [ ('pos_order_line', '=', line.id) - , ('partner', '!=', line.order_id.partner_id.id) + , ('partner', '!=', line.invoice_id.partner_id.id) ] , context=context) - member_line_obj.unlink(cr, uid, associate_member_line_ids, context=context) - - #Define member ident if it's necessary - partners = [line.order_id.partner_id] - if line.order_id.partner_id.associate_members: - partners.extend(line.order_id.partner_id.associate_members) - for i in partners: - if not i.member_ident: - mbr_id = self.pool.get('ir.sequence').get(cr, uid, 'member_ident') - self.pool.get('res.partner').write(cr, uid, i.id, {'member_ident': mbr_id}) - if line.product_id and not line.product_id.membership and ml_ids: - # Product line has changed to a non membership product - member_line_obj.unlink(cr, uid, ml_ids, context=context) - print("DEV: [pos_membership] [pos_order_line] [write]: res=%s" % str(res)) + for associate_member_line in member_line_obj.browse(cr, uid, associate_member_line_ids, context=context): + print ("DEV: [pos_membership] [pos_order_line] [write] [associate] date_from: %s" % str(date_from)) + print ("DEV: [pos_membership] [pos_order_line] [write] [associate] date_to : %s" % str(date_to)) + member_line_obj.write(cr, uid, associate_member_line.id + , {'date_from': date_from + ,'date_to' : date_to + } + , context=context) + else: + print("DEV: mettre une contrainte pour l'objet\ + membership.membership_line interdisant les\ + adhésions groupées reliées à des partenaires\ + sans membres associés") + else: + associate_member_line_ids = member_line_obj.search(cr, uid + , [ ('pos_order_line', '=', line.id) + , ('partner', '!=', line.order_id.partner_id.id) + ] + , context=context) + member_line_obj.unlink(cr, uid, associate_member_line_ids, context=context) + #Define member ident if it's necessary + partners = [line.order_id.partner_id] + if line.order_id.partner_id.associate_members: + partners.extend(line.order_id.partner_id.associate_members) + for i in partners: + if not i.member_ident: + mbr_id = self.pool.get('ir.sequence').get(cr, uid, 'member_ident') + self.pool.get('res.partner').write(cr, uid, i.id, {'member_ident': mbr_id}) + if line.product_id and not line.product_id.membership and ml_ids: + # Product line has changed to a non membership product + member_line_obj.unlink(cr, uid, ml_ids, context=context) + print ("DEV: [pos_membership] [pos_order_line] [write] : return=%s" % str(res)) return res def unlink(self, cr, uid, ids, context=None): -- 2.20.1