[ADD]GOLEM Activity Registration State : add generated invoice and payments

Add generated invoice and payments on wizard.
Allow to see them with navigation buttons.
This commit is contained in:
Fabien BOURGEOIS 2018-07-17 11:32:00 +02:00
parent 3fd0b457c3
commit 06618da5f1
5 changed files with 186 additions and 16 deletions

View File

@ -19,7 +19,7 @@
'name': 'GOLEM Activity Session Member Registrations States', 'name': 'GOLEM Activity Session Member Registrations States',
'summary': 'GOLEM Activities Session Member Registration states', 'summary': 'GOLEM Activities Session Member Registration states',
'description': 'GOLEM Activities Session Member Registration states', 'description': 'GOLEM Activities Session Member Registration states',
'version': '10.0.1.1.0', 'version': '10.0.1.2.0',
'category': 'GOLEM', 'category': 'GOLEM',
'author': 'Fabien Bourgeois', 'author': 'Fabien Bourgeois',
'license': 'AGPL-3', 'license': 'AGPL-3',

View File

@ -6,15 +6,14 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: Odoo Server 10.0\n" "Project-Id-Version: Odoo Server 10.0\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2017-06-14 23:16+0000\n" "POT-Creation-Date: 2018-07-17 09:11+0000\n"
"PO-Revision-Date: 2017-06-14 23:16+0000\n" "PO-Revision-Date: 2018-07-17 11:31+0200\n"
"Last-Translator: <>\n" "Last-Translator: <>\n"
"Language-Team: \n" "Language-Team: \n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: \n" "Content-Transfer-Encoding: \n"
"Language: fr\n" "Plural-Forms: \n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
#. module: golem_activity_registration_state #. module: golem_activity_registration_state
#: model:ir.model.fields,field_description:golem_activity_registration_state.field_golem_activity_registration_invoicing_line_ids #: model:ir.model.fields,field_description:golem_activity_registration_state.field_golem_activity_registration_invoicing_line_ids
@ -46,6 +45,11 @@ msgstr "Annulé"
msgid "Confirmed" msgid "Confirmed"
msgstr "Confirmé" msgstr "Confirmé"
#. module: golem_activity_registration_state
#: model:ir.ui.view,arch_db:golem_activity_registration_state.invoicing_form
msgid "Congratulations, activities had been confirmed and invoiced."
msgstr "Félicitations, les activités ont été confirmées et facturées."
#. module: golem_activity_registration_state #. module: golem_activity_registration_state
#: model:ir.model.fields,field_description:golem_activity_registration_state.field_golem_activity_registration_invoicing_create_uid #: model:ir.model.fields,field_description:golem_activity_registration_state.field_golem_activity_registration_invoicing_create_uid
#: model:ir.model.fields,field_description:golem_activity_registration_state.field_golem_activity_registration_invoicing_line_create_uid #: model:ir.model.fields,field_description:golem_activity_registration_state.field_golem_activity_registration_invoicing_line_create_uid
@ -64,6 +68,16 @@ msgstr "Créé le"
msgid "Display Name" msgid "Display Name"
msgstr "Nom affiché" msgstr "Nom affiché"
#. module: golem_activity_registration_state
#: model:ir.ui.view,arch_db:golem_activity_registration_state.invoicing_form
msgid "Display invoice"
msgstr "Afficher la facture"
#. module: golem_activity_registration_state
#: model:ir.ui.view,arch_db:golem_activity_registration_state.invoicing_form
msgid "Display payments"
msgstr "Afficher les paiements"
#. module: golem_activity_registration_state #. module: golem_activity_registration_state
#: selection:golem.activity.registration,state:0 #: selection:golem.activity.registration,state:0
msgid "Draft" msgid "Draft"
@ -89,6 +103,20 @@ msgstr "GOLEM Activity Registration Invoicing Wizard"
msgid "GOLEM Member" msgid "GOLEM Member"
msgstr "Adhérent" msgstr "Adhérent"
#. module: golem_activity_registration_state
#: code:addons/golem_activity_registration_state/wizard/golem_activity_registration_invoicing.py:147
#: model:ir.model.fields,field_description:golem_activity_registration_state.field_golem_activity_registration_invoicing_invoice_id
#, python-format
msgid "Generated invoice"
msgstr "Facture générée"
#. module: golem_activity_registration_state
#: code:addons/golem_activity_registration_state/wizard/golem_activity_registration_invoicing.py:162
#: model:ir.model.fields,field_description:golem_activity_registration_state.field_golem_activity_registration_invoicing_payment_ids
#, python-format
msgid "Generated payments"
msgstr "Paiements générés"
#. module: golem_activity_registration_state #. module: golem_activity_registration_state
#: model:ir.model.fields,field_description:golem_activity_registration_state.field_golem_member_has_draft_registrations #: model:ir.model.fields,field_description:golem_activity_registration_state.field_golem_member_has_draft_registrations
msgid "Has draft registrations ?" msgid "Has draft registrations ?"
@ -191,10 +219,23 @@ msgid "Season"
msgstr "Saison" msgstr "Saison"
#. module: golem_activity_registration_state #. module: golem_activity_registration_state
#: model:ir.model.fields,field_description:golem_activity_registration_state.field_golem_activity_registration_invoicing_state
#: model:ir.model.fields,field_description:golem_activity_registration_state.field_golem_activity_registration_state #: model:ir.model.fields,field_description:golem_activity_registration_state.field_golem_activity_registration_state
msgid "State" msgid "State"
msgstr "État" msgstr "État"
#. module: golem_activity_registration_state
#: code:addons/golem_activity_registration_state/wizard/golem_activity_registration_invoicing.py:143
#, python-format
msgid "There is no generated invoice."
msgstr "Il n'y a pas de facture générée."
#. module: golem_activity_registration_state
#: code:addons/golem_activity_registration_state/wizard/golem_activity_registration_invoicing.py:158
#, python-format
msgid "There is no generated payments."
msgstr "Il n'y a pas de paiement généré."
#. module: golem_activity_registration_state #. module: golem_activity_registration_state
#: model:ir.ui.view,arch_db:golem_activity_registration_state.invoicing_form #: model:ir.ui.view,arch_db:golem_activity_registration_state.invoicing_form
msgid "Total" msgid "Total"
@ -210,8 +251,18 @@ msgstr "Valider"
msgid "Validate all draft registrations" msgid "Validate all draft registrations"
msgstr "Valider toutes les inscriptions" msgstr "Valider toutes les inscriptions"
#. module: golem_activity_registration_state
#: selection:golem.activity.registration.invoicing,state:0
msgid "final"
msgstr "final"
#. module: golem_activity_registration_state #. module: golem_activity_registration_state
#: model:ir.model,name:golem_activity_registration_state.model_golem_activity_registration_invoicing_line #: model:ir.model,name:golem_activity_registration_state.model_golem_activity_registration_invoicing_line
msgid "golem.activity.registration.invoicing.line" msgid "golem.activity.registration.invoicing.line"
msgstr "golem.activity.registration.invoicing.line" msgstr "golem.activity.registration.invoicing.line"
#. module: golem_activity_registration_state
#: selection:golem.activity.registration.invoicing,state:0
msgid "init"
msgstr "init"

