*bugfixed the invoicing on event registrations
bzr revid: qdp-launchpad@tinyerp.com-20081029111109-bgey5x9wgbu38kl4
This commit is contained in:
parent
f1943667f3
commit
1b5ffb2e92
|
@ -63,7 +63,6 @@ def _makeInvoices(self, cr, uid, data, context):
|
|||
obj_event_reg=pool_obj.get('event.registration')
|
||||
data_event_reg=obj_event_reg.browse(cr,uid,data['ids'])
|
||||
obj_lines=pool_obj.get('account.invoice.line')
|
||||
partner_address_id = reg.partner_invoice_id and reg.partner_invoice_id.
|
||||
|
||||
for reg in data_event_reg:
|
||||
if reg.state=='draft':
|
||||
|
@ -86,6 +85,8 @@ def _makeInvoices(self, cr, uid, data, context):
|
|||
inv_reject = inv_reject + 1
|
||||
inv_rej_reason += "ID "+str(reg.id)+": Registration doesn't have any partner to invoice. \n"
|
||||
continue
|
||||
partner_address_list = reg.partner_invoice_id and pool_obj.get('res.partner').address_get(cr, uid, [reg.partner_invoice_id.id], adr_pref=['invoice'])
|
||||
partner_address_id = partner_address_list['invoice']
|
||||
if not partner_address_id:
|
||||
inv_reject = inv_reject + 1
|
||||
inv_rej_reason += "ID "+str(reg.id)+": Registered partner doesn't have an address to make the invoice. \n"
|
||||
|
@ -118,8 +119,8 @@ def _makeInvoices(self, cr, uid, data, context):
|
|||
'reference': False,
|
||||
'account_id': reg.partner_invoice_id.property_account_receivable.id,
|
||||
'partner_id': reg.partner_invoice_id.id,
|
||||
'address_invoice_id':reg.partner_address_id.id,
|
||||
'address_contact_id':reg.partner_address_id.id,
|
||||
'address_invoice_id':partner_address_id,
|
||||
'address_contact_id':partner_address_id,
|
||||
'invoice_line': [(6,0,[inv_id])],
|
||||
'currency_id' :reg.partner_invoice_id.property_product_pricelist.currency_id.id,
|
||||
'comment': "",
|
||||
|
@ -130,7 +131,7 @@ def _makeInvoices(self, cr, uid, data, context):
|
|||
inv_id = inv_obj.create(cr, uid, inv)
|
||||
list_inv.append(inv_id)
|
||||
obj_event_reg.write(cr, uid,reg.id, {'invoice_id' : inv_id,'state':'done'})
|
||||
obj_event_reg._history(cr, uid,[reg], 'Invoiced', history=True)
|
||||
obj_event_reg._history(cr, uid,[reg.id], 'Invoiced', history=True)
|
||||
|
||||
return {'inv_created' : str(inv_create) , 'inv_rejected' : str(inv_reject) , 'invoice_ids': list_inv, 'inv_rej_reason': inv_rej_reason}
|
||||
|
||||
|
|
Loading…
Reference in New Issue