X-Git-Url: http://git.cyclocoop.org/?a=blobdiff_plain;f=pos_membership.py;h=6a936d20245f6a52e2b2ea527a608d876cdb782a;hb=c47eab746bf88bb0112ebd52cc50e9c37e03628c;hp=6e75dd7e9d84aaf1c32fdca21f533a2e0bb2bb5b;hpb=3ca4ee1f0a4ab145da9e668e4c87c1c6618d507b;p=burette%2Fpos_membership.git diff --git a/pos_membership.py b/pos_membership.py index 6e75dd7..6a936d2 100644 --- a/pos_membership.py +++ b/pos_membership.py @@ -11,7 +11,7 @@ # the Free Software Foundation, either version 3 of the License, or # (at your option) any later version. # -# ReMembership is distributed in the hope that it will be useful, +# POS Membership is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. @@ -27,7 +27,6 @@ import time from datetime import datetime, date from dateutil.relativedelta import relativedelta - STATE = [ ('none', 'Non Member'), ('canceled', 'Cancelled Member'), @@ -39,11 +38,34 @@ STATE = [ ] +class pos_session(osv.osv): + _inherit = 'pos.session' + + def open_cb(self, cr, uid, ids, context=None): + """ + Avoid call the Point Of Sale interface and set the pos.session to 'opened' (in progress) + """ + if context is None: + context = dict() + + if isinstance(ids, (int, long)): + ids = [ids] + + this_record = self.browse(cr, uid, ids[0], context=context) + this_record._workflow_signal('open') + + context.update(active_id=this_record.id) + + return { + } +pos_session() + + + 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: @@ -58,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'] @@ -117,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): @@ -136,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) @@ -145,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): @@ -196,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): @@ -233,7 +250,7 @@ class membership_line(osv.osv): res[line.id] = state else: cr.execute(''' - SELECT i.state, i.id, i.partner_id FROM + SELECT i.state, i.id FROM pos_order i WHERE i.id = ( @@ -250,13 +267,12 @@ class membership_line(osv.osv): if not fetched: res[line.id] = 'canceled' continue - partner_id = fetched[2] - self.write(cr, uid, line.id, {'partner': 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 # dans le PoS (pour le moment) partner_obj = self.pool.get('res.partner') - for partner in partner_obj.browse(cr, uid, [partner_id], context=context): + for partner in partner_obj.browse(cr, uid, [line.partner.id], context=context): if not partner.member_ident: mbr_id = self.pool.get('ir.sequence').get(cr, uid, 'member_ident') partner_obj.write(cr, uid, partner.id, {'member_ident': mbr_id}) @@ -267,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': @@ -275,21 +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))) - 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 = { @@ -322,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) @@ -333,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): @@ -373,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 @@ -411,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': @@ -419,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': @@ -427,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 @@ -446,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: @@ -463,7 +481,6 @@ 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): @@ -471,7 +488,6 @@ 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 @@ -488,7 +504,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)], @@ -496,15 +511,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): @@ -573,7 +585,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') @@ -622,8 +633,8 @@ class pos_order(osv.osv): inv_line['price_unit'] = line.price_unit inv_line['discount'] = line.discount inv_line['name'] = inv_name - inv_line['invoice_line_tax_id'] = ('invoice_line_tax_id' in inv_line)\ - and [(6, 0, inv_line['invoice_line_tax_id'])] or [] + inv_line['invoice_line_tax_id'] = [(6, 0, [x.id for x in line.product_id.taxes_id] )] + inv_line_ref.create(cr, uid, inv_line, context=context) #inv_line_ref.create(cr, uid, inv_line, context=context) inv['invoice_line'].append((0, 0, inv_line)) inv_id = inv_ref.create(cr, uid, inv, context=context) @@ -653,97 +664,107 @@ 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): + 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 + return res + + def _get_membership_stop(self, cr, uid, ids, name, args, context=None): + """This function return the end date of the partner in pos order.""" + res = {} + for order in self.browse(cr, uid, ids): + res[order.id] = order.partner_id.membership_stop + return res + + _columns = { + 'membership_stop': fields.function( + _get_membership_stop, + string='Membership stop', + type='date', + help='The end date of the last membership of this partner.', + ), + } pos_order() 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.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.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 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, days=-1) # TODO: parameterize this delta? + date_from = date_from.strftime("%Y-%m-%d") + date_to = date_to .strftime("%Y-%m-%d") + 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) ] , 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): + 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) return res def unlink(self, cr, uid, ids, context=None): @@ -757,9 +778,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) @@ -773,11 +792,9 @@ class pos_order_line(osv.osv): 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_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, @@ -792,8 +809,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, @@ -808,13 +823,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()