View File

@ -6,8 +6,8 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: Odoo Server 10.0\n" "Project-Id-Version: Odoo Server 10.0\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2017-06-14 23:16+0000\n" "POT-Creation-Date: 2018-07-17 09:11+0000\n"
"PO-Revision-Date: 2017-06-14 23:16+0000\n" "PO-Revision-Date: 2018-07-17 09:11+0000\n"
"Last-Translator: <>\n" "Last-Translator: <>\n"
"Language-Team: \n" "Language-Team: \n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
@ -45,6 +45,11 @@ msgstr ""
msgid "Confirmed" msgid "Confirmed"
msgstr "" msgstr ""
#. module: golem_activity_registration_state
#: model:ir.ui.view,arch_db:golem_activity_registration_state.invoicing_form
msgid "Congratulations, activities had been confirmed and invoiced."
msgstr ""
#. module: golem_activity_registration_state #. module: golem_activity_registration_state
#: model:ir.model.fields,field_description:golem_activity_registration_state.field_golem_activity_registration_invoicing_create_uid #: model:ir.model.fields,field_description:golem_activity_registration_state.field_golem_activity_registration_invoicing_create_uid
#: model:ir.model.fields,field_description:golem_activity_registration_state.field_golem_activity_registration_invoicing_line_create_uid #: model:ir.model.fields,field_description:golem_activity_registration_state.field_golem_activity_registration_invoicing_line_create_uid
@ -63,6 +68,16 @@ msgstr ""
msgid "Display Name" msgid "Display Name"
msgstr "" msgstr ""
#. module: golem_activity_registration_state
#: model:ir.ui.view,arch_db:golem_activity_registration_state.invoicing_form
msgid "Display invoice"
msgstr ""
#. module: golem_activity_registration_state
#: model:ir.ui.view,arch_db:golem_activity_registration_state.invoicing_form
msgid "Display payments"
msgstr ""
#. module: golem_activity_registration_state #. module: golem_activity_registration_state
#: selection:golem.activity.registration,state:0 #: selection:golem.activity.registration,state:0
msgid "Draft" msgid "Draft"
@ -88,6 +103,20 @@ msgstr ""
msgid "GOLEM Member" msgid "GOLEM Member"
msgstr "" msgstr ""
#. module: golem_activity_registration_state
#: code:addons/golem_activity_registration_state/wizard/golem_activity_registration_invoicing.py:147
#: model:ir.model.fields,field_description:golem_activity_registration_state.field_golem_activity_registration_invoicing_invoice_id
#, python-format
msgid "Generated invoice"
msgstr ""
#. module: golem_activity_registration_state
#: code:addons/golem_activity_registration_state/wizard/golem_activity_registration_invoicing.py:162
#: model:ir.model.fields,field_description:golem_activity_registration_state.field_golem_activity_registration_invoicing_payment_ids
#, python-format
msgid "Generated payments"
msgstr ""
#. module: golem_activity_registration_state #. module: golem_activity_registration_state
#: model:ir.model.fields,field_description:golem_activity_registration_state.field_golem_member_has_draft_registrations #: model:ir.model.fields,field_description:golem_activity_registration_state.field_golem_member_has_draft_registrations
msgid "Has draft registrations ?" msgid "Has draft registrations ?"
@ -190,10 +219,23 @@ msgid "Season"
msgstr "" msgstr ""
#. module: golem_activity_registration_state #. module: golem_activity_registration_state
#: model:ir.model.fields,field_description:golem_activity_registration_state.field_golem_activity_registration_invoicing_state
#: model:ir.model.fields,field_description:golem_activity_registration_state.field_golem_activity_registration_state #: model:ir.model.fields,field_description:golem_activity_registration_state.field_golem_activity_registration_state
msgid "State" msgid "State"
msgstr "" msgstr ""
#. module: golem_activity_registration_state
#: code:addons/golem_activity_registration_state/wizard/golem_activity_registration_invoicing.py:143
#, python-format
msgid "There is no generated invoice."
msgstr ""
#. module: golem_activity_registration_state
#: code:addons/golem_activity_registration_state/wizard/golem_activity_registration_invoicing.py:158
#, python-format
msgid "There is no generated payments."
msgstr ""
#. module: golem_activity_registration_state #. module: golem_activity_registration_state
#: model:ir.ui.view,arch_db:golem_activity_registration_state.invoicing_form #: model:ir.ui.view,arch_db:golem_activity_registration_state.invoicing_form
msgid "Total" msgid "Total"
@ -209,8 +251,18 @@ msgstr ""
msgid "Validate all draft registrations" msgid "Validate all draft registrations"
msgstr "" msgstr ""
#. module: golem_activity_registration_state
#: selection:golem.activity.registration.invoicing,state:0
msgid "final"
msgstr ""
#. module: golem_activity_registration_state #. module: golem_activity_registration_state
#: model:ir.model,name:golem_activity_registration_state.model_golem_activity_registration_invoicing_line #: model:ir.model,name:golem_activity_registration_state.model_golem_activity_registration_invoicing_line
msgid "golem.activity.registration.invoicing.line" msgid "golem.activity.registration.invoicing.line"
msgstr "" msgstr ""
#. module: golem_activity_registration_state
#: selection:golem.activity.registration.invoicing,state:0
msgid "init"
msgstr ""

