diff --git a/account_reconcile_payment_order/README.rst b/account_reconcile_payment_order/README.rst index b1c621de..efedfe50 100644 --- a/account_reconcile_payment_order/README.rst +++ b/account_reconcile_payment_order/README.rst @@ -14,13 +14,13 @@ Reconcile payment orders :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 + :target: https://github.com/OCA/account-reconcile/tree/13.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 + :target: https://translation.odoo-community.org/projects/account-reconcile-13-0/account-reconcile-13-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 + :target: https://runbot.odoo-community.org/runbot/98/13.0 :alt: Try me on Runbot |badge1| |badge2| |badge3| |badge4| |badge5| @@ -77,7 +77,7 @@ 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 `_. +`feedback `_. Do not contact contributors directly about support or help with technical issues. @@ -97,6 +97,7 @@ Contributors * `Tecnativa `__: * Pedro M. Baeza + * João Marques Maintainers ~~~~~~~~~~~ @@ -119,6 +120,6 @@ Current `maintainer `__: |maintainer-pedrobaeza| -This module is part of the `OCA/account-reconcile `_ project on GitHub. +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/__manifest__.py b/account_reconcile_payment_order/__manifest__.py index b7f539a8..5ac2d647 100644 --- a/account_reconcile_payment_order/__manifest__.py +++ b/account_reconcile_payment_order/__manifest__.py @@ -4,13 +4,13 @@ { "name": "Reconcile payment orders", - "version": "12.0.1.0.0", + "version": "13.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",], + "depends": ["account_payment_order"], "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 index 69c2c350..7ed0bfaa 100644 --- a/account_reconcile_payment_order/i18n/account_reconcile_payment_order.pot +++ b/account_reconcile_payment_order/i18n/account_reconcile_payment_order.pot @@ -1,12 +1,12 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: -# * account_reconcile_payment_order +# * account_reconcile_payment_order # msgid "" msgstr "" -"Project-Id-Version: Odoo Server 12.0\n" +"Project-Id-Version: Odoo Server 13.0\n" "Report-Msgid-Bugs-To: \n" -"Last-Translator: <>\n" +"Last-Translator: \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -17,4 +17,3 @@ msgstr "" #: 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/de.po b/account_reconcile_payment_order/i18n/de.po index 9af0851e..5af52a94 100644 --- a/account_reconcile_payment_order/i18n/de.po +++ b/account_reconcile_payment_order/i18n/de.po @@ -8,20 +8,18 @@ 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: 2015-08-19 00:32+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: \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 "" - -#~ msgid "Bank Statement Line" -#~ msgstr "Kontoauszugzeile" diff --git a/account_reconcile_payment_order/i18n/fr.po b/account_reconcile_payment_order/i18n/fr.po index 62d212ae..02f642b1 100644 --- a/account_reconcile_payment_order/i18n/fr.po +++ b/account_reconcile_payment_order/i18n/fr.po @@ -8,20 +8,18 @@ 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: 2015-08-19 00:32+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: \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 "" - -#~ msgid "Bank Statement Line" -#~ msgstr "Ligne de relevé bancaire" diff --git a/account_reconcile_payment_order/i18n/hr.po b/account_reconcile_payment_order/i18n/hr.po index 80df72c1..6ffea32f 100644 --- a/account_reconcile_payment_order/i18n/hr.po +++ b/account_reconcile_payment_order/i18n/hr.po @@ -1,6 +1,6 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: -# * account_reconcile_payment_order +# * account_reconcile_payment_order # msgid "" msgstr "" @@ -13,8 +13,8 @@ msgstr "" "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" +"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 diff --git a/account_reconcile_payment_order/i18n/it.po b/account_reconcile_payment_order/i18n/it.po index 5706243d..4fd73011 100644 --- a/account_reconcile_payment_order/i18n/it.po +++ b/account_reconcile_payment_order/i18n/it.po @@ -8,20 +8,18 @@ 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: 2015-08-19 00:32+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: \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 "" - -#~ msgid "Bank Statement Line" -#~ msgstr "Linea estratto conto" diff --git a/account_reconcile_payment_order/i18n/nl_NL.po b/account_reconcile_payment_order/i18n/nl_NL.po index ed1f3293..c58d0437 100644 --- a/account_reconcile_payment_order/i18n/nl_NL.po +++ b/account_reconcile_payment_order/i18n/nl_NL.po @@ -8,20 +8,18 @@ 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: 2015-08-19 00:32+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: \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 "" - -#~ msgid "Bank Statement Line" -#~ msgstr "Bankafschriftregel" diff --git a/account_reconcile_payment_order/i18n/sl.po b/account_reconcile_payment_order/i18n/sl.po index cfe2776b..3cef9c7e 100644 --- a/account_reconcile_payment_order/i18n/sl.po +++ b/account_reconcile_payment_order/i18n/sl.po @@ -8,21 +8,19 @@ 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: 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: \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 "" - -#~ msgid "Bank Statement Line" -#~ msgstr "Postavka bančnega izpiska" diff --git a/account_reconcile_payment_order/readme/CONTRIBUTORS.rst b/account_reconcile_payment_order/readme/CONTRIBUTORS.rst index dfa767e3..dab82860 100644 --- a/account_reconcile_payment_order/readme/CONTRIBUTORS.rst +++ b/account_reconcile_payment_order/readme/CONTRIBUTORS.rst @@ -2,3 +2,4 @@ * `Tecnativa `__: * Pedro M. Baeza + * João Marques diff --git a/account_reconcile_payment_order/static/description/index.html b/account_reconcile_payment_order/static/description/index.html index 7f514072..4bb87d52 100644 --- a/account_reconcile_payment_order/static/description/index.html +++ b/account_reconcile_payment_order/static/description/index.html @@ -367,7 +367,7 @@ ul.auto-toc { !! This file is generated by oca-gen-addon-readme !! !! changes will be overwritten. !! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! --> -

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

