diff --git a/account_payment_partner/README.rst b/account_payment_partner/README.rst index 4e9e8e684..33edfef25 100644 --- a/account_payment_partner/README.rst +++ b/account_payment_partner/README.rst @@ -1,65 +1,115 @@ -.. image:: https://img.shields.io/badge/licence-AGPL--3-blue.svg - :alt: License: AGPL-3 - ======================= Account Payment Partner ======================= +.. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + !! This file is generated by oca-gen-addon-readme !! + !! changes will be overwritten. !! + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + +.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png + :target: https://odoo-community.org/page/development-status + :alt: Beta +.. |badge2| image:: https://img.shields.io/badge/licence-AGPL--3-blue.png + :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html + :alt: License: AGPL-3 +.. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fbank--payment-lightgray.png?logo=github + :target: https://github.com/OCA/bank-payment/tree/10.0/account_payment_partner + :alt: OCA/bank-payment +.. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png + :target: https://translation.odoo-community.org/projects/bank-payment-10-0/bank-payment-10-0-account_payment_partner + :alt: Translate me on Weblate +.. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png + :target: https://runbot.odoo-community.org/runbot/97/10.0 + :alt: Try me on Runbot + +|badge1| |badge2| |badge3| |badge4| |badge5| + +[ This file must be max 2-3 paragraphs, and is required. ] + This module adds severals fields : * the *Supplier Payment Mode* and *Customer Payment Mode* on Partners, * the *Payment Mode* on Invoices. +* the *Show bank account* on Payment Mode. + +* the *# of digits for customer bank account* on Payment Mode. + +* the *Bank account from journals* on Payment Mode. + On a Payment Order, in the wizard *Select Invoices to Pay*, the invoices will be filtered per Payment Mode. -Installation -============ +Allows to print in the invoice to which account number the payment +(via SEPA direct debit) is going to be charged so the customer knows that +information, but there are some customers that don't want that everyone +looking at the invoice sees the full account number (and even GDPR can say a +word about that), so that's the reason behind the several options. -This module depends on : +**Table of contents** -* account_payment_mode - -This module is part of the OCA/bank-payment suite. - -Configuration -============= - -There is nothing to configure. +.. contents:: + :local: Usage ===== +[ This file must be present and contains the usage instructions + for end-users. As all other rst files included in the README, + it MUST NOT contain reStructuredText sections + only body text (paragraphs, lists, tables, etc). Should you need + a more elaborate structure to explain the addon, please create a + Sphinx documentation (which may include this file as a "quick start" + section). ] + You are able to add a payment mode directly on a partner. This payment mode is automatically associated to the invoice related to the partner. This default value could be change in a draft invoice. When you create an payment order, only invoices related to chosen payment mode are displayed. Invoices without any payment mode are displayed to. -.. image:: https://odoo-community.org/website/image/ir.attachment/5784_f2813bd/datas - :alt: Try me on Runbot - :target: https://runbot.odoo-community.org/runbot/173/10.0 +Changelog +========= -Known issues / Roadmap -====================== +[ The change log. The goal of this file is to help readers + understand changes between version. The primary audience is + end users and integrators. Purely technical changes such as + code refactoring must not be mentioned here. - * No known issues. + This file may contain ONE level of section titles, underlined + with the ~ (tilde) character. Other section markers are + forbidden and will likely break the structure of the README.rst + or other documents where this fragment is included. ] + +10.0.1.2.0 (2018-05-24) +~~~~~~~~~~~~~~~~~~~~~~~ + +* [IMP] Add options to show partner bank account in invoice report + (`#458 `_) Bug Tracker =========== -Bugs are tracked on `GitHub Issues -`_. In case of trouble, please -check there if your issue has already been reported. If you spotted it first, -help us smashing it by providing a detailed and welcomed feedback. +Bugs are tracked on `GitHub Issues `_. +In case of trouble, please check there if your issue has already been reported. +If you spotted it first, help us smashing it by providing a detailed and welcomed +`feedback `_. + +Do not contact contributors directly about support or help with technical issues. Credits ======= -Contributors ------------- +Authors +~~~~~~~ + +* Akretion +* Tecnativa + +Contributors +~~~~~~~~~~~~ -* Pedro M. Baeza * Alexis de Lattre * Raphaël Valyi * Stefan Rijnhart (Therp) @@ -67,16 +117,24 @@ Contributors * Stéphane Bidoul * Danimar Ribeiro * Angel Moya +* `Tecnativa `_: -Maintainer ----------- + * Pedro M. Baeza + * Carlos Dauden -.. image:: http://odoo-community.org/logo.png - :alt: Odoo Community Association - :target: http://odoo-community.org +Maintainers +~~~~~~~~~~~ This module is maintained by the OCA. -OCA, or the Odoo Community Association, is a nonprofit organization whose mission is to support the collaborative development of Odoo features and promote its widespread use. +.. image:: https://odoo-community.org/logo.png + :alt: Odoo Community Association + :target: https://odoo-community.org -To contribute to this module, please visit http://odoo-community.org. +OCA, or the Odoo Community Association, is a nonprofit organization whose +mission is to support the collaborative development of Odoo features and +promote its widespread use. + +This module is part of the `OCA/bank-payment `_ project on GitHub. + +You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute. diff --git a/account_payment_partner/__manifest__.py b/account_payment_partner/__manifest__.py index 3410ff268..884dd08a3 100644 --- a/account_payment_partner/__manifest__.py +++ b/account_payment_partner/__manifest__.py @@ -1,11 +1,12 @@ # -*- coding: utf-8 -*- -# © 2014 Akretion - Alexis de Lattre -# © 2014 Tecnativa - Pedro M. Baeza +# Copyright 2014 Akretion - Alexis de Lattre +# Copyright 2014 Tecnativa - Pedro M. Baeza +# Copyright 2018 Tecnativa - Carlos Dauden # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). { 'name': 'Account Payment Partner', - 'version': '10.0.1.1.2', + 'version': '10.0.1.2.0', 'category': 'Banking addons', 'license': 'AGPL-3', 'summary': 'Adds payment mode on partners and invoices', @@ -18,6 +19,7 @@ 'views/res_partner_view.xml', 'views/account_invoice_view.xml', 'views/account_move_line.xml', + 'views/account_payment_mode.xml', 'views/report_invoice.xml', ], 'demo': ['demo/partner_demo.xml'], diff --git a/account_payment_partner/i18n/es.po b/account_payment_partner/i18n/es.po index e25f104fe..24e3681bc 100644 --- a/account_payment_partner/i18n/es.po +++ b/account_payment_partner/i18n/es.po @@ -19,6 +19,12 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" +"X-Generator: Poedit 1.8.7.1\n" + +#. module: account_payment_partner +#: model:ir.ui.view,arch_db:account_payment_partner.account_payment_mode_form +msgid "# of chars" +msgstr "Nº de caracteres" #. module: account_payment_partner #: model:ir.ui.view,arch_db:account_payment_partner.report_invoice_payment_mode @@ -32,24 +38,35 @@ msgstr "Modo de pago:" #. module: account_payment_partner #: model:ir.model.fields,help:account_payment_partner.field_account_invoice_bank_account_required -msgid "" -"Activate this option if this payment method requires you to know the bank " -"account number of your customer or supplier." -msgstr "" -"Activa esta opción si este método de pago debe requerirte informar el número " -"de cuenta bancaria de tu cliente o proveedor" +msgid "Activate this option if this payment method requires you to know the bank account number of your customer or supplier." +msgstr "Activa esta opción si este método de pago debe requerirte informar el número de cuenta bancaria de tu cliente o proveedor" #. module: account_payment_partner #: model:ir.model.fields,field_description:account_payment_partner.field_account_invoice_bank_account_required msgid "Bank Account Required" msgstr "Cuenta bancaria requerida" +#. module: account_payment_partner +#: model:ir.model.fields,field_description:account_payment_partner.field_account_payment_mode_show_bank_account_from_journal +msgid "Bank account from journals" +msgstr "Cuenta bancaria de los diarios" + #. module: account_payment_partner #: model:ir.model.fields,field_description:account_payment_partner.field_res_partner_customer_payment_mode_id #: model:ir.model.fields,field_description:account_payment_partner.field_res_users_customer_payment_mode_id msgid "Customer Payment Mode" msgstr "Modo de pago de cliente" +#. module: account_payment_partner +#: selection:account.payment.mode,show_bank_account:0 +msgid "First n chars" +msgstr "Primeros n caracteres" + +#. module: account_payment_partner +#: selection:account.payment.mode,show_bank_account:0 +msgid "Full" +msgstr "Completo" + #. module: account_payment_partner #: model:ir.model,name:account_payment_partner.model_account_invoice msgid "Invoice" @@ -60,11 +77,31 @@ msgstr "Factura" msgid "Journal Item" msgstr "Apunte contable" +#. module: account_payment_partner +#: selection:account.payment.mode,show_bank_account:0 +msgid "Last n chars" +msgstr "Últimos n caracteres" + +#. module: account_payment_partner +#: selection:account.payment.mode,show_bank_account:0 +msgid "No" +msgstr "No" + +#. module: account_payment_partner +#: model:ir.model.fields,field_description:account_payment_partner.field_account_payment_mode_show_bank_account_chars +msgid "# of digits for customer bank account" +msgstr "Nº de dígitos de cuenta bancaria del cliente" + #. module: account_payment_partner #: model:ir.model,name:account_payment_partner.model_res_partner msgid "Partner" msgstr "Empresa" +#. module: account_payment_partner +#: model:ir.model,name:account_payment_partner.model_account_payment_method +msgid "Payment Methods" +msgstr "Métodos de pago" + #. module: account_payment_partner #: model:ir.model.fields,field_description:account_payment_partner.field_account_invoice_payment_mode_id #: model:ir.model.fields,field_description:account_payment_partner.field_account_move_line_payment_mode_id @@ -72,6 +109,11 @@ msgstr "Empresa" msgid "Payment Mode" msgstr "Modo de pago" +#. module: account_payment_partner +#: model:ir.model,name:account_payment_partner.model_account_payment_mode +msgid "Payment Modes" +msgstr "Modos de pago" + #. module: account_payment_partner #: model:ir.ui.view,arch_db:account_payment_partner.view_move_line_form msgid "Payments" @@ -79,19 +121,29 @@ msgstr "Pagos" #. module: account_payment_partner #: model:ir.model.fields,help:account_payment_partner.field_res_partner_customer_payment_mode_id -#: model:ir.model.fields,help:account_payment_partner.field_res_users_customer_payment_mode_id msgid "Select the default payment mode for this customer." -msgstr "" -"Seleccione el modo de pago por defecto cuando esta empresa actúa como " -"cliente." +msgstr "Seleccione el modo de pago por defecto cuando esta empresa actúa como cliente." #. module: account_payment_partner #: model:ir.model.fields,help:account_payment_partner.field_res_partner_supplier_payment_mode_id #: model:ir.model.fields,help:account_payment_partner.field_res_users_supplier_payment_mode_id msgid "Select the default payment mode for this supplier." -msgstr "" -"Seleccione el modo de pago por defecto cuando esta empresa actúa como " -"proveedor." +msgstr "Seleccione el modo de pago por defecto cuando esta empresa actúa como proveedor." + +#. module: account_payment_partner +#: model:ir.model.fields,field_description:account_payment_partner.field_account_payment_mode_show_bank_account +msgid "Show bank account" +msgstr "Mostrar cuenta bancaria" + +#. module: account_payment_partner +#: model:ir.ui.view,arch_db:account_payment_partner.account_payment_mode_form +msgid "Show bank account in invoice report" +msgstr "Mostrar cuenta bancaria en informe factura" + +#. module: account_payment_partner +#: model:ir.model.fields,help:account_payment_partner.field_account_payment_mode_show_bank_account +msgid "Show in invoices partial or full bank account number" +msgstr "Mostrar en facturas nº de cuenta bancaria parcial o completo" #. module: account_payment_partner #: model:ir.model.fields,field_description:account_payment_partner.field_res_partner_supplier_payment_mode_id diff --git a/account_payment_partner/migrations/10.0.1.2.0/post-migrate.py b/account_payment_partner/migrations/10.0.1.2.0/post-migrate.py new file mode 100644 index 000000000..e63be7140 --- /dev/null +++ b/account_payment_partner/migrations/10.0.1.2.0/post-migrate.py @@ -0,0 +1,12 @@ +# -*- coding: utf-8 -*- +# Copyright 2018 Carlos Dauden - Tecnativa +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). + + +def migrate(cr, version): + """Update database from previous versions, after updating module.""" + cr.execute( + "UPDATE account_payment_mode " + "SET show_bank_account_from_journal = true " + "WHERE bank_account_link = 'fixed'" + ) diff --git a/account_payment_partner/models/__init__.py b/account_payment_partner/models/__init__.py index 152bb919c..3ad1b3cca 100644 --- a/account_payment_partner/models/__init__.py +++ b/account_payment_partner/models/__init__.py @@ -3,3 +3,4 @@ from . import res_partner from . import account_invoice from . import account_move_line +from . import account_payment_mode diff --git a/account_payment_partner/models/account_invoice.py b/account_payment_partner/models/account_invoice.py index ea9aa8ff7..5c39c1395 100644 --- a/account_payment_partner/models/account_invoice.py +++ b/account_payment_partner/models/account_invoice.py @@ -33,11 +33,10 @@ class AccountInvoice(models.Model): self.partner_bank_id =\ self.commercial_partner_id.bank_ids[0] elif self.type == 'out_invoice': - pay_mode = self.partner_id.customer_payment_mode_id - self.payment_mode_id = pay_mode - if pay_mode and pay_mode.bank_account_link == 'fixed': - self.partner_bank_id = pay_mode.fixed_journal_id.\ - bank_account_id + # No bank account assignation is done here as this is only + # needed for printing purposes and it can conflict with + # SEPA direct debit payments. Current report prints it. + self.payment_mode_id = self.partner_id.customer_payment_mode_id else: self.payment_mode_id = False if self.type == 'in_invoice': @@ -97,3 +96,19 @@ class AccountInvoice(models.Model): if invoice.type == 'in_invoice': vals['partner_bank_id'] = invoice.partner_bank_id.id return vals + + def partner_banks_to_show(self): + self.ensure_one() + if self.partner_bank_id: + return self.partner_bank_id + if self.payment_mode_id.show_bank_account_from_journal: + if self.payment_mode_id.bank_account_link: + return self.payment_mode_id.fixed_journal_id.bank_account_id + else: + return self.payment_mode_id.variable_journal_ids.mapped( + 'bank_account_id') + if self.payment_mode_id.payment_method_id.code == 'sepa_direct_debit': + return (self.mandate_id.partner_bank_id or + self.partner_id.valid_mandate_id.partner_bank_id) + # Return this as empty recordset + return self.partner_bank_id diff --git a/account_payment_partner/models/account_payment_mode.py b/account_payment_partner/models/account_payment_mode.py new file mode 100644 index 000000000..f98ff59ad --- /dev/null +++ b/account_payment_partner/models/account_payment_mode.py @@ -0,0 +1,26 @@ +# -*- coding: utf-8 -*- +# Copyright 2018 Carlos Dauden - Tecnativa +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). + +from odoo import fields, models + + +class AccountPaymentMode(models.Model): + _inherit = 'account.payment.mode' + + show_bank_account = fields.Selection( + selection=[ + ('full', 'Full'), + ('first', 'First n chars'), + ('last', 'Last n chars'), + ('no', 'No'), + ], + string='Show bank account', + default='full', + help="Show in invoices partial or full bank account number") + show_bank_account_from_journal = fields.Boolean( + string='Bank account from journals' + ) + show_bank_account_chars = fields.Integer( + string="# of digits for customer bank account", + ) diff --git a/account_payment_partner/readme/CONTRIBUTORS.rst b/account_payment_partner/readme/CONTRIBUTORS.rst new file mode 100644 index 000000000..95f514aae --- /dev/null +++ b/account_payment_partner/readme/CONTRIBUTORS.rst @@ -0,0 +1,11 @@ +* Alexis de Lattre +* Raphaël Valyi +* Stefan Rijnhart (Therp) +* Alexandre Fayolle +* Stéphane Bidoul +* Danimar Ribeiro +* Angel Moya +* `Tecnativa `_: + + * Pedro M. Baeza + * Carlos Dauden diff --git a/account_payment_partner/readme/DESCRIPTION.rst b/account_payment_partner/readme/DESCRIPTION.rst new file mode 100644 index 000000000..27c9e82be --- /dev/null +++ b/account_payment_partner/readme/DESCRIPTION.rst @@ -0,0 +1,22 @@ +[ This file must be max 2-3 paragraphs, and is required. ] + +This module adds severals fields : + +* the *Supplier Payment Mode* and *Customer Payment Mode* on Partners, + +* the *Payment Mode* on Invoices. + +* the *Show bank account* on Payment Mode. + +* the *# of digits for customer bank account* on Payment Mode. + +* the *Bank account from journals* on Payment Mode. + +On a Payment Order, in the wizard *Select Invoices to Pay*, the invoices will +be filtered per Payment Mode. + +Allows to print in the invoice to which account number the payment +(via SEPA direct debit) is going to be charged so the customer knows that +information, but there are some customers that don't want that everyone +looking at the invoice sees the full account number (and even GDPR can say a +word about that), so that's the reason behind the several options. diff --git a/account_payment_partner/readme/HISTORY.rst b/account_payment_partner/readme/HISTORY.rst new file mode 100644 index 000000000..a6168b334 --- /dev/null +++ b/account_payment_partner/readme/HISTORY.rst @@ -0,0 +1,15 @@ +[ The change log. The goal of this file is to help readers + understand changes between version. The primary audience is + end users and integrators. Purely technical changes such as + code refactoring must not be mentioned here. + + This file may contain ONE level of section titles, underlined + with the ~ (tilde) character. Other section markers are + forbidden and will likely break the structure of the README.rst + or other documents where this fragment is included. ] + +10.0.1.2.0 (2018-05-24) +~~~~~~~~~~~~~~~~~~~~~~~ + +* [IMP] Add options to show partner bank account in invoice report + (`#458 `_) diff --git a/account_payment_partner/readme/USAGE.rst b/account_payment_partner/readme/USAGE.rst new file mode 100644 index 000000000..c2bbf0fbc --- /dev/null +++ b/account_payment_partner/readme/USAGE.rst @@ -0,0 +1,12 @@ +[ This file must be present and contains the usage instructions + for end-users. As all other rst files included in the README, + it MUST NOT contain reStructuredText sections + only body text (paragraphs, lists, tables, etc). Should you need + a more elaborate structure to explain the addon, please create a + Sphinx documentation (which may include this file as a "quick start" + section). ] + +You are able to add a payment mode directly on a partner. +This payment mode is automatically associated to the invoice related to the partner. This default value could be change in a draft invoice. +When you create an payment order, only invoices related to chosen payment mode are displayed. +Invoices without any payment mode are displayed to. diff --git a/account_payment_partner/static/description/index.html b/account_payment_partner/static/description/index.html new file mode 100644 index 000000000..641f3296e --- /dev/null +++ b/account_payment_partner/static/description/index.html @@ -0,0 +1,488 @@ + + + + + + +Account Payment Partner + + + +
+

