diff --git a/account_reconcile_payment_order/README.rst b/account_reconcile_payment_order/README.rst new file mode 100644 index 00000000..4f14197d --- /dev/null +++ b/account_reconcile_payment_order/README.rst @@ -0,0 +1,126 @@ +======================== +Reconcile payment orders +======================== + +.. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + !! 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%2Faccount--reconcile-lightgray.png?logo=github + :target: https://github.com/OCA/account-reconcile/tree/14.0/account_reconcile_payment_order + :alt: OCA/account-reconcile +.. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png + :target: https://translation.odoo-community.org/projects/account-reconcile-14-0/account-reconcile-14-0-account_reconcile_payment_order + :alt: Translate me on Weblate +.. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png + :target: https://runbot.odoo-community.org/runbot/98/14.0 + :alt: Try me on Runbot + +|badge1| |badge2| |badge3| |badge4| |badge5| + +Payment orders that show up as one big transaction can be difficult for the +accounting to handle if a transfer account is used. In this case, we need to +reconcile this transaction with possibly hundreds of move lines, which can be a +bit tiresome. This module tries to recognize transactions deriving from payment +orders and propose the unreconciled move lines from this payment order. + +**Table of contents** + +.. contents:: + :local: + +Installation +============ + +This module requires the module **account_payment_order**, available +in https://github.com/OCA/bank-payment. + +Configuration +============= + +#. Go to *Settings > Users & Companies > Users*. +#. Give to your user the permission "Show Full Accounting Features". + +Usage +===== + +#. Go to *Invoicing > Overview*. +#. Locate the bank kanban card and import or create a new statement on it. +#. When reconciling, it should just work. What the module does is to search for + a finished payment order that has the same amount as the statement line. If + any, generated move lines (bank or AR/AP ones) are automatically proposed + for the reconciliation. + +Known issues / Roadmap +====================== + +* It would be good to check references too, but bank usually change some + characters, so this doesn't seem to be a general solution. +* Take into account different currencies (in payment order or in bank + statement). +* Try to match payment orders resulting entries grouped by due date, instead of + a whole, but this will affect performance for sure. +* When the reconcile models end with more inheritable code, implement this + as a new type of reconciliation in this model. +* Develop real UI tests, instead of mimicking the call to the involved method. + +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 +~~~~~~~ + +* Therp BV +* Tecnativa + +Contributors +~~~~~~~~~~~~ + +* Holger Brunn +* `Tecnativa `__: + + * Pedro M. Baeza + * João Marques + * Carlos Roca + +Maintainers +~~~~~~~~~~~ + +This module is maintained by the OCA. + +.. image:: https://odoo-community.org/logo.png + :alt: Odoo Community Association + :target: https://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. + +.. |maintainer-pedrobaeza| image:: https://github.com/pedrobaeza.png?size=40px + :target: https://github.com/pedrobaeza + :alt: pedrobaeza + +Current `maintainer `__: + +|maintainer-pedrobaeza| + +This module is part of the `OCA/account-reconcile `_ project on GitHub. + +You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute. diff --git a/account_reconcile_payment_order/__init__.py b/account_reconcile_payment_order/__init__.py new file mode 100644 index 00000000..e87e85c4 --- /dev/null +++ b/account_reconcile_payment_order/__init__.py @@ -0,0 +1,3 @@ +# License AGPL-3 - See http://www.gnu.org/licenses/agpl-3.0.html + +from . import models diff --git a/account_reconcile_payment_order/__manifest__.py b/account_reconcile_payment_order/__manifest__.py new file mode 100644 index 00000000..8b6303f0 --- /dev/null +++ b/account_reconcile_payment_order/__manifest__.py @@ -0,0 +1,16 @@ +# Copyright 2015 Therp BV (). +# Copyright 2019 Tecnativa - Pedro M. Baeza +# License AGPL-3 - See http://www.gnu.org/licenses/agpl-3.0.html + +{ + "name": "Reconcile payment orders", + "version": "15.0.1.0.0", + "author": "Therp BV, Tecnativa, Odoo Community Association (OCA)", + "license": "AGPL-3", + "website": "https://github.com/OCA/account-reconcile", + "category": "Invoicing Management", + "summary": "Automatically propose all lines generated from payment orders", + "depends": ["account_payment_order", "account_reconciliation_widget"], + "installable": True, + "maintainers": ["pedrobaeza"], +} diff --git a/account_reconcile_payment_order/i18n/account_reconcile_payment_order.pot b/account_reconcile_payment_order/i18n/account_reconcile_payment_order.pot new file mode 100644 index 00000000..85017c2c --- /dev/null +++ b/account_reconcile_payment_order/i18n/account_reconcile_payment_order.pot @@ -0,0 +1,34 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * account_reconcile_payment_order +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 14.0\n" +"Report-Msgid-Bugs-To: \n" +"Last-Translator: \n" +"Language-Team: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Plural-Forms: \n" + +#. module: account_reconcile_payment_order +#: model:ir.model,name:account_reconcile_payment_order.model_account_reconciliation_widget +msgid "Account Reconciliation widget" +msgstr "" + +#. module: account_reconcile_payment_order +#: model:ir.model.fields,field_description:account_reconcile_payment_order.field_account_reconciliation_widget__display_name +msgid "Display Name" +msgstr "" + +#. module: account_reconcile_payment_order +#: model:ir.model.fields,field_description:account_reconcile_payment_order.field_account_reconciliation_widget__id +msgid "ID" +msgstr "" + +#. module: account_reconcile_payment_order +#: model:ir.model.fields,field_description:account_reconcile_payment_order.field_account_reconciliation_widget____last_update +msgid "Last Modified on" +msgstr "" diff --git a/account_reconcile_payment_order/i18n/de.po b/account_reconcile_payment_order/i18n/de.po new file mode 100644 index 00000000..5af52a94 --- /dev/null +++ b/account_reconcile_payment_order/i18n/de.po @@ -0,0 +1,25 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * account_reconcile_payment_order +# +# Translators: +msgid "" +msgstr "" +"Project-Id-Version: bank-statement-reconcile (8.0)\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2015-10-14 09:25+0000\n" +"PO-Revision-Date: 2021-02-16 07:24+0000\n" +"Last-Translator: <>\n" +"Language-Team: German (http://www.transifex.com/oca/OCA-bank-statement-" +"reconcile-8-0/language/de/)\n" +"Language: de\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"X-Generator: Poedit 2.4.2\n" + +#. module: account_reconcile_payment_order +#: model:ir.model,name:account_reconcile_payment_order.model_account_reconciliation_widget +msgid "Account Reconciliation widget" +msgstr "" diff --git a/account_reconcile_payment_order/i18n/es.po b/account_reconcile_payment_order/i18n/es.po new file mode 100644 index 00000000..c91ba3af --- /dev/null +++ b/account_reconcile_payment_order/i18n/es.po @@ -0,0 +1,37 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * account_reconcile_payment_order +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 14.0\n" +"Report-Msgid-Bugs-To: \n" +"PO-Revision-Date: 2022-04-12 18:05+0000\n" +"Last-Translator: Dept. Técnico \n" +"Language-Team: none\n" +"Language: es\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Weblate 4.3.2\n" + +#. module: account_reconcile_payment_order +#: model:ir.model,name:account_reconcile_payment_order.model_account_reconciliation_widget +msgid "Account Reconciliation widget" +msgstr "Widget de reconciliación de cuentas" + +#. module: account_reconcile_payment_order +#: model:ir.model.fields,field_description:account_reconcile_payment_order.field_account_reconciliation_widget__display_name +msgid "Display Name" +msgstr "Mostrar nombre" + +#. module: account_reconcile_payment_order +#: model:ir.model.fields,field_description:account_reconcile_payment_order.field_account_reconciliation_widget__id +msgid "ID" +msgstr "Identifiación" + +#. module: account_reconcile_payment_order +#: model:ir.model.fields,field_description:account_reconcile_payment_order.field_account_reconciliation_widget____last_update +msgid "Last Modified on" +msgstr "Última modificación en" diff --git a/account_reconcile_payment_order/i18n/fr.po b/account_reconcile_payment_order/i18n/fr.po new file mode 100644 index 00000000..02f642b1 --- /dev/null +++ b/account_reconcile_payment_order/i18n/fr.po @@ -0,0 +1,25 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * account_reconcile_payment_order +# +# Translators: +msgid "" +msgstr "" +"Project-Id-Version: bank-statement-reconcile (8.0)\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2016-04-20 02:39+0000\n" +"PO-Revision-Date: 2021-02-16 07:24+0000\n" +"Last-Translator: <>\n" +"Language-Team: French (http://www.transifex.com/oca/OCA-bank-statement-" +"reconcile-8-0/language/fr/)\n" +"Language: fr\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n > 1);\n" +"X-Generator: Poedit 2.4.2\n" + +#. module: account_reconcile_payment_order +#: model:ir.model,name:account_reconcile_payment_order.model_account_reconciliation_widget +msgid "Account Reconciliation widget" +msgstr "" diff --git a/account_reconcile_payment_order/i18n/hr.po b/account_reconcile_payment_order/i18n/hr.po new file mode 100644 index 00000000..6ffea32f --- /dev/null +++ b/account_reconcile_payment_order/i18n/hr.po @@ -0,0 +1,23 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * account_reconcile_payment_order +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 12.0\n" +"Report-Msgid-Bugs-To: \n" +"PO-Revision-Date: 2020-03-05 17:13+0000\n" +"Last-Translator: Bole \n" +"Language-Team: none\n" +"Language: hr\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" +"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" +"X-Generator: Weblate 3.10\n" + +#. module: account_reconcile_payment_order +#: model:ir.model,name:account_reconcile_payment_order.model_account_reconciliation_widget +msgid "Account Reconciliation widget" +msgstr "Widget zatvaranja" diff --git a/account_reconcile_payment_order/i18n/it.po b/account_reconcile_payment_order/i18n/it.po new file mode 100644 index 00000000..4fd73011 --- /dev/null +++ b/account_reconcile_payment_order/i18n/it.po @@ -0,0 +1,25 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * account_reconcile_payment_order +# +# Translators: +msgid "" +msgstr "" +"Project-Id-Version: bank-statement-reconcile (8.0)\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2015-10-14 09:25+0000\n" +"PO-Revision-Date: 2021-02-16 07:24+0000\n" +"Last-Translator: <>\n" +"Language-Team: Italian (http://www.transifex.com/oca/OCA-bank-statement-" +"reconcile-8-0/language/it/)\n" +"Language: it\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"X-Generator: Poedit 2.4.2\n" + +#. module: account_reconcile_payment_order +#: model:ir.model,name:account_reconcile_payment_order.model_account_reconciliation_widget +msgid "Account Reconciliation widget" +msgstr "" diff --git a/account_reconcile_payment_order/i18n/nl_NL.po b/account_reconcile_payment_order/i18n/nl_NL.po new file mode 100644 index 00000000..c58d0437 --- /dev/null +++ b/account_reconcile_payment_order/i18n/nl_NL.po @@ -0,0 +1,25 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * account_reconcile_payment_order +# +# Translators: +msgid "" +msgstr "" +"Project-Id-Version: bank-statement-reconcile (8.0)\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-06-24 00:30+0000\n" +"PO-Revision-Date: 2021-02-16 07:25+0000\n" +"Last-Translator: <>\n" +"Language-Team: Dutch (Netherlands) (http://www.transifex.com/oca/OCA-bank-" +"statement-reconcile-8-0/language/nl_NL/)\n" +"Language: nl_NL\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"X-Generator: Poedit 2.4.2\n" + +#. module: account_reconcile_payment_order +#: model:ir.model,name:account_reconcile_payment_order.model_account_reconciliation_widget +msgid "Account Reconciliation widget" +msgstr "" diff --git a/account_reconcile_payment_order/i18n/sl.po b/account_reconcile_payment_order/i18n/sl.po new file mode 100644 index 00000000..3cef9c7e --- /dev/null +++ b/account_reconcile_payment_order/i18n/sl.po @@ -0,0 +1,26 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * account_reconcile_payment_order +# +# Translators: +msgid "" +msgstr "" +"Project-Id-Version: bank-statement-reconcile (8.0)\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2015-08-19 00:32+0000\n" +"PO-Revision-Date: 2021-02-16 07:25+0000\n" +"Last-Translator: <>\n" +"Language-Team: Slovenian (http://www.transifex.com/oca/OCA-bank-statement-" +"reconcile-8-0/language/sl/)\n" +"Language: sl\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n" +"%100==4 ? 2 : 3);\n" +"X-Generator: Poedit 2.4.2\n" + +#. module: account_reconcile_payment_order +#: model:ir.model,name:account_reconcile_payment_order.model_account_reconciliation_widget +msgid "Account Reconciliation widget" +msgstr "" diff --git a/account_reconcile_payment_order/models/__init__.py b/account_reconcile_payment_order/models/__init__.py new file mode 100644 index 00000000..7cf4dea8 --- /dev/null +++ b/account_reconcile_payment_order/models/__init__.py @@ -0,0 +1,3 @@ +# License AGPL-3 - See http://www.gnu.org/licenses/agpl-3.0.html + +from . import account_reconciliation_widget diff --git a/account_reconcile_payment_order/models/account_reconciliation_widget.py b/account_reconcile_payment_order/models/account_reconciliation_widget.py new file mode 100644 index 00000000..d51992f9 --- /dev/null +++ b/account_reconcile_payment_order/models/account_reconciliation_widget.py @@ -0,0 +1,75 @@ +# Copyright 2019 Tecnativa - Pedro M. Baeza +# License AGPL-3 - See http://www.gnu.org/licenses/agpl-3.0.html + +from odoo import api, models + + +class AccountReconciliationWidget(models.AbstractModel): + _inherit = "account.reconciliation.widget" + + @api.model + def _get_possible_payment_orders_for_statement_line(self, st_line): + """Find orders that might be candidates for matching a statement + line. + """ + return self.env["account.payment.order"].search( + [ + ("total_company_currency", "=", st_line.amount), + ("state", "in", ["done", "uploaded"]), + ] + ) + + @api.model + def _get_reconcile_lines_from_order(self, st_line, order, excluded_ids=None): + """Return lines to reconcile our statement line with.""" + aml_obj = self.env["account.move.line"] + lines = aml_obj + for payment in order.payment_ids: + lines |= payment.move_id.line_ids.filtered( + lambda x: x.account_id != payment.destination_account_id + and x.partner_id == payment.partner_id + ) + return (lines - aml_obj.browse(excluded_ids)).filtered( + lambda x: not x.reconciled + ) + + def _prepare_proposition_from_orders(self, st_line, orders, excluded_ids=None): + """Fill with the expected format the reconciliation proposition + for the given statement line and possible payment orders. + """ + target_currency = ( + st_line.currency_id + or st_line.journal_id.currency_id + or st_line.journal_id.company_id.currency_id + ) + for order in orders: + elegible_lines = self._get_reconcile_lines_from_order( + st_line, + order, + excluded_ids=excluded_ids, + ) + if elegible_lines: + return self._prepare_move_lines( + elegible_lines, + target_currency=target_currency, + target_date=st_line.date, + ) + return [] + + def get_bank_statement_line_data(self, st_line_ids, excluded_ids=None): + res = super().get_bank_statement_line_data( + st_line_ids, + excluded_ids=excluded_ids, + ) + st_line_obj = self.env["account.bank.statement.line"] + for line_vals in res.get("lines", []): + st_line = st_line_obj.browse(line_vals["st_line"]["id"]) + orders = self._get_possible_payment_orders_for_statement_line(st_line) + proposition_vals = self._prepare_proposition_from_orders( + st_line, + orders, + excluded_ids=excluded_ids, + ) + if proposition_vals: + line_vals["reconciliation_proposition"] = proposition_vals + return res diff --git a/account_reconcile_payment_order/readme/CONFIGURE.rst b/account_reconcile_payment_order/readme/CONFIGURE.rst new file mode 100644 index 00000000..1f9dff4f --- /dev/null +++ b/account_reconcile_payment_order/readme/CONFIGURE.rst @@ -0,0 +1,2 @@ +#. Go to *Settings > Users & Companies > Users*. +#. Give to your user the permission "Show Full Accounting Features". diff --git a/account_reconcile_payment_order/readme/CONTRIBUTORS.rst b/account_reconcile_payment_order/readme/CONTRIBUTORS.rst new file mode 100644 index 00000000..fd504b80 --- /dev/null +++ b/account_reconcile_payment_order/readme/CONTRIBUTORS.rst @@ -0,0 +1,6 @@ +* Holger Brunn +* `Tecnativa `__: + + * Pedro M. Baeza + * João Marques + * Carlos Roca diff --git a/account_reconcile_payment_order/readme/DESCRIPTION.rst b/account_reconcile_payment_order/readme/DESCRIPTION.rst new file mode 100644 index 00000000..03833623 --- /dev/null +++ b/account_reconcile_payment_order/readme/DESCRIPTION.rst @@ -0,0 +1,5 @@ +Payment orders that show up as one big transaction can be difficult for the +accounting to handle if a transfer account is used. In this case, we need to +reconcile this transaction with possibly hundreds of move lines, which can be a +bit tiresome. This module tries to recognize transactions deriving from payment +orders and propose the unreconciled move lines from this payment order. diff --git a/account_reconcile_payment_order/readme/INSTALL.rst b/account_reconcile_payment_order/readme/INSTALL.rst new file mode 100644 index 00000000..41a9bc34 --- /dev/null +++ b/account_reconcile_payment_order/readme/INSTALL.rst @@ -0,0 +1,2 @@ +This module requires the module **account_payment_order**, available +in https://github.com/OCA/bank-payment. diff --git a/account_reconcile_payment_order/readme/ROADMAP.rst b/account_reconcile_payment_order/readme/ROADMAP.rst new file mode 100644 index 00000000..074f3d7a --- /dev/null +++ b/account_reconcile_payment_order/readme/ROADMAP.rst @@ -0,0 +1,9 @@ +* It would be good to check references too, but bank usually change some + characters, so this doesn't seem to be a general solution. +* Take into account different currencies (in payment order or in bank + statement). +* Try to match payment orders resulting entries grouped by due date, instead of + a whole, but this will affect performance for sure. +* When the reconcile models end with more inheritable code, implement this + as a new type of reconciliation in this model. +* Develop real UI tests, instead of mimicking the call to the involved method. diff --git a/account_reconcile_payment_order/readme/USAGE.rst b/account_reconcile_payment_order/readme/USAGE.rst new file mode 100644 index 00000000..67a1eb95 --- /dev/null +++ b/account_reconcile_payment_order/readme/USAGE.rst @@ -0,0 +1,6 @@ +#. Go to *Invoicing > Overview*. +#. Locate the bank kanban card and import or create a new statement on it. +#. When reconciling, it should just work. What the module does is to search for + a finished payment order that has the same amount as the statement line. If + any, generated move lines (bank or AR/AP ones) are automatically proposed + for the reconciliation. diff --git a/account_reconcile_payment_order/static/description/icon.png b/account_reconcile_payment_order/static/description/icon.png new file mode 100644 index 00000000..3a0328b5 Binary files /dev/null and b/account_reconcile_payment_order/static/description/icon.png differ diff --git a/account_reconcile_payment_order/static/description/index.html b/account_reconcile_payment_order/static/description/index.html new file mode 100644 index 00000000..5a4b00a9 --- /dev/null +++ b/account_reconcile_payment_order/static/description/index.html @@ -0,0 +1,473 @@ + + + + + + +Reconcile payment orders + + + +
+

