X-Git-Url: http://git.cyclocoop.org/?a=blobdiff_plain;f=remembership.py;h=1c394ad50d1edc930881e4e267c68443e6b547fc;hb=6c7ada6035639f9c23e04906308b03081557a015;hp=b88034f48cea079796643cea69620b6823a72a86;hpb=7c2f716cce71fba66bc0136ef804fa22eca29a8e;p=burette%2Fremembership.git diff --git a/remembership.py b/remembership.py index b88034f..1c394ad 100644 --- a/remembership.py +++ b/remembership.py @@ -144,9 +144,67 @@ 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 - ctx = context and context.copy() or {} - ctx['date_from'] = datas.get('date_from', None) - return super(Partner, self).create_membership_invoice(cr, uid, ids, product_id=product_id, datas=datas, context=ctx) + context = context and context.copy() or {} + context['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') + invoice_line_obj = self.pool.get('account.invoice.line') + invoice_tax_obj = self.pool.get('account.invoice.tax') + product_id = product_id or datas.get('membership_product_id', False) + amount = datas.get('amount', 0.0) + invoice_list = [] + if type(ids) in (int, long,): + ids = [ids] + for partner in self.browse(cr, uid, ids, context=context): + print ("DEV: [remembership] [partner] [create_membership_invoice] ids=%s partner=%s" % (str(ids),str(partner.id))) + account_id = partner.property_account_receivable and partner.property_account_receivable.id or False + fpos_id = partner.property_account_position and partner.property_account_position.id or False + addr = self.address_get(cr, uid, [partner.id], ['invoice']) + if partner.free_member: + raise osv.except_osv(_('Error!'), + _("Partner is a free Member.")) + if not addr.get('invoice', False): + raise osv.except_osv(_('Error!'), + _("Partner doesn't have an address to make the invoice.")) + quantity = 1 + line_value = { + 'product_id': product_id, + } + + print ("DEV: [remembership] [partner] [create_membership_invoice] ids=%s partner=%s [invoice_line_obj] [product_id_change]" % (str(ids),str(partner.id))) + line_dict = invoice_line_obj.product_id_change(cr, uid, {}, + product_id, False, quantity, '', 'out_invoice', partner.id, fpos_id, price_unit=amount, context=context) + line_value.update(line_dict['value']) + line_value['price_unit'] = amount + if line_value.get('invoice_line_tax_id', False): + tax_tab = [(6, 0, line_value['invoice_line_tax_id'])] + line_value['invoice_line_tax_id'] = tax_tab + + print ("DEV: [remembership] [partner] [create_membership_invoice] ids=%s partner=%s [invoice_obj] [create] account=%s" % (str(ids),str(partner.id),str(account_id))) + # NOTE: let account_invoice_obj.create() call account_invoice_line.create() + # to have a correct membership_state: becauce now fields.function 'store' watchdogs + # are triggered after account_invoice_line.create(). + invoice_id = invoice_obj.create(cr, uid, { + 'partner_id': partner.id, + 'account_id': account_id, + 'fiscal_position': fpos_id or False, + 'invoice_line':[(0, 0, line_value)] + }, context=context) + #line_value['invoice_id'] = invoice_id + #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) + invoice_list.append(invoice_id) + if line_value['invoice_line_tax_id']: + tax_value = invoice_tax_obj.compute(cr, uid, invoice_id).values() + for tax in tax_value: + invoice_tax_obj.create(cr, uid, tax, context=context) + # NOTE: this wasn't working, and is not needed now. + #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) + return invoice_list Partner() @@ -257,7 +315,7 @@ class account_invoice_line(osv.osv): 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_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)) @@ -293,22 +351,4 @@ class account_invoice_line(osv.osv): 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: