X-Git-Url: http://git.cyclocoop.org/?p=burette%2Fpos_membership.git;a=blobdiff_plain;f=pos_membership.py;h=e0b63c9908a3d116e16e6be037bc98ccd2703b9a;hp=213a06f41405d791cb63c2592e410e441ff8f891;hb=HEAD;hpb=4c75389f46caa6053a1e65f1babbcd82dcd58969 diff --git a/pos_membership.py b/pos_membership.py index 213a06f..e0b63c9 100644 --- a/pos_membership.py +++ b/pos_membership.py @@ -66,7 +66,6 @@ class pos_order(osv.osv): _inherit = 'pos.order' def create_partner_from_ui(self, cr, uid, partners, context=None): - print ("DEV: [pos_membership] [create_partner_from_ui] partners=%s" % str(partners)) partner_ids = [] partner_obj = self.pool.get('res.partner') for tmp_partner in partners: @@ -81,7 +80,6 @@ class pos_order(osv.osv): def create_from_ui(self, cr, uid, orders, context=None): # NOTE: copied from openerp/addons/point_of_sale/point_of_sale.py #_logger.info("orders: %r", orders) - print ("DEV: [pos_membership] [create_from_ui] order=", str(orders)) order_ids = [] for tmp_order in orders: order = tmp_order['data'] @@ -140,7 +138,6 @@ 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): @@ -159,7 +156,6 @@ class membership_line(osv.osv): 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') - print("DEV: [pos_membership] [membership_line] [_get_membership_lines_from_pos_order]: ids=%s context=%s" % (str(ids), str(context))) for order in self.pool.get('pos.order').browse(cr, uid, ids, context=context): if order.lines: list_membership_line += member_line_obj.search(cr, uid, [('pos_order_line', 'in', [l.id for l in order.lines])], context=context) @@ -168,7 +164,6 @@ class membership_line(osv.osv): # , '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): @@ -219,7 +214,6 @@ class membership_line(osv.osv): @param return: Dictionary of state Value """ res = {} - print("DEV: [pos_membership] [membership_line] [_state]: name=%s ids=%s args=%s context=%s" % (str(name), str(ids), str(args), str(context))) inv_obj = self.pool.get('account.invoice') ord_obj = self.pool.get('pos.order') for line in self.browse(cr, uid, ids, context=context): @@ -273,7 +267,6 @@ class membership_line(osv.osv): if not fetched: res[line.id] = 'canceled' continue - print("DEV: [pos_membership] [membership_line] [_state]: line.partner.id=%s" % (str(line.partner.id))) self.write(cr, uid, line.id, {'partner': line.partner.id}) # NOTE: force une mise à jour du partner, # car il n'y en a pas lors de la création du pos.order @@ -290,7 +283,6 @@ class membership_line(osv.osv): 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") #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': @@ -298,20 +290,15 @@ 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))) 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 = { @@ -344,7 +331,6 @@ class Partner(osv.osv): _inherit = 'res.partner' def _get_partner_id(self, cr, uid, ids, context=None): - print("DEV: [pos_membership] [Partner] [_get_partner_id]: ids=%s context=%s" % (str(ids), str(context))) member_line_obj = self.pool.get('membership.membership_line') res_obj = self.pool.get('res.partner') data_inv = member_line_obj.browse(cr, uid, ids, context=context) @@ -355,7 +341,6 @@ class Partner(osv.osv): while ids2: ids2 = res_obj.search(cr, uid, [('associate_member', 'in', ids2)], context=context) list_partner += ids2 - print("DEV: [pos_membership] [Partner] [_get_partner_id]: res=%s" % (str(list_partner))) return list_partner def _get_invoice_partner(self, cr, uid, ids, context=None): @@ -395,29 +380,24 @@ 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') for id in ids: - print("DEV: [pos_membership] [Partner] [_membership_state] id=%s" % (str(id))) partner_data = self.browse(cr, uid, id, context=context) - if partner_data.membership_cancel and today > partner_data.membership_cancel: - res[id] = 'canceled' - continue - if partner_data.membership_stop and today > partner_data.membership_stop: - res[id] = 'old' - continue + if not partner_data.free_member: + if partner_data.membership_cancel and today > partner_data.membership_cancel: + res[id] = 'canceled' + continue + if partner_data.membership_stop and today > partner_data.membership_stop: + res[id] = 'old' + continue s = 4 - print("DEV: [pos_membership] [Partner] [_membership_state] [partner_data] [member_lines] [test]") 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: 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 @@ -433,7 +413,6 @@ class Partner(osv.osv): s = 3 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': @@ -441,7 +420,6 @@ class Partner(osv.osv): 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") #inv = mline.pos_order_line.order_id #for payment in inv.payment_ids: # if payment.invoice.type == 'out_refund': @@ -449,7 +427,6 @@ class Partner(osv.osv): break 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 ostate == 'cancel' and s != 0 and s != 1: s = 2 @@ -468,6 +445,25 @@ class Partner(osv.osv): s = 5 else: s = 6 + + if s == 6: + # special case when the partner is imported from a file, + # in this case is has a valid membership lines but + # no payment information associated, consider it valid + + no_payment_info_at_all = True + valid_line = False + + for mline in partner_data.member_lines: + if mline.date_to >= today: + valid_line = True + + if mline.account_invoice_line or mline.pos_order_line: + no_payment_info_at_all = False + + if no_payment_info_at_all and valid_line: + s = 0 + if s == 0: res[id] = 'paid' elif s == 1: @@ -482,10 +478,6 @@ class Partner(osv.osv): res[id] = 'none' if partner_data.free_member and s != 0: res[id] = 'free' - 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): @@ -493,12 +485,8 @@ class Partner(osv.osv): name = name[0] res = {} member_line_obj = self.pool.get('membership.membership_line') - print("DEV: [pos_membership] [Partner] [_membership_date]: ids=%s" % (str(ids))) for partner in self.browse(cr, uid, ids, context=context): - if partner.associate_member: - partner_id = partner.associate_member.id - else: - partner_id = partner.id + partner_id = partner.id res[partner.id] = { 'membership_start': False, 'membership_stop': False, @@ -510,7 +498,6 @@ class Partner(osv.osv): if line_id: res[partner.id]['membership_start'] = member_line_obj.read(cr, uid, line_id[0], ['date_from'], context=context)['date_from'] - print("DEV: [pos_membership] [Partner] [_membership_date] [membership_start]: ids=%s date=%s" % (str(ids), str(res[partner.id]['membership_start']))) if name == 'membership_stop': line_id1 = member_line_obj.search(cr, uid, [('partner', '=', partner_id),('date_cancel','=',False)], @@ -518,15 +505,12 @@ class Partner(osv.osv): if line_id1: res[partner.id]['membership_stop'] = member_line_obj.read(cr, uid, line_id1[0], ['date_to'], context=context)['date_to'] - print("DEV: [pos_membership] [Partner] [_membership_date] [membership_stop]: ids=%s date=%s" % (str(ids), str(res[partner.id]['membership_stop']))) if name == 'membership_cancel': if partner.membership_state == 'canceled': 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'] - print("DEV: [pos_membership] [Partner] [_membership_date] [membership_cancel]: ids=%s date=%s" % (str(ids), str(res[partner.id]['membership_cancel']))) - print("DEV: [pos_membership] [Partner] [_membership_date]: res=%s" % (str(res))) return res def _get_partners(self, cr, uid, ids, context=None): @@ -595,7 +579,6 @@ 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]") wf_service = netsvc.LocalService("workflow") inv_ref = self.pool.get('account.invoice') inv_line_ref = self.pool.get('account.invoice.line') @@ -675,25 +658,34 @@ class pos_order(osv.osv): } 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 def onchange_partner_id(self, cr, uid, ids, part=False, context=None): + """ + - Change membership stop value if partner change + - Change partner in membership line if s·he is change + """ if not part: return {'value': {}} res = super(pos_order, self).onchange_partner_id(cr, uid, ids, part=part, context=context) membership_stop = self.pool.get('res.partner').browse(cr, uid, part, context=context).membership_stop res['value']['membership_stop'] = membership_stop + ml_line_obj = self.pool.get('membership.membership_line') + pol_obj = self.pool.get('pos.order.line') + for id in ids: + pol_ids = pol_obj.search(cr, uid, [('order_id', '=', id)], context=context) + pols = pol_obj.browse(cr, uid, pol_ids, context=context) + for pol in pols: + if pol.product_id.membership: + ml_line_ids = ml_line_obj.search(cr, uid, [('pos_order_line', '=', pol.id)], context=context) + ml_line_obj.write(cr, uid, ml_line_ids, {'partner': part}, context=context) return res def _get_membership_stop(self, cr, uid, ids, name, args, context=None): @@ -717,10 +709,8 @@ 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: @@ -734,18 +724,18 @@ class pos_order_line(osv.osv): 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 = datetime.strptime(line.order_id.date_order, "%Y-%m-%d %H:%M:%S") + date_to = date_from + relativedelta(months=+12, days=-1) # 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 + member_line_obj.write(cr, uid, member_line.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': date_from, + 'date_from': date_from, + 'date_to': date_to, + 'pos_order_line': line.id, } , context=context) if line.product_id.membership_grouped: @@ -756,8 +746,6 @@ class pos_order_line(osv.osv): ] , context=context) 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 @@ -786,7 +774,6 @@ 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] : return=%s" % str(res)) return res def unlink(self, cr, uid, ids, context=None): @@ -800,9 +787,7 @@ 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] [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) @@ -812,20 +797,15 @@ class pos_order_line(osv.osv): 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 = datetime.strptime(line.order_id.date_order, "%Y-%m-%d %H:%M:%S") + date_to = date_from + relativedelta(months=+12, days=-1) # 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)) + date_to = date_to.strftime("%Y-%m-%d") 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': date_from, 'date_from': date_from, 'date_to': date_to, 'pos_order_line': line.id, @@ -835,8 +815,6 @@ class pos_order_line(osv.osv): partners.extend(line.order_id.partner_id.associate_members) #Adding membership lines just for associate partners 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, @@ -851,13 +829,10 @@ class pos_order_line(osv.osv): #Define member ident if it's necessary for i in partners: if not i: - print ("\033[7mXXX: [pos_membership] [pos_order_line] [create] : pos_order_line has no partner_id!\033[0m") break 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()