From: Julien Moutinho Date: Wed, 27 Mar 2013 19:08:21 +0000 (+0100) Subject: [membership] [pos_order] corrections pour que ça marche mieux. X-Git-Url: http://git.cyclocoop.org/?p=burette%2Fpos_membership.git;a=commitdiff_plain;h=c05f11686e3b0cd5e8954780deb698a6283d3594 [membership] [pos_order] corrections pour que ça marche mieux. --- diff --git a/pos_membership.py b/pos_membership.py index 651253e..beb3c56 100644 --- a/pos_membership.py +++ b/pos_membership.py @@ -50,26 +50,32 @@ class membership_line(osv.osv): list_membership_line += member_line_obj.search(cr, uid, [('id', 'in', [ l.id for l in partner.member_lines])], context=context) return list_membership_line - def _get_membership_lines_from_account_invoice(self, cr, uid, ids, context=None): - list_membership_line = [] - member_line_obj = self.pool.get('membership.membership_line') - for invoice in self.pool.get('account.invoice').browse(cr, uid, ids, context=context): - if invoice.invoice_line: - list_membership_line += member_line_obj.search(cr, uid, [('account_invoice_line', 'in', [ l.id for l in invoice.invoice_line])], context=context) - return \ - { 'class': 'account.invoice' - , 'ids': list_membership_line - } + #def _get_membership_lines_from_account_invoice(self, cr, uid, ids, context=None): + # list_membership_line = [] + # member_line_obj = self.pool.get('membership.membership_line') + # for invoice in self.pool.get('account.invoice').browse(cr, uid, ids, context=context): + # if invoice.invoice_line: + # list_membership_line += member_line_obj.search(cr, uid, [('account_invoice_line', 'in', [ l.id for l in invoice.invoice_line])], context=context) + # res = \ + # { 'class': 'account.invoice' + # , 'ids': list_membership_line + # } + # #res= list_membership_line + # print("DEV: [pos_membership] [membership_line] [_get_membership_lines_from_account_invoice]: res=%s" % str(res)) + # return res def _get_membership_lines_from_pos_order(self, cr, uid, ids, context=None): list_membership_line = [] member_line_obj = self.pool.get('membership.membership_line') for order in self.pool.get('pos.order').browse(cr, uid, ids, context=context): if order.order_line: list_membership_line += member_line_obj.search(cr, uid, [('pos_order_line', 'in', [ l.id for l in order.order_line])], context=context) - return \ + res = \ { 'class': 'pos.order' , 'ids': list_membership_line } + #res= list_membership_line + print("DEV: [pos_membership] [membership_line] [_get_membership_lines_from_pos_order]: res=%s" % str(res)) + return res def _check_membership_date(self, cr, uid, ids, context=None): """Check if membership product is not in the past @@ -119,9 +125,14 @@ class membership_line(osv.osv): @param return: Dictionary of state Value """ res = {} - if data['class'] == 'account.invoice': + print("DEV: [pos_membership] [membership_line] [_state]: name=%s data=%s args=%s context=%s" % (str(name), str(data), str(args), str(context))) + if type(data) == type(list()) or data.get('class') == 'account.invoice': inv_obj = self.pool.get('account.invoice') - for line in self.browse(cr, uid, data['ids'], context=context): + if type(data) == type(list()): + ids = data + else: + ids = data.get('ids') + for line in self.browse(cr, uid, ids, context=context): cr.execute(''' SELECT i.state, i.id FROM account_invoice i @@ -148,7 +159,6 @@ class membership_line(osv.osv): state = 'invoiced' elif istate == 'paid': state = 'paid' - # XXX: regarder l'équivalent de out_refund pour un pos.order inv = inv_obj.browse(cr, uid, fetched[1], context=context) for payment in inv.payment_ids: if payment.invoice and payment.invoice.type == 'out_refund': @@ -156,9 +166,9 @@ class membership_line(osv.osv): elif istate == 'cancel': state = 'canceled' res[line.id] = state - elif data['class'] == 'pos.order': + elif data.get('class') == 'pos.order': ord_obj = self.pool.get('pos.order') - for line in self.browse(cr, uid, data['ids'], context=context): + for line in self.browse(cr, uid, data.get('ids'), context=context): cr.execute(''' SELECT i.state, i.id FROM pos_order i @@ -184,7 +194,7 @@ class membership_line(osv.osv): elif (ostate == 'paid') | (ostate == 'done') | (ostate == 'invoiced'): state = 'paid' # XXX: regarder l'équivalent de out_refund pour un pos.order - print("DEV: [pos_membership] [membership_line] [_state]: paid: TODO"), + print("DEV: [pos_membership] [membership_line] [_state]: paid: TODO") #inv = ord_obj.browse(cr, uid, fetched[1], context=context) #for payment in inv.payment_ids: # if payment.invoice and payment.invoice.type == 'out_refund': @@ -201,7 +211,7 @@ class membership_line(osv.osv): string='Membership Status', type='selection', selection=STATE, store = { - 'account.invoice': (_get_membership_lines_from_account_invoice, ['state'], 10), + #'account.invoice': (_get_membership_lines_from_account_invoice, ['state'], 10), 'pos.order': (_get_membership_lines_from_pos_order, ['state'], 10), 'res.partner': (_get_partners, ['membership_state'], 12), }, help="""It indicates the membership status. @@ -306,7 +316,7 @@ class Partner(osv.osv): if (mstate == 'paid') | (mstate == 'done') | (mstate == 'paid'): s = 0 # XXX: regarder l'équivalent de out_refund pour un pos.order - print("DEV: [pos_membership] [partner] [_membership_state]: paid: TODO"), + print("DEV: [pos_membership] [partner] [_membership_state]: paid: TODO") #inv = mline.pos_order_line.order_id #for payment in inv.payment_ids: # if payment.invoice.type == 'out_refund': @@ -314,7 +324,7 @@ class Partner(osv.osv): break elif mstate == 'open' and s!=0: # XXX: 1 donne invoiced, c'est pitet pas bon - print("DEV: [pos_membership] [partner] [_membership_state]: invoiced: TODO"), + print("DEV: [pos_membership] [partner] [_membership_state]: invoiced: TODO") s = 1 elif mstate == 'cancel' and s!=0 and s!=1: s = 2 @@ -462,7 +472,7 @@ class pos_order(osv.osv): order_line_obj = self.pool.get('pos.order.line') data_order_line = order_line_obj.browse(cr, uid, ids, context=context) for data in data_order_line: - print("DEV: [pos_membership] [_check_membership_product] [order_line]: data=%s product=%s" % (str(data.id), str(data.product_id))), + print("DEV: [pos_membership] [_check_membership_product] [order_line]: data=%s product=%s" % (str(data.id), str(data.product_id))) return True _constraints = [ @@ -471,7 +481,7 @@ class pos_order(osv.osv): # XXX: copied from openerp/addons/point_of_sale/point_of_sale.py def action_invoice(self, cr, uid, ids, context=None): - print ("DEV: [pos_membership] [pos_order] [action_invoice]"); + print ("DEV: [pos_membership] [pos_order] [action_invoice]") wf_service = netsvc.LocalService("workflow") inv_ref = self.pool.get('account.invoice') inv_line_ref = self.pool.get('account.invoice.line') @@ -560,31 +570,32 @@ class pos_order_line(osv.osv): res = super(pos_order_line, self).write(cr, uid, ids, vals, context=context) 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: - member_line_id = member_line_obj.search(cr, uid - , [('partner' , '=', line.order_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 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['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.write(cr, uid, member_line.id - , {'date_from': date_from - ,'date_to' : date_to - } - , 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.invoice_id.date_invoice > date_from and line.invoice_id.date_invoice < date_to: + date_from = line.invoice_id.date_invoice + + 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.invoice_id.partner_id.id + , '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.membership_grouped: if line.order_id.partner_id.associate_members: associate_member_line_ids = member_line_obj.search(cr, uid @@ -626,43 +637,53 @@ class pos_order_line(osv.osv): member_line_obj.unlink(cr, uid, ml_ids, context=context) return res + def unlink(self, cr, uid, ids, context=None): + """Remove Membership Line Record for Account Invoice Line + """ + member_line_obj = self.pool.get('membership.membership_line') + for id in ids: + ml_ids = member_line_obj.search(cr, uid, [('pos_order_line', '=', id)], context=context) + member_line_obj.unlink(cr, uid, ml_ids, context=context) + return super(pos_order_line, self).unlink(cr, uid, ids, context=context) + def create(self, cr, uid, vals, context=None): member_line_obj = self.pool.get('membership.membership_line') res = super(pos_order_line, self).create(cr, uid, vals, context=context) + print ("DEV: [pos_membership] [pos_order_line] [create] : begin res=%s" % str(res)) line = self.browse(cr, uid, res, context=context) - - if line.product_id and line.product_id.membership: - member_line_id = member_line_obj.search(cr, uid - , [('partner' , '=', line.order_line.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 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['date_from'] - and datetime.strptime(context['date_from'], "%Y-%m-%d") - or date.today()) - date_to = date_from + relativedelta(days = +364) # TODO: parameterize this delta? - date_from = date_from.strftime("%Y-%m-%d") - date_to = date_to .strftime("%Y-%m-%d") - print ("DEV: [pos_membership] [create] date_from: %s" % str(date_from)) - print ("DEV: [pos_membership] [create] 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) - partners = [line.order_line.partner_id] - if line.product_id.membership_grouped and line.order_line.partner_id.associate_members: - partners.extend(line.order_line.partner_id.associate_members) + + 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.get('date_from') + and datetime.strptime(context.get('date_from'), "%Y-%m-%d") + or date.today()) + date_to = date_from + relativedelta(days = +364) # 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] [create] date_from: %s" % str(date_from)) + print ("DEV: [pos_membership] [pos_order_line] [create] 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) + partners = [line.order_id.partner_id] + if line.product_id.membership_grouped and line.order_id.partner_id.associate_members: + partners.extend(line.order_id.partner_id.associate_members) #Adding membership lines just for associate partners - for associate_member in line.order_line.partner_id.associate_members: - print ("DEV: [pos_membership] [create] [associate] date_from: %s" % str(date_from)) - print ("DEV: [pos_membership] [create] [associate] date_to : %s" % str(date_to)) + for associate_member in line.order_id.partner_id.associate_members: + print ("DEV: [pos_membership] [pos_order_line] [create] [associate] date_from: %s" % str(date_from)) + print ("DEV: [pos_membership] [pos_order_line] [create] [associate] date_to : %s" % str(date_to)) member_line_obj.create(cr, uid, { 'partner': associate_member.id, 'membership_id': line.product_id.id, @@ -672,13 +693,15 @@ class pos_order_line(osv.osv): 'date_to': date_to, 'pos_order_line': line.id, }, context=context) - elif line.product_id.membership_grouped and not line.order_line.partner_id.associate_members: + elif line.product_id.membership_grouped and not line.order_id.partner_id.associate_members: raise osv.except_osv(_('Error!!!'), _('You try to order grouped membership product to a partner who hasn\'t associated partners.')) #Define member ident if it's necessary for i in partners: if not i.member_ident: + print ("DEV: [pos_membership] [pos_order_line] [create] [partners] : i=%s i.id=%s" % (str(i), str(i.id))) 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}) + print ("DEV: [pos_membership] [pos_order_line] [create] : return=%s" % str(res)) return res pos_order_line()