Reconcile payment orders

+ + +

Beta License: AGPL-3 OCA/account-reconcile Translate me on Weblate Try me on Runbot

+

Payment orders that show up as one big transaction can be difficult for the +accounting to handle if a transfer account is used. In this case, we need to +reconcile this transaction with possibly hundreds of move lines, which can be a +bit tiresome. This module tries to recognize transactions deriving from payment +orders and propose the unreconciled move lines from this payment order.

+

Table of contents

+ +
+

Installation

+

This module requires the module account_payment_order, available +in https://github.com/OCA/bank-payment.

+
+
+

Configuration

+
    +
  1. Go to Settings > Users & Companies > Users.
    2. +
  2. Give to your user the permission “Show Full Accounting Features”.
    3. +
+
+
+

Usage

+
    +
  1. Go to Invoicing > Overview.
    2. +
  2. Locate the bank kanban card and import or create a new statement on it.
    3. +
  3. When reconciling, it should just work. What the module does is to search for +a finished payment order that has the same amount as the statement line. If +any, generated move lines (bank or AR/AP ones) are automatically proposed +for the reconciliation.
    4. +
+
+
+

Known issues / Roadmap

+
    +
  • It would be good to check references too, but bank usually change some +characters, so this doesn’t seem to be a general solution.
    • +
  • Take into account different currencies (in payment order or in bank +statement).
    • +
  • Try to match payment orders resulting entries grouped by due date, instead of +a whole, but this will affect performance for sure.
    • +
  • When the reconcile models end with more inheritable code, implement this +as a new type of reconciliation in this model.
    • +
  • Develop real UI tests, instead of mimicking the call to the involved method.
    • +
