Yaltik/golem
1
0
Fork 2
Code Issues Pull Requests 4 Releases Activity

[FIX]GOLEM Activity Registration Payment : fix auto confirmation of all draft activities

Browse Source
This commit is contained in:
Fabien BOURGEOIS 2018-08-05 05:51:38 +02:00
parent 56f6bd9615
commit 46605a8227
2 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
golem_activity_registration_payment/__manifest__.py
View File

@ -19,7 +19,7 @@
'name': 'GOLEM Activity Member Registration Payments', 'name': 'GOLEM Activity Member Registration Payments',
'summary': 'GOLEM Activities Member Registration Payments', 'summary': 'GOLEM Activities Member Registration Payments',
'description': 'GOLEM Activities Member Registration Payments', 'description': 'GOLEM Activities Member Registration Payments',
'version': '10.0.0.3.4', 'version': '10.0.0.3.5',
'category': 'GOLEM', 'category': 'GOLEM',
'author': 'Fabien Bourgeois', 'author': 'Fabien Bourgeois',
'license': 'AGPL-3', 'license': 'AGPL-3',

31
golem_activity_registration_payment/wizard/golem_activity_registration_invoicing.py
View File

@ -62,6 +62,21 @@ class GolemActivityRegistrationInvoicing(models.TransientModel):
ondelete='cascade') ondelete='cascade')
payment_ids = fields.Many2many('account.payment', string='Generated payments') payment_ids = fields.Many2many('account.payment', string='Generated payments')
def _create_invoice_line(self, product, price, invoice):
""" Create invoice line : needs cache record for onchange, then real
writing... """
invoice_line = self.env['account.invoice.line'].new({
'product_id': product.id,
'invoice_id': invoice.id
})
invoice_line._onchange_product_id()
line_values = dict(invoice_line._cache)
line_values['price_unit'] = price
invoice_line = self.env['account.invoice.line'].create(line_values)
invoice.compute_taxes()
return invoice_line
@api.multi @api.multi
def _create_invoice(self): def _create_invoice(self):
""" Create invoice and lines """ """ Create invoice and lines """
@ -74,17 +89,7 @@ class GolemActivityRegistrationInvoicing(models.TransientModel):
}) })
for line in self.line_ids: for line in self.line_ids:
product = line.activity_id.product_id product = line.activity_id.product_id
# Handling of invoice lines : needs cache record for onchange, then invoice_line = self._create_invoice_line(product, line.price, invoice)
# real writing...
invoice_line = self.env['account.invoice.line'].new({
'product_id': product.id,
'invoice_id': invoice.id
})
invoice_line._onchange_product_id()
line_values = dict(invoice_line._cache)
line_values['price_unit'] = line.price
invoice_line = self.env['account.invoice.line'].create(line_values)
invoice.compute_taxes()
line.registration_id.invoice_line_id = invoice_line.id line.registration_id.invoice_line_id = invoice_line.id
return invoice return invoice
@ -120,9 +125,7 @@ class GolemActivityRegistrationInvoicing(models.TransientModel):
def validate(self): def validate(self):
""" Validate and create invoice and payments """ """ Validate and create invoice and payments """
self.ensure_one() self.ensure_one()
draft_registrations = self.member_id.activity_registration_ids.filtered( self[0].line_ids.mapped('registration_id').write({'state': 'confirmed'})
lambda r: r.state == 'draft')
draft_registrations.write({'state': 'confirmed'})
invoice = self._create_invoice() invoice = self._create_invoice()
self.invoice_id = invoice self.invoice_id = invoice
payments = self._create_payments(invoice) payments = self._create_payments(invoice)