Account Payment Partner

+ + +

Beta License: AGPL-3 OCA/bank-payment Translate me on Weblate Try me on Runbot

+

[ This file must be max 2-3 paragraphs, and is required. ]

+

This module adds severals fields :

+
    +
  • the Supplier Payment Mode and Customer Payment Mode on Partners,
    • +
  • the Payment Mode on Invoices.
    • +
  • the Show bank account on Payment Mode.
    • +
  • the # of digits for customer bank account on Payment Mode.
    • +
  • the Bank account from journals on Payment Mode.
    • +
+

On a Payment Order, in the wizard Select Invoices to Pay, the invoices will +be filtered per Payment Mode.

+

Allows to print in the invoice to which account number the payment +(via SEPA direct debit) is going to be charged so the customer knows that +information, but there are some customers that don’t want that everyone +looking at the invoice sees the full account number (and even GDPR can say a +word about that), so that’s the reason behind the several options.

+

Table of contents

+ +
+

Usage

+
+
[ This file must be present and contains the usage instructions
+
for end-users. As all other rst files included in the README, +it MUST NOT contain reStructuredText sections +only body text (paragraphs, lists, tables, etc). Should you need +a more elaborate structure to explain the addon, please create a +Sphinx documentation (which may include this file as a “quick start” +section). ]
+
+