View File

@ -19,7 +19,8 @@
import logging import logging
from math import ceil from math import ceil
from odoo import models, fields, api from odoo import models, fields, api, _
from odoo.exceptions import UserError
_LOGGER = logging.getLogger(__name__) _LOGGER = logging.getLogger(__name__)
class GolemActivityRegistrationInvoicingLine(models.TransientModel): class GolemActivityRegistrationInvoicingLine(models.TransientModel):
@ -39,17 +40,26 @@ class GolemActivityRegistrationInvoicing(models.TransientModel):
_name = 'golem.activity.registration.invoicing' _name = 'golem.activity.registration.invoicing'
_description = 'GOLEM Activity Registration Invoicing Wizard' _description = 'GOLEM Activity Registration Invoicing Wizard'
season_id = fields.Many2one('golem.season', 'Season', required=True) state = fields.Selection([('init', 'init'), ('final', 'final')],
member_id = fields.Many2one('golem.member', 'Member', required=True) default='init', required=True)
season_id = fields.Many2one('golem.season', 'Season', required=True,
ondelete='cascade')
member_id = fields.Many2one('golem.member', 'Member', required=True,
ondelete='cascade')
line_ids = fields.One2many('golem.activity.registration.invoicing.line', line_ids = fields.One2many('golem.activity.registration.invoicing.line',
'invoicing_id', string='Activities') 'invoicing_id', string='Activities')
schedule_id = fields.Many2one('golem.payment.schedule', 'Payment schedule', schedule_id = fields.Many2one('golem.payment.schedule', 'Payment schedule',
domain='[("season_id", "=", season_id)]', domain='[("season_id", "=", season_id)]',
ondelete='cascade',
help='If no schedule is selected, only the ' help='If no schedule is selected, only the '
'invoice will be create. Otherwise, draft ' 'invoice will be create. Otherwise, draft '
'payments will be generated.') 'payments will be generated.')
journal_id = fields.Many2one('account.journal', 'Journal', journal_id = fields.Many2one('account.journal', 'Journal',
domain=[('type', 'in', ('bank', 'cash'))]) domain=[('type', 'in', ('bank', 'cash'))],
ondelete='cascade')
invoice_id = fields.Many2one('account.invoice', string='Generated invoice',
ondelete='cascade')
payment_ids = fields.Many2many('account.payment', string='Generated payments')
@api.multi @api.multi
def _create_invoice(self): def _create_invoice(self):
@ -81,6 +91,7 @@ class GolemActivityRegistrationInvoicing(models.TransientModel):
def _create_payments(self, invoice): def _create_payments(self, invoice):
""" Create payment if schedule has been chosen """ """ Create payment if schedule has been chosen """
self.ensure_one() self.ensure_one()
payments = self.env['account.payment']
if self.schedule_id and self.schedule_id.occurences > 0: if self.schedule_id and self.schedule_id.occurences > 0:
amount = invoice.amount_total amount = invoice.amount_total
amount_per_occurence = ceil(amount / self.schedule_id.occurences) amount_per_occurence = ceil(amount / self.schedule_id.occurences)
@ -101,6 +112,8 @@ class GolemActivityRegistrationInvoicing(models.TransientModel):
payment_values = dict(payment._cache) payment_values = dict(payment._cache)
payment = self.env['account.payment'].create(payment_values) payment = self.env['account.payment'].create(payment_values)
payment.invoice_ids = [(4, invoice.id, False)] payment.invoice_ids = [(4, invoice.id, False)]
payments |= payment
return payments
@api.multi @api.multi
def validate(self): def validate(self):
@ -110,4 +123,44 @@ class GolemActivityRegistrationInvoicing(models.TransientModel):
lambda r: r.state == 'draft') lambda r: r.state == 'draft')
draft_registrations.write({'state': 'confirmed'}) draft_registrations.write({'state': 'confirmed'})
invoice = self._create_invoice() invoice = self._create_invoice()
self._create_payments(invoice) self.invoice_id = invoice
payments = self._create_payments(invoice)
self.payment_ids |= payments
self.write({'state': 'final'})
return {
'type': 'ir.actions.act_window',
'view_mode': 'form',
'res_model': self._name,
'res_id': self[0].id,
'target': 'new'
}
@api.multi
def go_invoice(self):
""" Navigate to generated invoice """
self.ensure_one()
if not self.invoice_id:
uerr = _('There is no generated invoice.')
raise UserError(uerr)
return {
'type': 'ir.actions.act_window',
'name': _('Generated invoice'),
'view_mode': 'form,tree',
'res_model': 'account.invoice',
'res_id': self[0].invoice_id.id
}
@api.multi
def go_payments(self):
""" Navigate to generated payments """
self.ensure_one()
if not self.payment_ids:
uerr = _('There is no generated payments.')
raise UserError(uerr)
return {
'type': 'ir.actions.act_window',
'name': _('Generated payments'),
'view_mode': 'tree,form',
'res_model': 'account.payment',
'domain': [('id', 'in', self.payment_ids.ids)]
}

