From b7f782e19cadb55f49fd7827f3ffd043f6dbf174 Mon Sep 17 00:00:00 2001 From: Julien Moutinho Date: Thu, 28 Mar 2013 02:37:12 +0100 Subject: [PATCH] =?utf8?q?[membership]=20[pos=5Forder]=20corrections=20pou?= =?utf8?q?r=20que=20=C3=A7a=20marche=20mieux=20(quater).?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit XXX: il va bien falloir vérifier la machinerie des états de membre, notamment avec l'annulation, je sais que ya des vermines. --- pos_membership.py | 101 +++++++++++++++++++++++++++++++++------------- 1 file changed, 72 insertions(+), 29 deletions(-) diff --git a/pos_membership.py b/pos_membership.py index 748fd9a..990beb5 100644 --- a/pos_membership.py +++ b/pos_membership.py @@ -48,6 +48,7 @@ class membership_line(osv.osv): for partner in self.pool.get('res.partner').browse(cr, uid, ids, context=context): if partner.member_lines: list_membership_line += member_line_obj.search(cr, uid, [('id', 'in', [ l.id for l in partner.member_lines])], context=context) + print("DEV: [pos_membership] [membership_line] [_get_partners]: ids=%s res=%s" % (str(ids), str(list_membership_line))) return list_membership_line #def _get_membership_lines_from_account_invoice(self, cr, uid, ids, context=None): @@ -162,7 +163,7 @@ class membership_line(osv.osv): res[line.id] = state else: cr.execute(''' - SELECT i.state, i.id FROM + SELECT i.state, i.id, i.partner_id FROM pos_order i WHERE i.id = ( @@ -179,11 +180,15 @@ class membership_line(osv.osv): if not fetched: res[line.id] = 'canceled' continue + self.write(cr, uid, line.id, {'partner': fetched[2]}) + # NOTE: force un mise à jour du partner, + # car il n'y en a pas lors de la création du pos.order + # dans le PoS (pour le moment) ostate = fetched[0] state = 'none' - if (ostate == 'draft'): + if (ostate == 'paid') | (ostate == 'draft'): state = 'waiting' - elif (ostate == 'paid') | (ostate == 'done') | (ostate == 'invoiced'): + elif (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") @@ -194,6 +199,21 @@ class membership_line(osv.osv): elif ostate == 'cancel': state = 'canceled' res[line.id] = state + print("DEV: [pos_membership] [membership_line] [_state]: return=%s" % (str(res))) + return res + + def write(self, cr, uid, ids, vals, context=None): + print("DEV: [pos_membership] [membership_line] [write]: ids=%s vals=%s" % (str(ids), str(vals))) + member_line_obj = self.pool.get('membership.membership_line') + res = super(membership_line, self).write(cr, uid, ids, vals, context=context) + print("DEV: [pos_membership] [membership_line] [write]: res=%s" % str(res)) + return res + + def create(self, cr, uid, vals, context=None): + print("DEV: [pos_membership] [membership_line] [create]: vals=%s" % (str(vals))) + member_line_obj = self.pool.get('membership.membership_line') + res = super(membership_line, self).create(cr, uid, vals, context=context) + print("DEV: [pos_membership] [membership_line] [create]: res=%s" % (str(res))) return res _columns = { @@ -204,7 +224,8 @@ class membership_line(osv.osv): selection=STATE, store = { #'account.invoice': (_get_membership_lines_from_account_invoice, ['state'], 10), - 'pos.order': (_get_membership_lines_from_pos_order, ['state'], 10), + # NOTE: déjà géré par membership.membership_line._get_membership_lines + 'pos.order': (_get_membership_lines_from_pos_order, ['state', 'partner_id'], 10), 'res.partner': (_get_partners, ['membership_state'], 12), }, help="""It indicates the membership status. -Non Member: A member who has not applied for any membership. @@ -273,6 +294,7 @@ class Partner(osv.osv): @param return: Dictionary of Membership state Value """ res = {} + print("DEV: [pos_membership] [Partner] [_membership_state]: name=%s ids=%s args=%s context=%s" % (str(name), str(ids), str(args), str(context))) for id in ids: res[id] = 'none' today = time.strftime('%Y-%m-%d') @@ -286,26 +308,34 @@ class Partner(osv.osv): continue s = 4 if partner_data.member_lines: + print("DEV: [pos_membership] [Partner] [_membership_state] [partner_data] [member_lines]" % ()) for mline in partner_data.member_lines: + print("DEV: [pos_membership] [Partner] [_membership_state] [mline]: id=%s" % str(mline.id)) if mline.date_to >= today: if mline.account_invoice_line and mline.account_invoice_line.invoice_id: - mstate = mline.account_invoice_line.invoice_id.state - if mstate == 'paid': + istate = mline.account_invoice_line.invoice_id.state + print("DEV: [pos_membership] [Partner] [_membership_state] [account_invoice_line]: id=%s istate=%s" % (str(mline.account_invoice_line.invoice_id.id), str(istate))) + if istate == 'paid': s = 0 inv = mline.account_invoice_line.invoice_id for payment in inv.payment_ids: if payment.invoice.type == 'out_refund': s = 2 break - elif mstate == 'open' and s!=0: + elif istate == 'open' and s!=0: s = 1 - elif mstate == 'cancel' and s!=0 and s!=1: + elif istate == 'cancel' and s!=0 and s!=1: s = 2 - elif (mstate == 'draft' or mstate == 'proforma') and s!=0 and s!=1: + elif (istate == 'draft' or istate == 'proforma') and s!=0 and s!=1: s = 3 - elif mline.order_pos_line and mline.order_pos_line.order_id: - mstate = mline.pos_order_line.order_id.state - if (mstate == 'paid') | (mstate == 'done') | (mstate == 'paid'): + elif mline.pos_order_line and mline.pos_order_line.order_id: + ostate = mline.pos_order_line.order_id.state + print("DEV: [pos_membership] [Partner] [_membership_state] [pos_order_line]: id=%s ostate=%s" % (str(mline.pos_order_line.order_id.id), str(ostate))) + if ostate == 'paid' and s!=0 and s!=1: + s = 3 + if ostate == 'invoiced': + s = 1 + if ostate == 'done': s = 0 # XXX: regarder l'équivalent de out_refund pour un pos.order print("DEV: [pos_membership] [partner] [_membership_state]: paid: TODO") @@ -314,13 +344,13 @@ class Partner(osv.osv): # if payment.invoice.type == 'out_refund': # s = 2 break - elif mstate == 'open' and s!=0: + elif ostate == 'open' and s!=0: # XXX: 1 donne invoiced, c'est pitet pas bon print("DEV: [pos_membership] [partner] [_membership_state]: invoiced: TODO") s = 1 - elif mstate == 'cancel' and s!=0 and s!=1: + elif ostate == 'cancel' and s!=0 and s!=1: s = 2 - elif mstate == 'draft' and s!=0 and s!=1: + elif ostate == 'draft' and s!=0 and s!=1: s = 3 if s==4: for mline in partner_data.member_lines: @@ -352,6 +382,7 @@ class Partner(osv.osv): if partner_data.associate_member: res_state = self._membership_state(cr, uid, [partner_data.associate_member.id], name, args, context=context) res[id] = res_state[partner_data.associate_member.id] + print("DEV: [pos_membership] [Partner] [_membership_state]: res=%s" % (str(res))) return res def _membership_date(self, cr, uid, ids, name, args, context=None): @@ -401,19 +432,13 @@ class Partner(osv.osv): return self._membership_state(*args, **kwargs) _columns = { - 'associate_member': fields.many2one('res.partner', 'Associate Member',help="A member with whom you want to associate your membership.It will consider the membership state of the associated member."), - 'member_lines': fields.one2many('membership.membership_line', 'partner', 'Membership'), - 'free_member': fields.boolean('Free Member', help = "Select if you want to give free membership."), - 'membership_amount': fields.float( - 'Membership Amount', digits=(16, 2), - help = 'The price negotiated by the partner'), 'membership_state': fields.function( __get_membership_state, string = 'Current Membership Status', type = 'selection', selection = STATE, store = { 'account.invoice': (_get_invoice_partner, ['state'], 10), - 'pos.order': (_get_order_partner, ['state'], 10), + 'pos.order': (_get_order_partner, ['state', 'partner_id'], 10), 'membership.membership_line': (_get_partner_id, ['state'], 10), 'res.partner': (_get_partners, ['free_member', 'membership_state', 'associate_member'], 10) }, help="""It indicates the membership state. @@ -464,7 +489,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.id))) return True _constraints = [ @@ -551,6 +576,20 @@ class pos_order(osv.osv): 'target': 'current', 'res_id': inv_ids and inv_ids[0] or False, } + + def write(self, cr, uid, ids, vals, context=None): + print("DEV: [pos_membership] [pos_order] [write]: ids=%s vals=%s" % (str(ids), str(vals))) + pos_order_obj = self.pool.get('pos.order') + res = super(pos_order, self).write(cr, uid, ids, vals, context=context) + print("DEV: [pos_membership] [pos_order] [write]: res=%s" % str(res)) + return res + + def create(self, cr, uid, vals, context=None): + print("DEV: [pos_membership] [pos_order] [create]: vals=%s" % (str(vals))) + pos_order_obj = self.pool.get('pos.order') + res = super(pos_order, self).create(cr, uid, vals, context=context) + print("DEV: [pos_membership] [pos_order] [create]: res=%s" % (str(res))) + return res pos_order() @@ -558,16 +597,18 @@ class pos_order_line(osv.osv): _inherit = 'pos.order.line' def write(self, cr, uid, ids, vals, context=None): + print("DEV: [pos_membership] [pos_order_line] [write]: ids=%s vals=%s context=%s" % (str(ids), str(vals), str(context))) member_line_obj = self.pool.get('membership.membership_line') res = super(pos_order_line, self).write(cr, uid, ids, vals, context=context) + 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.invoice_id.date_invoice > date_from and line.invoice_id.date_invoice < date_to: - date_from = line.invoice_id.date_invoice - + 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'] @@ -579,7 +620,7 @@ class pos_order_line(osv.osv): 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 + , { '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') @@ -627,6 +668,7 @@ class pos_order_line(osv.osv): 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)) return res def unlink(self, cr, uid, ids, context=None): @@ -640,10 +682,11 @@ class pos_order_line(osv.osv): def create(self, cr, uid, vals, context=None): member_line_obj = self.pool.get('membership.membership_line') + print("DEV: [pos_membership] [pos_order_line] [create]: vals=%s context=%s" % (str(vals), str(context))) 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)) + print ("DEV: [pos_membership] [pos_order_line] [create] [super] : res=%s" % str(res)) line = self.browse(cr, uid, res, 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 -- 2.20.1