# -*- coding: utf-8 -*-
##############################################################################
#
-# Remembership module for OpenERP, Overload membership module
-# Copyright (C) 2012 L'Heureux Cyclage (<http://www.heureux-cyclage.org>) Ludovic CHEVALIER
+# Remembership module for OpenERP, Membership module enhancement and bug fixes
+# Copyright (C) 2012-2013 L'Heureux Cyclage (<http://www.heureux-cyclage.org>)
#
# This file is a part of Remembership
#
#
##############################################################################
-from osv import osv
-from osv import fields
+from openerp.osv import osv
+from openerp.osv import fields
import time
from datetime import datetime, date
from dateutil.relativedelta import relativedelta
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')
#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:
#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
Partner()
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_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
]
, 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
]
, 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:
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:
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?
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
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,
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()
-
-
-class pos_make_payment(osv.osv_memory):
- _inherit = 'pos.make.payment'
-
- def check(self, cr, uid, ids, context=None):
- """
- Auto invoice orders. Temporarly solution before make partner members just with orders, without invoice.
- """
- res = super(pos_make_payment, self).check(cr, uid, ids, context=context)
-
- order_obj = self.pool.get('pos.order')
- order_obj.action_invoice(cr, uid, ids, context=context)
-
- return res
-
-pos_make_payment()
-
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
dépôts / burette / remembership.git / blobdiff