From 7afc2dea9f45fe72b2c48eef494c66a62ae13808 Mon Sep 17 00:00:00 2001 From: "Pedro M. Baeza" Date: Thu, 22 Aug 2019 17:00:47 +0200 Subject: [PATCH] [MIG] account_reconcile_payment_order: Migration to 12.0 * Standard procedure. * README by fragments. * Adapt logic to new reconciliation widget model. * Add tests. --- account_reconcile_payment_order/README.rst | 108 +++- account_reconcile_payment_order/__init__.py | 21 +- .../__manifest__.py | 20 + .../__openerp__.py | 35 -- .../models/__init__.py | 23 +- .../models/account_bank_statement_line.py | 78 --- .../models/account_reconciliation_widget.py | 67 +++ .../readme/CONFIGURE.rst | 2 + .../readme/CONTRIBUTORS.rst | 4 + .../readme/DESCRIPTION.rst | 5 + .../readme/INSTALL.rst | 2 + .../readme/ROADMAP.rst | 9 + .../readme/USAGE.rst | 6 + .../static/description/index.html | 471 ++++++++++++++++++ .../tests/__init__.py | 3 + .../test_account_reconcile_payment_order.py | 104 ++++ oca_dependencies.txt | 1 + 17 files changed, 780 insertions(+), 179 deletions(-) create mode 100644 account_reconcile_payment_order/__manifest__.py delete mode 100644 account_reconcile_payment_order/__openerp__.py delete mode 100644 account_reconcile_payment_order/models/account_bank_statement_line.py create mode 100644 account_reconcile_payment_order/models/account_reconciliation_widget.py create mode 100644 account_reconcile_payment_order/readme/CONFIGURE.rst create mode 100644 account_reconcile_payment_order/readme/CONTRIBUTORS.rst create mode 100644 account_reconcile_payment_order/readme/DESCRIPTION.rst create mode 100644 account_reconcile_payment_order/readme/INSTALL.rst create mode 100644 account_reconcile_payment_order/readme/ROADMAP.rst create mode 100644 account_reconcile_payment_order/readme/USAGE.rst create mode 100644 account_reconcile_payment_order/static/description/index.html create mode 100644 account_reconcile_payment_order/tests/__init__.py create mode 100644 account_reconcile_payment_order/tests/test_account_reconcile_payment_order.py diff --git a/account_reconcile_payment_order/README.rst b/account_reconcile_payment_order/README.rst index d16c8eae..b1c621de 100644 --- a/account_reconcile_payment_order/README.rst +++ b/account_reconcile_payment_order/README.rst @@ -1,70 +1,124 @@ -.. image:: https://img.shields.io/badge/licence-AGPL--3-blue.svg - :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html - :alt: License: AGPL-3 - ======================== 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/12.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-12-0/account-reconcile-12-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/12.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_banking_payment_transfer**, available +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 ===== -It should just work. What the module does is to search for a payment order in -state 'sent' (for orders transferred to an intermediate account) or done (for -orders non transferred) that has the same amount as the statement line, and the -same bank account than the statement. If any, all move lines are automatically -proposed for the reconcile. - -.. image:: https://odoo-community.org/website/image/ir.attachment/5784_f2813bd/datas - :alt: Try me on Runbot - :target: https://runbot.odoo-community.org/runbot/98/8.0 +#. 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 at least the bank in use here - changes some characters, so this doesn't seem to be a general solution. +* 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 `_. +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 -`here `_. +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 -* Pedro M. Baeza +* Holger Brunn +* `Tecnativa `__: -Maintainer ----------- + * Pedro M. Baeza + +Maintainers +~~~~~~~~~~~ + +This module is maintained by the OCA. .. image:: https://odoo-community.org/logo.png :alt: Odoo Community Association :target: https://odoo-community.org -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. -To contribute to this module, please visit http://odoo-community.org. +.. |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 index cdb7d736..e87e85c4 100644 --- a/account_reconcile_payment_order/__init__.py +++ b/account_reconcile_payment_order/__init__.py @@ -1,20 +1,3 @@ -# -*- coding: utf-8 -*- -############################################################################## -# -# This module copyright (C) 2015 Therp BV . -# -# 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 the Free Software Foundation, either version 3 of the -# License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see . -# -############################################################################## +# 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..a423b783 --- /dev/null +++ b/account_reconcile_payment_order/__manifest__.py @@ -0,0 +1,20 @@ +# 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": "12.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', + ], + "installable": True, + "maintainers": ['pedrobaeza'], +} diff --git a/account_reconcile_payment_order/__openerp__.py b/account_reconcile_payment_order/__openerp__.py deleted file mode 100644 index a9e3046d..00000000 --- a/account_reconcile_payment_order/__openerp__.py +++ /dev/null @@ -1,35 +0,0 @@ -# -*- coding: utf-8 -*- -############################################################################## -# -# This module copyright (C) 2015 Therp BV . -# -# 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 the Free Software Foundation, either version 3 of the -# License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see . -# -############################################################################## -{ - "name": "Reconcile payment orders", - "version": "8.0.1.0.1", - "author": "Therp BV," - "Serv. Tecnol. Avanzados - Pedro M. Baeza," - "Odoo Community Association (OCA)", - "license": "AGPL-3", - "category": "Accounting & Finance", - "summary": "Automatically reconcile all lines from payment orders", - "depends": [ - 'account_banking_payment_transfer', - ], - "auto_install": False, - "installable": True, - "application": False, -} diff --git a/account_reconcile_payment_order/models/__init__.py b/account_reconcile_payment_order/models/__init__.py index 33afdc17..7cf4dea8 100644 --- a/account_reconcile_payment_order/models/__init__.py +++ b/account_reconcile_payment_order/models/__init__.py @@ -1,20 +1,3 @@ -# -*- coding: utf-8 -*- -############################################################################## -# -# This module copyright (C) 2015 Therp BV . -# -# 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 the Free Software Foundation, either version 3 of the -# License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see . -# -############################################################################## -from . import account_bank_statement_line +# 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_bank_statement_line.py b/account_reconcile_payment_order/models/account_bank_statement_line.py deleted file mode 100644 index 1b2c7271..00000000 --- a/account_reconcile_payment_order/models/account_bank_statement_line.py +++ /dev/null @@ -1,78 +0,0 @@ -# -*- coding: utf-8 -*- -############################################################################## -# -# This module copyright (C) 2015 Therp BV (). -# -# 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 the Free Software Foundation, either version 3 of the -# License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see . -# -############################################################################## -from decimal import Decimal -from openerp import models, api -from openerp.tools.float_utils import float_repr - - -class AccountBankStatementLine(models.Model): - _inherit = 'account.bank.statement.line' - - @api.model - def get_possible_payment_orders_for_statement_line(self, this): - """find orders that might be candidates for matching a statement - line""" - digits = self.env['decimal.precision'].precision_get('Account') - self.env.cr.execute( - '''with order_sums as ( - select order_id, sum(amount_currency) as amount - from payment_line - join payment_order o on o.id=order_id - where o.state in ('sent', 'done') - group by order_id) - select order_id from order_sums where amount = %s''', - (Decimal(float_repr(abs(this.amount), digits)),)) - order_ids = [i for i, in self.env.cr.fetchall()] - # verify that this ids are accessible to the user - domain = [ - ('id', 'in', order_ids), - ] - return self.env['payment.order'].search(domain) - - @api.model - def get_reconcile_lines_from_order(self, this, orders, excluded_ids=None): - """return lines to reconcile our statement line with""" - order = orders[0] - target_currency = ( - this.currency_id or this.journal_id.currency or - this.journal_id.company_id.currency_id) - if order.state == 'sent': - move_lines_list = list(set(order._get_transfer_move_lines())) - else: - move_lines = order.line_ids.mapped('move_line_id').filtered( - lambda x: not x.reconcile_id) - move_lines_list = [x for x in move_lines] - return self.env['account.move.line']\ - .prepare_move_lines_for_reconciliation_widget( - move_lines_list, target_currency=target_currency, - target_date=this.date) - - @api.model - def get_reconciliation_proposition(self, this, excluded_ids=None): - """See if we find a set payment order that matches our line. If yes, - return all unreconciled lines from there""" - orders = self.get_possible_payment_orders_for_statement_line(this) - if orders: - reconcile_lines = self.get_reconcile_lines_from_order( - this, orders, excluded_ids=None) - if reconcile_lines: - return reconcile_lines - return super(AccountBankStatementLine, self)\ - .get_reconciliation_proposition(this, excluded_ids=excluded_ids) 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..c3697694 --- /dev/null +++ b/account_reconcile_payment_order/models/account_reconciliation_widget.py @@ -0,0 +1,67 @@ +# Copyright 2019 Tecnativa - Pedro M. Baeza +# License AGPL-3 - See http://www.gnu.org/licenses/agpl-3.0.html + +from odoo import models, api + + +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'] + reconciled_lines = aml_obj.search([ + ('bank_payment_line_id', 'in', order.bank_line_ids.ids) + ]) + return ( + reconciled_lines.mapped('move_id.line_ids') - reconciled_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..dfa767e3 --- /dev/null +++ b/account_reconcile_payment_order/readme/CONTRIBUTORS.rst @@ -0,0 +1,4 @@ +* Holger Brunn +* `Tecnativa `__: + + * Pedro M. Baeza 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/index.html b/account_reconcile_payment_order/static/description/index.html new file mode 100644 index 00000000..7f514072 --- /dev/null +++ b/account_reconcile_payment_order/static/description/index.html @@ -0,0 +1,471 @@ + + + + + + +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
      • +
    +
    • +
