From d740f6f9a63797edf9694c751543c5277550e454 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADctor=20Mart=C3=ADnez?= Date: Wed, 18 Aug 2021 08:15:22 +0200 Subject: [PATCH] [IMP] account_payment_partner: Add Payment mode to Invoices Analysis --- account_payment_partner/README.rst | 4 +++- account_payment_partner/__init__.py | 1 + account_payment_partner/__manifest__.py | 1 + .../readme/DESCRIPTION.rst | 4 +++- account_payment_partner/reports/__init__.py | 1 + .../reports/account_invoice_report.py | 18 ++++++++++++++ .../reports/account_invoice_report_view.xml | 24 +++++++++++++++++++ .../static/description/index.html | 5 ++-- 8 files changed, 54 insertions(+), 4 deletions(-) create mode 100644 account_payment_partner/reports/__init__.py create mode 100644 account_payment_partner/reports/account_invoice_report.py create mode 100644 account_payment_partner/reports/account_invoice_report_view.xml diff --git a/account_payment_partner/README.rst b/account_payment_partner/README.rst index 84c4c5f09..f5fdb84ec 100644 --- a/account_payment_partner/README.rst +++ b/account_payment_partner/README.rst @@ -25,7 +25,7 @@ Account Payment Partner |badge1| |badge2| |badge3| |badge4| |badge5| -This module adds severals fields: +This module adds several fields: * the *Supplier Payment Mode* and *Customer Payment Mode* on Partners, @@ -37,6 +37,8 @@ This module adds severals fields: * the *Bank account from journals* on Payment Mode. +* the *Payment mode* on Invoices Analysis. + On a Payment Order, in the wizard *Select Invoices to Pay*, the invoices will be filtered per Payment Mode. diff --git a/account_payment_partner/__init__.py b/account_payment_partner/__init__.py index 83e553ac4..58da23772 100644 --- a/account_payment_partner/__init__.py +++ b/account_payment_partner/__init__.py @@ -1,3 +1,4 @@ # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). from . import models +from . import reports diff --git a/account_payment_partner/__manifest__.py b/account_payment_partner/__manifest__.py index b86763f46..79a2c0d68 100644 --- a/account_payment_partner/__manifest__.py +++ b/account_payment_partner/__manifest__.py @@ -19,6 +19,7 @@ "views/account_move_line.xml", "views/account_payment_mode.xml", "views/report_invoice.xml", + "reports/account_invoice_report_view.xml", ], "demo": ["demo/partner_demo.xml"], "installable": True, diff --git a/account_payment_partner/readme/DESCRIPTION.rst b/account_payment_partner/readme/DESCRIPTION.rst index 8ad4f4f64..fccb47082 100644 --- a/account_payment_partner/readme/DESCRIPTION.rst +++ b/account_payment_partner/readme/DESCRIPTION.rst @@ -1,4 +1,4 @@ -This module adds severals fields: +This module adds several fields: * the *Supplier Payment Mode* and *Customer Payment Mode* on Partners, @@ -10,6 +10,8 @@ This module adds severals fields: * the *Bank account from journals* on Payment Mode. +* the *Payment mode* on Invoices Analysis. + On a Payment Order, in the wizard *Select Invoices to Pay*, the invoices will be filtered per Payment Mode. diff --git a/account_payment_partner/reports/__init__.py b/account_payment_partner/reports/__init__.py new file mode 100644 index 000000000..52e62702b --- /dev/null +++ b/account_payment_partner/reports/__init__.py @@ -0,0 +1 @@ +from . import account_invoice_report diff --git a/account_payment_partner/reports/account_invoice_report.py b/account_payment_partner/reports/account_invoice_report.py new file mode 100644 index 000000000..134f38671 --- /dev/null +++ b/account_payment_partner/reports/account_invoice_report.py @@ -0,0 +1,18 @@ +# Copyright 2021 Tecnativa - Víctor Martínez +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +from odoo import fields, models + + +class AccountInvoiceReport(models.Model): + _inherit = "account.invoice.report" + + payment_mode_id = fields.Many2one( + comodel_name="account.payment.mode", + string="Payment mode", + readonly=True, + ) + + def _select(self): + select_str = super()._select() + return "%s, move.payment_mode_id AS payment_mode_id" % select_str diff --git a/account_payment_partner/reports/account_invoice_report_view.xml b/account_payment_partner/reports/account_invoice_report_view.xml new file mode 100644 index 000000000..fd9aa6182 --- /dev/null +++ b/account_payment_partner/reports/account_invoice_report_view.xml @@ -0,0 +1,24 @@ + + + + + account.invoice.report.search + account.invoice.report + + + + + + + + + + + diff --git a/account_payment_partner/static/description/index.html b/account_payment_partner/static/description/index.html index cb35ea823..6e91e668a 100644 --- a/account_payment_partner/static/description/index.html +++ b/account_payment_partner/static/description/index.html @@ -3,7 +3,7 @@ - + Account Payment Partner