X-Git-Url: http://git.heureux-cyclage.org/?p=burette%2Fremembership.git;a=blobdiff_plain;f=remembership.py;h=7a03490f5a75e9171fdfbf2e3b6900b44a9709f6;hp=aee965a4795ef05c2e56e56ed8d565e055a638df;hb=04cf272110199b30b2e83fbe07ee814025ad826b;hpb=06296bf7ad9ed35f1fa54732a21f6b4b31f65061 diff --git a/remembership.py b/remembership.py index aee965a..7a03490 100644 --- a/remembership.py +++ b/remembership.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- ############################################################################## # -# Remembership module for OpenERP, Overload membership module +# Remembership module for OpenERP, Membership module enhancement and bug fixes # Copyright (C) 2012-2013 L'Heureux Cyclage () # # This file is a part of Remembership @@ -21,14 +21,12 @@ # ############################################################################## -from osv import osv -from osv import fields +from openerp.osv import fields, osv import time from datetime import datetime, date from dateutil.relativedelta import relativedelta from openerp.tools.translate import _ - class Partner(osv.osv): _inherit = 'res.partner' @@ -52,7 +50,7 @@ class Partner(osv.osv): 'membership_cancel': False } if name == 'membership_start': - line_id = member_line_obj.search(cr, uid, [('partner', '=', partner_id),('date_cancel','=',False)], + line_id = member_line_obj.search(cr, uid, [('partner', '=', partner_id),('state','!=','canceled')], limit=1, order='date_from', context=context) if line_id: res[partner.id]['membership_start'] = member_line_obj.read(cr, uid, line_id[0], @@ -63,7 +61,7 @@ class Partner(osv.osv): print ("DEV: [_membership_date] date_from: %s" % str(res[partner.id]['membership_start'])) if name == 'membership_stop': - line_id1 = member_line_obj.search(cr, uid, [('partner', '=', partner_id),('date_cancel','=',False)], + line_id1 = member_line_obj.search(cr, uid, [('partner', '=', partner_id),('state','!=','canceled')], limit=1, order='date_to desc', context=context) if line_id1: res[partner.id]['membership_stop'] = member_line_obj.read(cr, uid, line_id1[0], @@ -145,7 +143,7 @@ class Partner(osv.osv): def create_membership_invoice(self, cr, uid, ids, product_id=None, datas=None, context=None): # NOTE: use context to supply date_from to account_invoice_line.create context = context and context.copy() or {} - context['date_from'] = datas.get('date_from', None) + context.update({'date_from': datas.get('date_from', None)}); # XXX: copied from openerp/addons/membership/membership.py to fix account_invoice_line creation print ("DEV: [remembership] [partner] [create_membership_invoice] ids=%s" % str(ids)) invoice_obj = self.pool.get('account.invoice') @@ -195,7 +193,9 @@ class Partner(osv.osv): #print ("DEV: [remembership] [partner] [create_membership_invoice] ids=%s partner=%s [invoice_line_obj] [create]" % (str(ids),str(partner.id))) #invoice_line_id = invoice_line_obj.create(cr, uid, line_value, context=context) #invoice_obj.write(cr, uid, invoice_id, {'invoice_line': line_value}, context=context) + print ("DEV: [remembership] [partner] [create_membership_invoice] : invoice_list.append(invoice_id) : pre") invoice_list.append(invoice_id) + print ("DEV: [remembership] [partner] [create_membership_invoice] : invoice_list.append(invoice_id) : post") if line_value['invoice_line_tax_id']: tax_value = invoice_tax_obj.compute(cr, uid, invoice_id).values() for tax in tax_value: @@ -204,13 +204,21 @@ class Partner(osv.osv): #recompute the membership_state of those partners #print ("DEV: [remembership] [partner] [create_membership_invoice] ids=%s [recompute states]" % str(ids)) #self.pool.get('res.partner').write(cr, uid, ids, {}, context=context) + print ("DEV: [remembership] [partner] [create_membership_invoice] return=%s" % str(invoice_list)) return invoice_list + def update_membership_status(self, cr, uid): + """Action for updating old members status with scheduled cron job""" + partner_obj = self.pool.get('res.partner') + today = date.today() + ids = partner_obj.search(cr, uid, [('membership_state', '=', 'paid'), ('membership_stop', '<', today)], context=None) + self.write(cr, uid, ids, {'membership_state': 'old'}, context=None) + Partner() class Product(osv.osv): - _inherit = 'product.product' + _inherit = 'product.template' _columns = { 'membership_grouped': fields.boolean('Grouped membership product', help='Check if it\'s a grouped membership product.'), @@ -241,14 +249,14 @@ class account_invoice_line(osv.osv): 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") + 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_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: [write] date_from: %s" % str(date_from)) - print ("DEV: [write] date_to : %s" % str(date_to)) + print ("DEV: [remembership] [account_invoice_line] [write] date_from: %s" % str(date_from)) + print ("DEV: [remembership] [account_invoice_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 @@ -262,8 +270,8 @@ class account_invoice_line(osv.osv): ] , context=context) for associate_member_line in member_line_obj.browse(cr, uid, associate_member_line_ids, context=context): - print ("DEV: [write] [associate] date_from: %s" % str(date_from)) - print ("DEV: [write] [associate] date_to : %s" % str(date_to)) + print ("DEV: [remembership] [account_invoice_line] [write] [associate] date_from: %s" % str(date_from)) + print ("DEV: [remembership] [account_invoice_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 @@ -281,7 +289,6 @@ class account_invoice_line(osv.osv): ] , context=context) member_line_obj.unlink(cr, uid, associate_member_line_ids, context=context) - #Define member ident if it's necessary partners = [line.invoice_id.partner_id] if line.invoice_id.partner_id.associate_members: @@ -293,11 +300,13 @@ class account_invoice_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: [remembership] [account_invoice_line] [write] : return=%s" % str(res)) return res def create(self, cr, uid, vals, context=None): member_line_obj = self.pool.get('membership.membership_line') res = super(account_invoice_line, self).create(cr, uid, vals, context=context) + print ("DEV: [remembership] [account_invoice_line] [create] : begin res=%s" % str(res)) line = self.browse(cr, uid, res, context=context) if line.invoice_id.type == 'out_invoice' and line.product_id and line.product_id.membership: @@ -312,14 +321,15 @@ class account_invoice_line(osv.osv): 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") + 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? + print("#DEBUG: Date de début - %s" % str(date_from)) + 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: [create] date_from: %s" % str(date_from)) - print ("DEV: [create] date_to : %s" % str(date_to)) + print ("DEV: [remembership] [account_invoice_line] [create] date_from: %s" % str(date_from)) + print ("DEV: [remembership] [account_invoice_line] [create] date_to : %s" % str(date_to)) member_line_obj.write(cr, uid, member_line.id , {'date_from': date_from ,'date_to' : date_to @@ -330,8 +340,8 @@ class account_invoice_line(osv.osv): partners.extend(line.invoice_id.partner_id.associate_members) #Adding membership lines just for associate partners for associate_member in line.invoice_id.partner_id.associate_members: - print ("DEV: [create] [associate] date_from: %s" % str(date_from)) - print ("DEV: [create] [associate] date_to : %s" % str(date_to)) + print ("DEV: [remembership] [account_invoice_line] [create] [associate] date_from: %s" % str(date_from)) + print ("DEV: [remembership] [account_invoice_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, @@ -348,6 +358,7 @@ class account_invoice_line(osv.osv): 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}) + print ("DEV: [remembership] [account_invoice_line] [create] : return=%s" % str(res)) return res account_invoice_line()