View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<!-- <!--
Copyright 2017 Fabien Bourgeois <fabien@yaltik.com> Copyright 2017-2018 Fabien Bourgeois <fabien@yaltik.com>
This program is free software: you can redistribute it and/or modify This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Affero General Public License as published by it under the terms of the GNU Affero General Public License as published by
@ -26,8 +26,11 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
<field name="model">golem.activity.registration.invoicing</field> <field name="model">golem.activity.registration.invoicing</field>
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Registration invoicing"> <form string="Registration invoicing">
<p class="oe_grey">Please confirm activity prices and choose a payment schedule if needed.</p> <field name="state" invisible="1" />
<group> <p states="init" class="oe_grey">
Please confirm activity prices and choose a payment schedule if needed.
</p>
<group states="init">
<field name="season_id" readonly="1" /> <field name="season_id" readonly="1" />
<field name="member_id" readonly="1" /> <field name="member_id" readonly="1" />
<field name="line_ids" string="Activities and Prices"> <field name="line_ids" string="Activities and Prices">
@ -41,9 +44,20 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
attrs="{'invisible': [('schedule_id', '=', False)], attrs="{'invisible': [('schedule_id', '=', False)],
'required': [('schedule_id', '!=', False)]}" /> 'required': [('schedule_id', '!=', False)]}" />
</group> </group>
<p states="final">
Congratulations, activities had been confirmed and invoiced.
</p>
<group states="final">
<field name="invoice_id" readonly="1" />
<field name="payment_ids" readonly="1" />
</group>
<footer> <footer>
<button name="validate" string="Validate" type="object" <button name="validate" string="Validate" type="object"
class="oe_highlight" /> states="init" class="oe_highlight" />
<button name="go_invoice" string="Display invoice" type="object"
states="final" class="oe_highlight" />
<button name="go_payments" string="Display payments" type="object"
states="final" />
<button string="Cancel" class="oe_link" special="cancel" /> <button string="Cancel" class="oe_link" special="cancel" />
</footer> </footer>
</form> </form>