+
+
+

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

+
    +
  • Therp BV
    • +
  • Tecnativa
    • +
+
+
+

Contributors

+
    +
  • Holger Brunn
    • +
  • Tecnativa:
      +
    • Pedro M. Baeza
      • +
    • João Marques
      • +
    • Carlos Roca
      • +
    +
    • +
+
+
+

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.

+

Current maintainer:

+

pedrobaeza

+

This module is part of the OCA/account-reconcile project on GitHub.

+

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

+
+
+
+ + diff --git a/account_reconcile_payment_order/tests/__init__.py b/account_reconcile_payment_order/tests/__init__.py new file mode 100644 index 00000000..86a246fb --- /dev/null +++ b/account_reconcile_payment_order/tests/__init__.py @@ -0,0 +1,4 @@ +# License AGPL-3 - See http://www.gnu.org/licenses/agpl-3.0.html + +# Tests (and module?) must be ported to new version of account_payment_order +from . import test_account_reconcile_payment_order diff --git a/account_reconcile_payment_order/tests/test_account_reconcile_payment_order.py b/account_reconcile_payment_order/tests/test_account_reconcile_payment_order.py new file mode 100644 index 00000000..5a54294d --- /dev/null +++ b/account_reconcile_payment_order/tests/test_account_reconcile_payment_order.py @@ -0,0 +1,103 @@ +# Copyright 2019 Tecnativa - Pedro M. Baeza +# Copyright 2021 Tecnativa - João Marques +# License AGPL-3 - See http://www.gnu.org/licenses/agpl-3.0.html + +import odoo.tests + +from odoo.addons.account_payment_order.tests.test_payment_order_inbound import ( + TestPaymentOrderInboundBase, +) + + +@odoo.tests.tagged("post_install", "-at_install") +class TestAccountReconcilePaymentOrder(TestPaymentOrderInboundBase): + @classmethod + def setUpClass(cls): + super().setUpClass() + cls.widget_obj = cls.env["account.reconciliation.widget"] + cls.bank_journal = cls.env["account.journal"].create( + {"name": "Test bank journal", "type": "bank"} + ) + # Create second invoice for being sure it handles the payment order + cls.invoice2 = cls._create_customer_invoice(cls) + cls.partner2 = cls.env["res.partner"].create({"name": "Test partner 2"}) + # Set correct partner in invoice + cls.invoice2.partner_id = cls.partner2.id + for line in cls.invoice2.line_ids: + line.partner_id = cls.partner2.id + cls.invoice2.payment_mode_id = cls.inbound_mode + cls.invoice2.action_post() + # Add to payment order using the wizard + cls.env["account.invoice.payment.line.multi"].with_context( + active_model="account.move", active_ids=cls.invoice2.ids + ).create({}).run() + # Prepare statement + cls.statement = cls.env["account.bank.statement"].create( + { + "name": "Test statement", + "date": "2019-01-01", + "journal_id": cls.bank_journal.id, + "line_ids": [ + ( + 0, + 0, + { + "date": "2019-01-01", + "name": "Test line", + "amount": 200, # 100 * 2 + "payment_ref": "payment", + }, + ), + ], + } + ) + + def test_reconcile_payment_order_bank(self): + self.assertEqual(len(self.inbound_order.payment_line_ids), 2) + # Prepare payment order + self.inbound_order.draft2open() + self.inbound_order.open2generated() + self.inbound_order.generated2uploaded() + # Check widget result + res = self.widget_obj.get_bank_statement_line_data(self.statement.line_ids.ids) + self.assertEqual(len(res["lines"][0]["reconciliation_proposition"]), 2) + + def test_reconcile_payment_order_transfer_account(self): + self.assertEqual(len(self.inbound_order.payment_line_ids), 2) + self.inbound_mode.write( + { + "default_journal_ids": [(4, self.bank_journal.id)], + } + ) + self.assertEqual(len(self.inbound_order.payment_line_ids), 2) + # Prepare payment order + self.inbound_order.draft2open() + self.inbound_order.open2generated() + self.inbound_order.generated2uploaded() + # Check widget result + res = self.widget_obj.get_bank_statement_line_data(self.statement.line_ids.ids) + proposition = res["lines"][0]["reconciliation_proposition"] + self.assertEqual(len(proposition), 2) + # Reconcile that entries and check again + st_line_vals = res["lines"][0]["st_line"] + self.widget_obj.process_move_lines( + data=[ + { + "type": "", + "mv_line_ids": [proposition[0]["id"], proposition[1]["id"]], + "new_mv_line_dicts": [ + { + "name": st_line_vals["name"], + "credit": st_line_vals["amount"], + "debit": 0, + "account_id": st_line_vals["account_id"][0], + "journal_id": st_line_vals["journal_id"], + } + ], + } + ], + ) + res2 = self.widget_obj.get_bank_statement_line_data( + self.statement.line_ids.ids, + ) + self.assertNotEqual(res, res2) diff --git a/setup/account_reconcile_payment_order/odoo/addons/account_reconcile_payment_order b/setup/account_reconcile_payment_order/odoo/addons/account_reconcile_payment_order new file mode 120000 index 00000000..f6734f33 --- /dev/null +++ b/setup/account_reconcile_payment_order/odoo/addons/account_reconcile_payment_order @@ -0,0 +1 @@ +../../../../account_reconcile_payment_order \ No newline at end of file diff --git a/setup/account_reconcile_payment_order/setup.py b/setup/account_reconcile_payment_order/setup.py new file mode 100644 index 00000000..28c57bb6 --- /dev/null +++ b/setup/account_reconcile_payment_order/setup.py @@ -0,0 +1,6 @@ +import setuptools + +setuptools.setup( + setup_requires=['setuptools-odoo'], + odoo_addon=True, +)