+
+
+

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..90ea9363 --- /dev/null +++ b/account_reconcile_payment_order/tests/__init__.py @@ -0,0 +1,3 @@ +# License AGPL-3 - See http://www.gnu.org/licenses/agpl-3.0.html + +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..87591585 --- /dev/null +++ b/account_reconcile_payment_order/tests/test_account_reconcile_payment_order.py @@ -0,0 +1,104 @@ +# Copyright 2019 Tecnativa - Pedro M. Baeza +# License AGPL-3 - See http://www.gnu.org/licenses/agpl-3.0.html + +from odoo.addons.account_payment_order.tests.test_payment_order_inbound \ + import TestPaymentOrderInboundBase + + +class TestAccountReconcilePaymentOrder(TestPaymentOrderInboundBase): + @classmethod + def setUpClass(cls): + super().setUpClass() + cls.widget_obj = cls.env['account.reconciliation.widget'] + cls.bank_journal = cls.env['account.journal'].search( + [('type', '=', 'bank')], limit=1) + # 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', + }) + cls.invoice2.partner_id = cls.partner2.id + cls.invoice2.action_invoice_open() + # Add to payment order using the wizard + cls.env['account.invoice.payment.line.multi'].with_context( + active_model='account.invoice', + 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, + }), + ], + }) + + def test_reconcile_payment_order_bank(self): + self.assertEqual(len(self.inbound_order.payment_line_ids), 2) + self.inbound_mode.write({ + 'offsetting_account': 'bank_account', + 'move_option': 'line', + }) + # 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) + receivable_account = self.env['account.account'].create({ + 'name': 'Extra receivable account', + 'code': 'TEST_ERA', + 'reconcile': True, + 'user_type_id': ( + self.env.ref('account.data_account_type_receivable').id), + }) + self.inbound_mode.write({ + 'offsetting_account': 'transfer_account', + 'transfer_account_id': receivable_account.id, + 'transfer_journal_id': self.bank_journal.id, + 'move_option': 'line', + }) + 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/oca_dependencies.txt b/oca_dependencies.txt index 626b4c89..9a273770 100644 --- a/oca_dependencies.txt +++ b/oca_dependencies.txt @@ -1 +1,2 @@ account-financial-tools +bank-payment