From 0624295e877af42e912bcd873b2b5f0a245a9df8 Mon Sep 17 00:00:00 2001 From: CarlosRoca13 Date: Wed, 30 Mar 2022 14:36:16 +0200 Subject: [PATCH] [MIG] account_reconcile_payment_order: Migration to 14.0 --- account_reconcile_payment_order/README.rst | 11 ++++++----- .../__manifest__.py | 6 +++--- .../i18n/account_reconcile_payment_order.pot | 17 ++++++++++++++++- .../readme/CONTRIBUTORS.rst | 1 + .../static/description/index.html | 7 ++++--- .../test_account_reconcile_payment_order.py | 19 +++---------------- 6 files changed, 33 insertions(+), 28 deletions(-) diff --git a/account_reconcile_payment_order/README.rst b/account_reconcile_payment_order/README.rst index efedfe50..4f14197d 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/13.0/account_reconcile_payment_order + :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-13-0/account-reconcile-13-0-account_reconcile_payment_order + :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/13.0 + :target: https://runbot.odoo-community.org/runbot/98/14.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. @@ -98,6 +98,7 @@ Contributors * Pedro M. Baeza * João Marques + * Carlos Roca Maintainers ~~~~~~~~~~~ @@ -120,6 +121,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 274f3e63..6aa4bbd3 100644 --- a/account_reconcile_payment_order/__manifest__.py +++ b/account_reconcile_payment_order/__manifest__.py @@ -4,13 +4,13 @@ { "name": "Reconcile payment orders", - "version": "13.0.1.0.1", - "author": "Therp BV," "Tecnativa," "Odoo Community Association (OCA)", + "version": "14.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", "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 index 7ed0bfaa..85017c2c 100644 --- a/account_reconcile_payment_order/i18n/account_reconcile_payment_order.pot +++ b/account_reconcile_payment_order/i18n/account_reconcile_payment_order.pot @@ -4,7 +4,7 @@ # msgid "" msgstr "" -"Project-Id-Version: Odoo Server 13.0\n" +"Project-Id-Version: Odoo Server 14.0\n" "Report-Msgid-Bugs-To: \n" "Last-Translator: \n" "Language-Team: \n" @@ -17,3 +17,18 @@ msgstr "" #: 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/readme/CONTRIBUTORS.rst b/account_reconcile_payment_order/readme/CONTRIBUTORS.rst index dab82860..fd504b80 100644 --- a/account_reconcile_payment_order/readme/CONTRIBUTORS.rst +++ b/account_reconcile_payment_order/readme/CONTRIBUTORS.rst @@ -3,3 +3,4 @@ * Pedro M. Baeza * João Marques + * Carlos Roca diff --git a/account_reconcile_payment_order/static/description/index.html b/account_reconcile_payment_order/static/description/index.html index 4bb87d52..5a4b00a9 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.

@@ -450,6 +450,7 @@ If you spotted it first, help us smashing it by providing a detailed and welcome
  • Tecnativa:
    • Pedro M. Baeza
    • João Marques
      • +
    • Carlos Roca
    • @@ -463,7 +464,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 e335c3e7..76857ed6 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 @@ -42,6 +42,7 @@ class TestAccountReconcilePaymentOrder(TestPaymentOrderInboundBase): "date": "2019-01-01", "name": "Test line", "amount": 200, # 100 * 2 + "payment_ref": "payment", }, ), ], @@ -50,9 +51,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"} - ) + self.inbound_mode.write({"move_option": "line"}) # Prepare payment order self.inbound_order.draft2open() self.inbound_order.open2generated() @@ -63,21 +62,9 @@ class TestAccountReconcilePaymentOrder(TestPaymentOrderInboundBase): 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, + "default_journal_ids": [(4, self.bank_journal.id)], "move_option": "line", } )