You are able to add a payment mode directly on a partner. +This payment mode is automatically associated to the invoice related to the partner. This default value could be change in a draft invoice. +When you create an payment order, only invoices related to chosen payment mode are displayed. +Invoices without any payment mode are displayed to.

+
+
+

Changelog

+
+
[ The change log. The goal of this file is to help readers
+

understand changes between version. The primary audience is +end users and integrators. Purely technical changes such as +code refactoring must not be mentioned here.

+

This file may contain ONE level of section titles, underlined +with the ~ (tilde) character. Other section markers are +forbidden and will likely break the structure of the README.rst +or other documents where this fragment is included. ]

+
+
+
+

10.0.1.2.0 (2018-05-24)

+
    +
  • [IMP] Add options to show partner bank account in invoice report +(#458)
    • +
+
+
+
+

Bug Tracker

+

Bugs are tracked on GitHub Issues. +In case of trouble, please check there if your issue has already been reported. +If you spotted it first, help us smashing it by providing a detailed and welcomed +feedback.

+

Do not contact contributors directly about support or help with technical issues.

+
+
+

Credits

+
+

Authors

+
    +
  • Akretion
    • +
  • Tecnativa
    • +
+
+
+

Contributors

+ +
+
+

Maintainers

+

This module is maintained by the OCA.

+Odoo Community Association +

OCA, or the Odoo Community Association, is a nonprofit organization whose +mission is to support the collaborative development of Odoo features and +promote its widespread use.

+

This module is part of the OCA/bank-payment project on GitHub.

+

You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.

+
+
+
+ + diff --git a/account_payment_partner/views/account_payment_mode.xml b/account_payment_partner/views/account_payment_mode.xml new file mode 100644 index 000000000..da62bf405 --- /dev/null +++ b/account_payment_partner/views/account_payment_mode.xml @@ -0,0 +1,24 @@ + + + + + + account.payment.mode + + + + + + + + + + + + + + + diff --git a/account_payment_partner/views/report_invoice.xml b/account_payment_partner/views/report_invoice.xml index 3a25d8c13..1838444d8 100644 --- a/account_payment_partner/views/report_invoice.xml +++ b/account_payment_partner/views/report_invoice.xml @@ -7,13 +7,23 @@ Payment Mode:

-

- Bank Account: - - - - -

+ +

+ Bank Account: + + + + + + + + + + + + +

+