+

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 @@ -431,7 +431,7 @@ as a new type of reconciliation in this model.

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.

+feedback.

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

@@ -449,6 +449,7 @@ If you spotted it first, help us smashing it by providing a detailed and welcome
  • Holger Brunn
  • Tecnativa:
    • Pedro M. Baeza
      • +
    • João Marques
    • @@ -462,7 +463,7 @@ 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.

    +

    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/test_account_reconcile_payment_order.py b/account_reconcile_payment_order/tests/test_account_reconcile_payment_order.py index 6bf9a30b..a4a8e4bc 100644 --- a/account_reconcile_payment_order/tests/test_account_reconcile_payment_order.py +++ b/account_reconcile_payment_order/tests/test_account_reconcile_payment_order.py @@ -1,4 +1,5 @@ # 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 from odoo.addons.account_payment_order.tests.test_payment_order_inbound import ( @@ -15,19 +16,23 @@ class TestAccountReconcilePaymentOrder(TestPaymentOrderInboundBase): [ ("type", "=", "bank"), "|", - ("company_id", "=", cls.env.user.company_id.id), + ("company_id", "=", cls.env.company.id), ("company_id", "=", False), ], limit=1, ) # Create second invoice for being sure it handles the payment order - cls.invoice2 = cls._create_customer_invoice() - cls.partner2 = cls.env["res.partner"].create({"name": "Test partner 2",}) + 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 - cls.invoice2.action_invoice_open() + 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.invoice", active_ids=cls.invoice2.ids, + active_model="account.move", active_ids=cls.invoice2.ids, ).create({}).run() # Prepare statement cls.statement = cls.env["account.bank.statement"].create( @@ -36,7 +41,7 @@ class TestAccountReconcilePaymentOrder(TestPaymentOrderInboundBase): "date": "2019-01-01", "journal_id": cls.bank_journal.id, "line_ids": [ - (0, 0, {"date": "2019-01-01", "name": "Test line", "amount": 200,}), + (0, 0, {"date": "2019-01-01", "name": "Test line", "amount": 230}), ], } ) @@ -44,7 +49,7 @@ class TestAccountReconcilePaymentOrder(TestPaymentOrderInboundBase): 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",} + {"offsetting_account": "bank_account", "move_option": "line"} ) # Prepare payment order self.inbound_order.draft2open() @@ -80,7 +85,7 @@ class TestAccountReconcilePaymentOrder(TestPaymentOrderInboundBase): 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,) + 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 @@ -89,7 +94,7 @@ class TestAccountReconcilePaymentOrder(TestPaymentOrderInboundBase): data=[ { "type": "", - "mv_line_ids": [proposition[0]["id"], proposition[1]["id"],], + "mv_line_ids": [proposition[0]["id"], proposition[1]["id"]], "new_mv_line_dicts": [ { "name": st_line_vals["name"],