diff --git a/account_payment_order_grouped_output/README.rst b/account_payment_order_grouped_output/README.rst
new file mode 100644
index 000000000..d08766f3d
--- /dev/null
+++ b/account_payment_order_grouped_output/README.rst
@@ -0,0 +1,79 @@
+==============================================
+Account Payment Order - Generate grouped moves
+==============================================
+
+.. 
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+   !! This file is generated by oca-gen-addon-readme !!
+   !! changes will be overwritten.                   !!
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+   !! source digest: sha256:32fc00895b8be3fbc84d692959de94a404f5f82b21067c863caae346f97800b2
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+.. |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/17.0/account_payment_order_grouped_output
+    :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-17-0/bank-payment-17-0-account_payment_order_grouped_output
+    :alt: Translate me on Weblate
+.. |badge5| image:: https://img.shields.io/badge/runboat-Try%20me-875A7B.png
+    :target: https://runboat.odoo-community.org/builds?repo=OCA/bank-payment&target_branch=17.0
+    :alt: Try me on Runboat
+
+|badge1| |badge2| |badge3| |badge4| |badge5|
+
+This module adds an option to generate extra grouped moves for the
+payment orders since the refactoring done to use native Odoo payments.
+
+This serves for easing the reconciliation on bank statements of large
+payment orders, handling them as one or several journal entries
+according payment date.
+
+**Table of contents**
+
+.. contents::
+   :local:
+
+Bug Tracker
+===========
+
+Bugs are tracked on `GitHub Issues <https://github.com/OCA/bank-payment/issues>`_.
+In case of trouble, please check there if your issue has already been reported.
+If you spotted it first, help us to smash it by providing a detailed and welcomed
+`feedback <https://github.com/OCA/bank-payment/issues/new?body=module:%20account_payment_order_grouped_output%0Aversion:%2017.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
+
+Do not contact contributors directly about support or help with technical issues.
+
+Credits
+=======
+
+Authors
+-------
+
+* ACSONE SA/NV
+* Therp BV
+* Tecnativa
+* Akretion
+
+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.
+
+This module is part of the `OCA/bank-payment <https://github.com/OCA/bank-payment/tree/17.0/account_payment_order_grouped_output>`_ project on GitHub.
+
+You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.
diff --git a/account_payment_order_grouped_output/__init__.py b/account_payment_order_grouped_output/__init__.py
new file mode 100644
index 000000000..0650744f6
--- /dev/null
+++ b/account_payment_order_grouped_output/__init__.py
@@ -0,0 +1 @@
+from . import models
diff --git a/account_payment_order_grouped_output/__manifest__.py b/account_payment_order_grouped_output/__manifest__.py
new file mode 100644
index 000000000..57cdf2d83
--- /dev/null
+++ b/account_payment_order_grouped_output/__manifest__.py
@@ -0,0 +1,18 @@
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+{
+    "name": "Account Payment Order - Generate grouped moves",
+    "version": "17.0.1.0.0",
+    "license": "AGPL-3",
+    "author": "ACSONE SA/NV, Therp BV, Tecnativa, Akretion, "
+    "Odoo Community Association (OCA)",
+    "website": "https://github.com/OCA/bank-payment",
+    "category": "Banking addons",
+    "depends": ["account_payment_order"],
+    "data": [
+        "views/account_payment_mode_views.xml",
+        "views/account_payment_order_views.xml",
+    ],
+    "demo": [],
+    "installable": True,
+}
diff --git a/account_payment_order_grouped_output/i18n/account_payment_order_grouped_output.pot b/account_payment_order_grouped_output/i18n/account_payment_order_grouped_output.pot
new file mode 100644
index 000000000..962c19e6a
--- /dev/null
+++ b/account_payment_order_grouped_output/i18n/account_payment_order_grouped_output.pot
@@ -0,0 +1,96 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# 	* account_payment_order_grouped_output
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 17.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_payment_order_grouped_output
+#. odoo-python
+#: code:addons/account_payment_order_grouped_output/models/account_payment_order.py:0
+#, python-format
+msgid "Debit bank line %s"
+msgstr ""
+
+#. module: account_payment_order_grouped_output
+#. odoo-python
+#: code:addons/account_payment_order_grouped_output/models/account_payment_order.py:0
+#: code:addons/account_payment_order_grouped_output/models/account_payment_order.py:0
+#, python-format
+msgid "Debit order %s"
+msgstr ""
+
+#. module: account_payment_order_grouped_output
+#: model:ir.model.fields,field_description:account_payment_order_grouped_output.field_account_payment_mode__generate_move
+msgid "Generate Grouped Accounting Entries On File Upload"
+msgstr ""
+
+#. module: account_payment_order_grouped_output
+#: model_terms:ir.ui.view,arch_db:account_payment_order_grouped_output.account_payment_mode_form
+msgid "Grouped Accounting Entries Options"
+msgstr ""
+
+#. module: account_payment_order_grouped_output
+#: model_terms:ir.ui.view,arch_db:account_payment_order_grouped_output.account_payment_order_form
+msgid "Grouped Entries"
+msgstr ""
+
+#. module: account_payment_order_grouped_output
+#: model:ir.model.fields,field_description:account_payment_order_grouped_output.field_account_payment_order__grouped_move_ids
+msgid "Journal Entries (Grouped)"
+msgstr ""
+
+#. module: account_payment_order_grouped_output
+#: model:ir.model,name:account_payment_order_grouped_output.model_account_move
+msgid "Journal Entry"
+msgstr ""
+
+#. module: account_payment_order_grouped_output
+#: model:ir.model.fields,field_description:account_payment_order_grouped_output.field_account_payment_order__grouped_move_count
+msgid "Number of Grouped Journal Entries"
+msgstr ""
+
+#. module: account_payment_order_grouped_output
+#: model:ir.model,name:account_payment_order_grouped_output.model_account_payment_mode
+msgid "Payment Modes"
+msgstr ""
+
+#. module: account_payment_order_grouped_output
+#: model:ir.model,name:account_payment_order_grouped_output.model_account_payment_order
+msgid "Payment Order"
+msgstr ""
+
+#. module: account_payment_order_grouped_output
+#: model:ir.model.fields,field_description:account_payment_order_grouped_output.field_account_bank_statement_line__grouped_payment_order_id
+#: model:ir.model.fields,field_description:account_payment_order_grouped_output.field_account_move__grouped_payment_order_id
+#: model:ir.model.fields,field_description:account_payment_order_grouped_output.field_account_payment__grouped_payment_order_id
+msgid "Payment Order (Grouped)"
+msgstr ""
+
+#. module: account_payment_order_grouped_output
+#. odoo-python
+#: code:addons/account_payment_order_grouped_output/models/account_payment_order.py:0
+#, python-format
+msgid "Payment bank line %s"
+msgstr ""
+
+#. module: account_payment_order_grouped_output
+#. odoo-python
+#: code:addons/account_payment_order_grouped_output/models/account_payment_order.py:0
+#: code:addons/account_payment_order_grouped_output/models/account_payment_order.py:0
+#, python-format
+msgid "Payment order %s"
+msgstr ""
+
+#. module: account_payment_order_grouped_output
+#: model:ir.model.fields,field_description:account_payment_order_grouped_output.field_account_payment_mode__post_move
+msgid "Post Move"
+msgstr ""
diff --git a/account_payment_order_grouped_output/i18n/es.po b/account_payment_order_grouped_output/i18n/es.po
new file mode 100644
index 000000000..36f21d978
--- /dev/null
+++ b/account_payment_order_grouped_output/i18n/es.po
@@ -0,0 +1,97 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# 	* account_payment_order_grouped_output
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 17.0\n"
+"Report-Msgid-Bugs-To: \n"
+"PO-Revision-Date: 2023-05-17 10:05+0000\n"
+"Last-Translator: gelo joga Rodríguez <gelo.joga@factorlibre.com>\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.14.1\n"
+
+#. module: account_payment_order_grouped_output
+#. odoo-python
+#: code:addons/account_payment_order_grouped_output/models/account_payment_order.py:0
+#, python-format
+msgid "Debit bank line %s"
+msgstr "Línea de débito bancaria %s"
+
+#. module: account_payment_order_grouped_output
+#. odoo-python
+#: code:addons/account_payment_order_grouped_output/models/account_payment_order.py:0
+#, python-format
+msgid "Debit order %s"
+msgstr "Orden de débito %s"
+
+#. module: account_payment_order_grouped_output
+#: model:ir.model.fields,field_description:account_payment_order_grouped_output.field_account_payment_mode__generate_move
+msgid "Generate Grouped Accounting Entries On File Upload"
+msgstr "Generar asientos contables agrupados en la carga de archivos"
+
+#. module: account_payment_order_grouped_output
+#: model_terms:ir.ui.view,arch_db:account_payment_order_grouped_output.account_payment_mode_form
+msgid "Grouped Accounting Entries Options"
+msgstr "Opciones de asientos contables agrupados"
+
+#. module: account_payment_order_grouped_output
+#: model_terms:ir.ui.view,arch_db:account_payment_order_grouped_output.account_payment_order_form
+msgid "Grouped Entries"
+msgstr "Entradas agrupadas"
+
+#. module: account_payment_order_grouped_output
+#: model:ir.model.fields,field_description:account_payment_order_grouped_output.field_account_payment_order__grouped_move_ids
+msgid "Journal Entries (Grouped)"
+msgstr "Asientos de diario (agrupados)"
+
+#. module: account_payment_order_grouped_output
+#: model:ir.model,name:account_payment_order_grouped_output.model_account_move
+msgid "Journal Entry"
+msgstr "Asiento contable"
+
+#. module: account_payment_order_grouped_output
+#: model:ir.model.fields,field_description:account_payment_order_grouped_output.field_account_payment_order__grouped_move_count
+msgid "Number of Grouped Journal Entries"
+msgstr "Número de asientos de diario agrupados"
+
+#. module: account_payment_order_grouped_output
+#: model:ir.model,name:account_payment_order_grouped_output.model_account_payment_mode
+msgid "Payment Modes"
+msgstr "Modos de pago"
+
+#. module: account_payment_order_grouped_output
+#: model:ir.model,name:account_payment_order_grouped_output.model_account_payment_order
+msgid "Payment Order"
+msgstr "Orden de pago"
+
+#. module: account_payment_order_grouped_output
+#: model:ir.model.fields,field_description:account_payment_order_grouped_output.field_account_bank_statement_line__grouped_payment_order_id
+#: model:ir.model.fields,field_description:account_payment_order_grouped_output.field_account_move__grouped_payment_order_id
+#: model:ir.model.fields,field_description:account_payment_order_grouped_output.field_account_payment__grouped_payment_order_id
+msgid "Payment Order (Grouped)"
+msgstr "Orden de pago (agrupada)"
+
+#. module: account_payment_order_grouped_output
+#. odoo-python
+#: code:addons/account_payment_order_grouped_output/models/account_payment_order.py:0
+#, python-format
+msgid "Payment bank line %s"
+msgstr "Línea de pago bancaria %s"
+
+#. module: account_payment_order_grouped_output
+#. odoo-python
+#: code:addons/account_payment_order_grouped_output/models/account_payment_order.py:0
+#, python-format
+msgid "Payment order %s"
+msgstr "orden de pago %s"
+
+#. module: account_payment_order_grouped_output
+#: model:ir.model.fields,field_description:account_payment_order_grouped_output.field_account_payment_mode__post_move
+msgid "Post Move"
+msgstr "Publicar asiento"
diff --git a/account_payment_order_grouped_output/i18n/fr.po b/account_payment_order_grouped_output/i18n/fr.po
new file mode 100644
index 000000000..1648c7c19
--- /dev/null
+++ b/account_payment_order_grouped_output/i18n/fr.po
@@ -0,0 +1,98 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# 	* account_payment_order_grouped_output
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 17.0\n"
+"Report-Msgid-Bugs-To: \n"
+"PO-Revision-Date: 2023-06-29 12:08+0000\n"
+"Last-Translator: Rémi <remi@le-filament.com>\n"
+"Language-Team: none\n"
+"Language: fr\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.17\n"
+
+#. module: account_payment_order_grouped_output
+#. odoo-python
+#: code:addons/account_payment_order_grouped_output/models/account_payment_order.py:0
+#, python-format
+msgid "Debit bank line %s"
+msgstr "Ligne bancaire de débit %s"
+
+#. module: account_payment_order_grouped_output
+#. odoo-python
+#: code:addons/account_payment_order_grouped_output/models/account_payment_order.py:0
+#, python-format
+msgid "Debit order %s"
+msgstr "Ordre de débit %s"
+
+#. module: account_payment_order_grouped_output
+#: model:ir.model.fields,field_description:account_payment_order_grouped_output.field_account_payment_mode__generate_move
+msgid "Generate Grouped Accounting Entries On File Upload"
+msgstr ""
+"Générer des écritures comptables groupées lors du téléversement d'un fichier"
+
+#. module: account_payment_order_grouped_output
+#: model_terms:ir.ui.view,arch_db:account_payment_order_grouped_output.account_payment_mode_form
+msgid "Grouped Accounting Entries Options"
+msgstr "Options des écritures comptables groupées"
+
+#. module: account_payment_order_grouped_output
+#: model_terms:ir.ui.view,arch_db:account_payment_order_grouped_output.account_payment_order_form
+msgid "Grouped Entries"
+msgstr "Entrées groupées"
+
+#. module: account_payment_order_grouped_output
+#: model:ir.model.fields,field_description:account_payment_order_grouped_output.field_account_payment_order__grouped_move_ids
+msgid "Journal Entries (Grouped)"
+msgstr "Pièces comptables (regroupées)"
+
+#. module: account_payment_order_grouped_output
+#: model:ir.model,name:account_payment_order_grouped_output.model_account_move
+msgid "Journal Entry"
+msgstr "Pièce comptable"
+
+#. module: account_payment_order_grouped_output
+#: model:ir.model.fields,field_description:account_payment_order_grouped_output.field_account_payment_order__grouped_move_count
+msgid "Number of Grouped Journal Entries"
+msgstr "Nombre de pièces comptables regroupées"
+
+#. module: account_payment_order_grouped_output
+#: model:ir.model,name:account_payment_order_grouped_output.model_account_payment_mode
+msgid "Payment Modes"
+msgstr "Modes de paiement"
+
+#. module: account_payment_order_grouped_output
+#: model:ir.model,name:account_payment_order_grouped_output.model_account_payment_order
+msgid "Payment Order"
+msgstr "Ordre de paiement"
+
+#. module: account_payment_order_grouped_output
+#: model:ir.model.fields,field_description:account_payment_order_grouped_output.field_account_bank_statement_line__grouped_payment_order_id
+#: model:ir.model.fields,field_description:account_payment_order_grouped_output.field_account_move__grouped_payment_order_id
+#: model:ir.model.fields,field_description:account_payment_order_grouped_output.field_account_payment__grouped_payment_order_id
+msgid "Payment Order (Grouped)"
+msgstr "Ordre de paiement (groupé)"
+
+#. module: account_payment_order_grouped_output
+#. odoo-python
+#: code:addons/account_payment_order_grouped_output/models/account_payment_order.py:0
+#, python-format
+msgid "Payment bank line %s"
+msgstr "Ligne bancaire de paiement %s"
+
+#. module: account_payment_order_grouped_output
+#. odoo-python
+#: code:addons/account_payment_order_grouped_output/models/account_payment_order.py:0
+#, python-format
+msgid "Payment order %s"
+msgstr "Ordre de paiement %s"
+
+#. module: account_payment_order_grouped_output
+#: model:ir.model.fields,field_description:account_payment_order_grouped_output.field_account_payment_mode__post_move
+msgid "Post Move"
+msgstr "Comptabiliser les écritures"
diff --git a/account_payment_order_grouped_output/i18n/hr.po b/account_payment_order_grouped_output/i18n/hr.po
new file mode 100644
index 000000000..a71ef7237
--- /dev/null
+++ b/account_payment_order_grouped_output/i18n/hr.po
@@ -0,0 +1,98 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# 	* account_payment_order_grouped_output
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 17.0\n"
+"Report-Msgid-Bugs-To: \n"
+"PO-Revision-Date: 2023-05-09 13:42+0000\n"
+"Last-Translator: Bole <bole@dajmi5.com>\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 4.14.1\n"
+
+#. module: account_payment_order_grouped_output
+#. odoo-python
+#: code:addons/account_payment_order_grouped_output/models/account_payment_order.py:0
+#, python-format
+msgid "Debit bank line %s"
+msgstr ""
+
+#. module: account_payment_order_grouped_output
+#. odoo-python
+#: code:addons/account_payment_order_grouped_output/models/account_payment_order.py:0
+#, python-format
+msgid "Debit order %s"
+msgstr ""
+
+#. module: account_payment_order_grouped_output
+#: model:ir.model.fields,field_description:account_payment_order_grouped_output.field_account_payment_mode__generate_move
+msgid "Generate Grouped Accounting Entries On File Upload"
+msgstr ""
+
+#. module: account_payment_order_grouped_output
+#: model_terms:ir.ui.view,arch_db:account_payment_order_grouped_output.account_payment_mode_form
+msgid "Grouped Accounting Entries Options"
+msgstr ""
+
+#. module: account_payment_order_grouped_output
+#: model_terms:ir.ui.view,arch_db:account_payment_order_grouped_output.account_payment_order_form
+msgid "Grouped Entries"
+msgstr "Grupirane stavke"
+
+#. module: account_payment_order_grouped_output
+#: model:ir.model.fields,field_description:account_payment_order_grouped_output.field_account_payment_order__grouped_move_ids
+msgid "Journal Entries (Grouped)"
+msgstr "Stavke dnevnika (Grupirane)"
+
+#. module: account_payment_order_grouped_output
+#: model:ir.model,name:account_payment_order_grouped_output.model_account_move
+msgid "Journal Entry"
+msgstr "Stavka dnevnika"
+
+#. module: account_payment_order_grouped_output
+#: model:ir.model.fields,field_description:account_payment_order_grouped_output.field_account_payment_order__grouped_move_count
+msgid "Number of Grouped Journal Entries"
+msgstr "Broj grupiranih stavaka dnevnika"
+
+#. module: account_payment_order_grouped_output
+#: model:ir.model,name:account_payment_order_grouped_output.model_account_payment_mode
+msgid "Payment Modes"
+msgstr "Modeli plaćanja"
+
+#. module: account_payment_order_grouped_output
+#: model:ir.model,name:account_payment_order_grouped_output.model_account_payment_order
+msgid "Payment Order"
+msgstr "Nalog za plaćanje"
+
+#. module: account_payment_order_grouped_output
+#: model:ir.model.fields,field_description:account_payment_order_grouped_output.field_account_bank_statement_line__grouped_payment_order_id
+#: model:ir.model.fields,field_description:account_payment_order_grouped_output.field_account_move__grouped_payment_order_id
+#: model:ir.model.fields,field_description:account_payment_order_grouped_output.field_account_payment__grouped_payment_order_id
+msgid "Payment Order (Grouped)"
+msgstr "Nalog za plaćanje (Grupirani)"
+
+#. module: account_payment_order_grouped_output
+#. odoo-python
+#: code:addons/account_payment_order_grouped_output/models/account_payment_order.py:0
+#, python-format
+msgid "Payment bank line %s"
+msgstr ""
+
+#. module: account_payment_order_grouped_output
+#. odoo-python
+#: code:addons/account_payment_order_grouped_output/models/account_payment_order.py:0
+#, python-format
+msgid "Payment order %s"
+msgstr ""
+
+#. module: account_payment_order_grouped_output
+#: model:ir.model.fields,field_description:account_payment_order_grouped_output.field_account_payment_mode__post_move
+msgid "Post Move"
+msgstr ""
diff --git a/account_payment_order_grouped_output/i18n/it.po b/account_payment_order_grouped_output/i18n/it.po
new file mode 100644
index 000000000..641e805f7
--- /dev/null
+++ b/account_payment_order_grouped_output/i18n/it.po
@@ -0,0 +1,97 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# 	* account_payment_order_grouped_output
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 17.0\n"
+"Report-Msgid-Bugs-To: \n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"Language: it\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"
+
+#. module: account_payment_order_grouped_output
+#. odoo-python
+#: code:addons/account_payment_order_grouped_output/models/account_payment_order.py:0
+#, python-format
+msgid "Debit bank line %s"
+msgstr ""
+
+#. module: account_payment_order_grouped_output
+#. odoo-python
+#: code:addons/account_payment_order_grouped_output/models/account_payment_order.py:0
+#: code:addons/account_payment_order_grouped_output/models/account_payment_order.py:0
+#, python-format
+msgid "Debit order %s"
+msgstr ""
+
+#. module: account_payment_order_grouped_output
+#: model:ir.model.fields,field_description:account_payment_order_grouped_output.field_account_payment_mode__generate_move
+msgid "Generate Grouped Accounting Entries On File Upload"
+msgstr ""
+
+#. module: account_payment_order_grouped_output
+#: model_terms:ir.ui.view,arch_db:account_payment_order_grouped_output.account_payment_mode_form
+msgid "Grouped Accounting Entries Options"
+msgstr ""
+
+#. module: account_payment_order_grouped_output
+#: model_terms:ir.ui.view,arch_db:account_payment_order_grouped_output.account_payment_order_form
+msgid "Grouped Entries"
+msgstr ""
+
+#. module: account_payment_order_grouped_output
+#: model:ir.model.fields,field_description:account_payment_order_grouped_output.field_account_payment_order__grouped_move_ids
+msgid "Journal Entries (Grouped)"
+msgstr ""
+
+#. module: account_payment_order_grouped_output
+#: model:ir.model,name:account_payment_order_grouped_output.model_account_move
+msgid "Journal Entry"
+msgstr ""
+
+#. module: account_payment_order_grouped_output
+#: model:ir.model.fields,field_description:account_payment_order_grouped_output.field_account_payment_order__grouped_move_count
+msgid "Number of Grouped Journal Entries"
+msgstr ""
+
+#. module: account_payment_order_grouped_output
+#: model:ir.model,name:account_payment_order_grouped_output.model_account_payment_mode
+msgid "Payment Modes"
+msgstr ""
+
+#. module: account_payment_order_grouped_output
+#: model:ir.model,name:account_payment_order_grouped_output.model_account_payment_order
+msgid "Payment Order"
+msgstr ""
+
+#. module: account_payment_order_grouped_output
+#: model:ir.model.fields,field_description:account_payment_order_grouped_output.field_account_bank_statement_line__grouped_payment_order_id
+#: model:ir.model.fields,field_description:account_payment_order_grouped_output.field_account_move__grouped_payment_order_id
+#: model:ir.model.fields,field_description:account_payment_order_grouped_output.field_account_payment__grouped_payment_order_id
+msgid "Payment Order (Grouped)"
+msgstr ""
+
+#. module: account_payment_order_grouped_output
+#. odoo-python
+#: code:addons/account_payment_order_grouped_output/models/account_payment_order.py:0
+#, python-format
+msgid "Payment bank line %s"
+msgstr ""
+
+#. module: account_payment_order_grouped_output
+#. odoo-python
+#: code:addons/account_payment_order_grouped_output/models/account_payment_order.py:0
+#: code:addons/account_payment_order_grouped_output/models/account_payment_order.py:0
+#, python-format
+msgid "Payment order %s"
+msgstr ""
+
+#. module: account_payment_order_grouped_output
+#: model:ir.model.fields,field_description:account_payment_order_grouped_output.field_account_payment_mode__post_move
+msgid "Post Move"
+msgstr ""
diff --git a/account_payment_order_grouped_output/models/__init__.py b/account_payment_order_grouped_output/models/__init__.py
new file mode 100644
index 000000000..b17a1af2e
--- /dev/null
+++ b/account_payment_order_grouped_output/models/__init__.py
@@ -0,0 +1,3 @@
+from . import account_move
+from . import account_payment_mode
+from . import account_payment_order
diff --git a/account_payment_order_grouped_output/models/account_move.py b/account_payment_order_grouped_output/models/account_move.py
new file mode 100644
index 000000000..4dee19d00
--- /dev/null
+++ b/account_payment_order_grouped_output/models/account_move.py
@@ -0,0 +1,16 @@
+# Copyright 2022 Tecnativa - Pedro M. Baeza
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from odoo import fields, models
+
+
+class AccountMove(models.Model):
+    _inherit = "account.move"
+
+    grouped_payment_order_id = fields.Many2one(
+        comodel_name="account.payment.order",
+        string="Payment Order (Grouped)",
+        copy=False,
+        readonly=True,
+        check_company=True,
+    )
diff --git a/account_payment_order_grouped_output/models/account_payment_mode.py b/account_payment_order_grouped_output/models/account_payment_mode.py
new file mode 100644
index 000000000..e0344efe4
--- /dev/null
+++ b/account_payment_order_grouped_output/models/account_payment_mode.py
@@ -0,0 +1,12 @@
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from odoo import fields, models
+
+
+class AccountPaymentMode(models.Model):
+    _inherit = "account.payment.mode"
+
+    generate_move = fields.Boolean(
+        string="Generate Grouped Accounting Entries On File Upload", default=True
+    )
+    post_move = fields.Boolean(default=True)
diff --git a/account_payment_order_grouped_output/models/account_payment_order.py b/account_payment_order_grouped_output/models/account_payment_order.py
new file mode 100644
index 000000000..0adeb55cf
--- /dev/null
+++ b/account_payment_order_grouped_output/models/account_payment_order.py
@@ -0,0 +1,210 @@
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from odoo import _, api, fields, models
+
+
+class AccountPaymentOrder(models.Model):
+    _inherit = "account.payment.order"
+
+    grouped_move_ids = fields.One2many(
+        comodel_name="account.move",
+        inverse_name="grouped_payment_order_id",
+        string="Journal Entries (Grouped)",
+        readonly=True,
+    )
+    grouped_move_count = fields.Integer(
+        compute="_compute_grouped_move_count",
+        string="Number of Grouped Journal Entries",
+    )
+
+    @api.depends("grouped_move_ids")
+    def _compute_grouped_move_count(self):
+        rg_res = self.env["account.move"].read_group(
+            [("grouped_payment_order_id", "in", self.ids)],
+            ["grouped_payment_order_id"],
+            ["grouped_payment_order_id"],
+        )
+        mapped_data = {
+            x["grouped_payment_order_id"][0]: x["grouped_payment_order_id_count"]
+            for x in rg_res
+        }
+        for order in self:
+            order.grouped_move_count = mapped_data.get(order.id, 0)
+
+    def action_uploaded_cancel(self):
+        """Unreconcile and remove grouped moves."""
+        for move in self.grouped_move_ids:
+            move.button_cancel()
+            for move_line in move.line_ids:
+                move_line.remove_move_reconcile()
+            move.with_context(force_delete=True).unlink()
+        return super().action_uploaded_cancel()
+
+    def generated2uploaded(self):
+        """Generate grouped moves if configured that way."""
+        res = super().generated2uploaded()
+        for order in self:
+            if order.payment_mode_id.generate_move and len(order.payment_ids) > 1:
+                order.generate_move()
+        return res
+
+    def generate_move(self):
+        """Create the moves that pay off the move lines from the payment/debit order."""
+        self.ensure_one()
+        trfmoves = self._prepare_trf_moves()
+        for hashcode, plines in trfmoves.items():
+            self._create_reconcile_move(hashcode, plines)
+
+    def _prepare_trf_moves(self):
+        """Prepare a dict "trfmoves" grouped by date."""
+        self.ensure_one()
+        trfmoves = {}
+        for pline in self.payment_ids:
+            hashcode = fields.Date.to_string(pline.date)
+            trfmoves.setdefault(hashcode, self.env["account.payment"])
+            trfmoves[hashcode] += pline
+        return trfmoves
+
+    def _create_reconcile_move(self, hashcode, payments):
+        self.ensure_one()
+        post_move = self.payment_mode_id.post_move
+        am_obj = self.env["account.move"]
+        mvals = self._prepare_move(payments)
+        move = am_obj.create(mvals)
+        if post_move:
+            move.action_post()
+        self.reconcile_grouped_payments(move, payments)
+
+    def reconcile_grouped_payments(self, move, payments):
+        lines_to_rec = move.line_ids[:-1]
+        for payment in payments:
+            journal = payment.journal_id
+            lines_to_rec += payment.move_id.line_ids.filtered(
+                lambda x, journal=journal: x.account_id
+                in (
+                    journal._get_journal_inbound_outstanding_payment_accounts()
+                    + journal._get_journal_outbound_outstanding_payment_accounts()
+                )
+            )
+        lines_to_rec.reconcile()
+
+    def _prepare_move(self, payments=None):
+        if self.payment_type == "outbound":
+            ref = _("Payment order %s") % self.name
+        else:
+            ref = _("Debit order %s") % self.name
+        if payments and len(payments) == 1:
+            ref += " - " + payments.name
+        vals = {
+            "date": payments[0].date,
+            "journal_id": self.journal_id.id,
+            "ref": ref,
+            "grouped_payment_order_id": self.id,
+            "line_ids": [],
+        }
+        total_company_currency = total_payment_currency = 0
+        for pline in payments:
+            amount_company_currency = abs(pline.move_id.line_ids[0].balance)
+            total_company_currency += amount_company_currency
+            total_payment_currency += pline.amount
+            partner_ml_vals = self._prepare_move_line_partner_account(pline)
+            vals["line_ids"].append((0, 0, partner_ml_vals))
+        trf_ml_vals = self._prepare_move_line_offsetting_account(
+            total_company_currency, total_payment_currency, payments
+        )
+        vals["line_ids"].append((0, 0, trf_ml_vals))
+        return vals
+
+    def _get_grouped_output_liquidity_account(self, payment):
+        domain = [
+            ("journal_id", "=", self.journal_id.id),
+            ("payment_method_id", "=", payment.payment_method_id.id),
+            ("payment_type", "=", self.payment_type),
+        ]
+        apml = self.env["account.payment.method.line"].search(domain)
+        if apml.payment_account_id:
+            return apml.payment_account_id
+        elif self.payment_type == "inbound":
+            return payment.company_id.account_journal_payment_debit_account_id
+        else:
+            return payment.company_id.account_journal_payment_credit_account_id
+
+    def _prepare_move_line_partner_account(self, payment):
+        if self.payment_type == "outbound":
+            name = _("Payment bank line %s") % payment.name
+        else:
+            name = _("Debit bank line %s") % payment.name
+        account = self._get_grouped_output_liquidity_account(payment)
+        sign = self.payment_type == "inbound" and -1 or 1
+        amount_company_currency = abs(payment.move_id.line_ids[0].balance)
+        vals = {
+            "name": name,
+            "partner_id": payment.partner_id.id,
+            "account_id": account.id,
+            "credit": (
+                self.payment_type == "inbound" and amount_company_currency or 0.0
+            ),
+            "debit": (
+                self.payment_type == "outbound" and amount_company_currency or 0.0
+            ),
+            "currency_id": payment.currency_id.id,
+            "amount_currency": payment.amount * sign,
+            # Same logic as the individual payments
+            "date_maturity": payment.payment_line_ids[0].date,
+        }
+        return vals
+
+    def _prepare_move_line_offsetting_account(
+        self, amount_company_currency, amount_payment_currency, payments
+    ):
+        if self.payment_type == "outbound":
+            name = _("Payment order %s") % self.name
+        else:
+            name = _("Debit order %s") % self.name
+        partner = self.env["res.partner"]
+        for index, payment in enumerate(payments):
+            account = self._get_grouped_output_liquidity_account(payment)
+            if index == 0:
+                partner = payment.payment_line_ids[0].partner_id
+            elif payment.payment_line_ids[0].partner_id != partner:
+                # we have different partners in the grouped move
+                partner = self.env["res.partner"]
+                break
+        sign = self.payment_type == "outbound" and -1 or 1
+        vals = {
+            "name": name,
+            "partner_id": partner.id,
+            "account_id": account.id,
+            "credit": (
+                self.payment_type == "outbound" and amount_company_currency or 0.0
+            ),
+            "debit": (
+                self.payment_type == "inbound" and amount_company_currency or 0.0
+            ),
+            "currency_id": payments[0].currency_id.id,
+            "amount_currency": amount_payment_currency * sign,
+            # All the lines should have the same date following _prepare_trf_moves
+            "date_maturity": payments.payment_line_ids[:1].date,
+        }
+        return vals
+
+    def action_grouped_moves(self):
+        self.ensure_one()
+        action = self.env["ir.actions.act_window"]._for_xml_id(
+            "account.action_move_journal_line"
+        )
+        if self.grouped_move_count == 1:
+            action.update(
+                {
+                    "view_mode": "form,tree,kanban",
+                    "views": False,
+                    "view_id": False,
+                    "res_id": self.grouped_move_ids.id,
+                }
+            )
+        else:
+            action["domain"] = [("id", "in", self.grouped_move_ids.ids)]
+        ctx = self.env.context.copy()
+        ctx.update({"search_default_misc_filter": 0})
+        action["context"] = ctx
+        return action
diff --git a/account_payment_order_grouped_output/pyproject.toml b/account_payment_order_grouped_output/pyproject.toml
new file mode 100644
index 000000000..4231d0ccc
--- /dev/null
+++ b/account_payment_order_grouped_output/pyproject.toml
@@ -0,0 +1,3 @@
+[build-system]
+requires = ["whool"]
+build-backend = "whool.buildapi"
diff --git a/account_payment_order_grouped_output/readme/DESCRIPTION.md b/account_payment_order_grouped_output/readme/DESCRIPTION.md
new file mode 100644
index 000000000..d8c73592e
--- /dev/null
+++ b/account_payment_order_grouped_output/readme/DESCRIPTION.md
@@ -0,0 +1,6 @@
+This module adds an option to generate extra grouped moves for the
+payment orders since the refactoring done to use native Odoo payments.
+
+This serves for easing the reconciliation on bank statements of large
+payment orders, handling them as one or several journal entries
+according payment date.
diff --git a/account_payment_order_grouped_output/static/description/icon.png b/account_payment_order_grouped_output/static/description/icon.png
new file mode 100644
index 000000000..3a0328b51
Binary files /dev/null and b/account_payment_order_grouped_output/static/description/icon.png differ
diff --git a/account_payment_order_grouped_output/static/description/index.html b/account_payment_order_grouped_output/static/description/index.html
new file mode 100644
index 000000000..59292d9f3
--- /dev/null
+++ b/account_payment_order_grouped_output/static/description/index.html
@@ -0,0 +1,423 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<meta name="generator" content="Docutils: https://docutils.sourceforge.io/" />
+<title>Account Payment Order - Generate grouped moves</title>
+<style type="text/css">
+
+/*
+:Author: David Goodger (goodger@python.org)
+:Id: $Id: html4css1.css 9511 2024-01-13 09:50:07Z milde $
+:Copyright: This stylesheet has been placed in the public domain.
+
+Default cascading style sheet for the HTML output of Docutils.
+Despite the name, some widely supported CSS2 features are used.
+
+See https://docutils.sourceforge.io/docs/howto/html-stylesheets.html for how to
+customize this style sheet.
+*/
+
+/* used to remove borders from tables and images */
+.borderless, table.borderless td, table.borderless th {
+  border: 0 }
+
+table.borderless td, table.borderless th {
+  /* Override padding for "table.docutils td" with "! important".
+     The right padding separates the table cells. */
+  padding: 0 0.5em 0 0 ! important }
+
+.first {
+  /* Override more specific margin styles with "! important". */
+  margin-top: 0 ! important }
+
+.last, .with-subtitle {
+  margin-bottom: 0 ! important }
+
+.hidden {
+  display: none }
+
+.subscript {
+  vertical-align: sub;
+  font-size: smaller }
+
+.superscript {
+  vertical-align: super;
+  font-size: smaller }
+
+a.toc-backref {
+  text-decoration: none ;
+  color: black }
+
+blockquote.epigraph {
+  margin: 2em 5em ; }
+
+dl.docutils dd {
+  margin-bottom: 0.5em }
+
+object[type="image/svg+xml"], object[type="application/x-shockwave-flash"] {
+  overflow: hidden;
+}
+
+/* Uncomment (and remove this text!) to get bold-faced definition list terms
+dl.docutils dt {
+  font-weight: bold }
+*/
+
+div.abstract {
+  margin: 2em 5em }
+
+div.abstract p.topic-title {
+  font-weight: bold ;
+  text-align: center }
+
+div.admonition, div.attention, div.caution, div.danger, div.error,
+div.hint, div.important, div.note, div.tip, div.warning {
+  margin: 2em ;
+  border: medium outset ;
+  padding: 1em }
+
+div.admonition p.admonition-title, div.hint p.admonition-title,
+div.important p.admonition-title, div.note p.admonition-title,
+div.tip p.admonition-title {
+  font-weight: bold ;
+  font-family: sans-serif }
+
+div.attention p.admonition-title, div.caution p.admonition-title,
+div.danger p.admonition-title, div.error p.admonition-title,
+div.warning p.admonition-title, .code .error {
+  color: red ;
+  font-weight: bold ;
+  font-family: sans-serif }
+
+/* Uncomment (and remove this text!) to get reduced vertical space in
+   compound paragraphs.
+div.compound .compound-first, div.compound .compound-middle {
+  margin-bottom: 0.5em }
+
+div.compound .compound-last, div.compound .compound-middle {
+  margin-top: 0.5em }
+*/
+
+div.dedication {
+  margin: 2em 5em ;
+  text-align: center ;
+  font-style: italic }
+
+div.dedication p.topic-title {
+  font-weight: bold ;
+  font-style: normal }
+
+div.figure {
+  margin-left: 2em ;
+  margin-right: 2em }
+
+div.footer, div.header {
+  clear: both;
+  font-size: smaller }
+
+div.line-block {
+  display: block ;
+  margin-top: 1em ;
+  margin-bottom: 1em }
+
+div.line-block div.line-block {
+  margin-top: 0 ;
+  margin-bottom: 0 ;
+  margin-left: 1.5em }
+
+div.sidebar {
+  margin: 0 0 0.5em 1em ;
+  border: medium outset ;
+  padding: 1em ;
+  background-color: #ffffee ;
+  width: 40% ;
+  float: right ;
+  clear: right }
+
+div.sidebar p.rubric {
+  font-family: sans-serif ;
+  font-size: medium }
+
+div.system-messages {
+  margin: 5em }
+
+div.system-messages h1 {
+  color: red }
+
+div.system-message {
+  border: medium outset ;
+  padding: 1em }
+
+div.system-message p.system-message-title {
+  color: red ;
+  font-weight: bold }
+
+div.topic {
+  margin: 2em }
+
+h1.section-subtitle, h2.section-subtitle, h3.section-subtitle,
+h4.section-subtitle, h5.section-subtitle, h6.section-subtitle {
+  margin-top: 0.4em }
+
+h1.title {
+  text-align: center }
+
+h2.subtitle {
+  text-align: center }
+
+hr.docutils {
+  width: 75% }
+
+img.align-left, .figure.align-left, object.align-left, table.align-left {
+  clear: left ;
+  float: left ;
+  margin-right: 1em }
+
+img.align-right, .figure.align-right, object.align-right, table.align-right {
+  clear: right ;
+  float: right ;
+  margin-left: 1em }
+
+img.align-center, .figure.align-center, object.align-center {
+  display: block;
+  margin-left: auto;
+  margin-right: auto;
+}
+
+table.align-center {
+  margin-left: auto;
+  margin-right: auto;
+}
+
+.align-left {
+  text-align: left }
+
+.align-center {
+  clear: both ;
+  text-align: center }
+
+.align-right {
+  text-align: right }
+
+/* reset inner alignment in figures */
+div.align-right {
+  text-align: inherit }
+
+/* div.align-center * { */
+/*   text-align: left } */
+
+.align-top    {
+  vertical-align: top }
+
+.align-middle {
+  vertical-align: middle }
+
+.align-bottom {
+  vertical-align: bottom }
+
+ol.simple, ul.simple {
+  margin-bottom: 1em }
+
+ol.arabic {
+  list-style: decimal }
+
+ol.loweralpha {
+  list-style: lower-alpha }
+
+ol.upperalpha {
+  list-style: upper-alpha }
+
+ol.lowerroman {
+  list-style: lower-roman }
+
+ol.upperroman {
+  list-style: upper-roman }
+
+p.attribution {
+  text-align: right ;
+  margin-left: 50% }
+
+p.caption {
+  font-style: italic }
+
+p.credits {
+  font-style: italic ;
+  font-size: smaller }
+
+p.label {
+  white-space: nowrap }
+
+p.rubric {
+  font-weight: bold ;
+  font-size: larger ;
+  color: maroon ;
+  text-align: center }
+
+p.sidebar-title {
+  font-family: sans-serif ;
+  font-weight: bold ;
+  font-size: larger }
+
+p.sidebar-subtitle {
+  font-family: sans-serif ;
+  font-weight: bold }
+
+p.topic-title {
+  font-weight: bold }
+
+pre.address {
+  margin-bottom: 0 ;
+  margin-top: 0 ;
+  font: inherit }
+
+pre.literal-block, pre.doctest-block, pre.math, pre.code {
+  margin-left: 2em ;
+  margin-right: 2em }
+
+pre.code .ln { color: gray; } /* line numbers */
+pre.code, code { background-color: #eeeeee }
+pre.code .comment, code .comment { color: #5C6576 }
+pre.code .keyword, code .keyword { color: #3B0D06; font-weight: bold }
+pre.code .literal.string, code .literal.string { color: #0C5404 }
+pre.code .name.builtin, code .name.builtin { color: #352B84 }
+pre.code .deleted, code .deleted { background-color: #DEB0A1}
+pre.code .inserted, code .inserted { background-color: #A3D289}
+
+span.classifier {
+  font-family: sans-serif ;
+  font-style: oblique }
+
+span.classifier-delimiter {
+  font-family: sans-serif ;
+  font-weight: bold }
+
+span.interpreted {
+  font-family: sans-serif }
+
+span.option {
+  white-space: nowrap }
+
+span.pre {
+  white-space: pre }
+
+span.problematic, pre.problematic {
+  color: red }
+
+span.section-subtitle {
+  /* font-size relative to parent (h1..h6 element) */
+  font-size: 80% }
+
+table.citation {
+  border-left: solid 1px gray;
+  margin-left: 1px }
+
+table.docinfo {
+  margin: 2em 4em }
+
+table.docutils {
+  margin-top: 0.5em ;
+  margin-bottom: 0.5em }
+
+table.footnote {
+  border-left: solid 1px black;
+  margin-left: 1px }
+
+table.docutils td, table.docutils th,
+table.docinfo td, table.docinfo th {
+  padding-left: 0.5em ;
+  padding-right: 0.5em ;
+  vertical-align: top }
+
+table.docutils th.field-name, table.docinfo th.docinfo-name {
+  font-weight: bold ;
+  text-align: left ;
+  white-space: nowrap ;
+  padding-left: 0 }
+
+/* "booktabs" style (no vertical lines) */
+table.docutils.booktabs {
+  border: 0px;
+  border-top: 2px solid;
+  border-bottom: 2px solid;
+  border-collapse: collapse;
+}
+table.docutils.booktabs * {
+  border: 0px;
+}
+table.docutils.booktabs th {
+  border-bottom: thin solid;
+  text-align: left;
+}
+
+h1 tt.docutils, h2 tt.docutils, h3 tt.docutils,
+h4 tt.docutils, h5 tt.docutils, h6 tt.docutils {
+  font-size: 100% }
+
+ul.auto-toc {
+  list-style-type: none }
+
+</style>
+</head>
+<body>
+<div class="document" id="account-payment-order-generate-grouped-moves">
+<h1 class="title">Account Payment Order - Generate grouped moves</h1>
+
+<!-- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!! This file is generated by oca-gen-addon-readme !!
+!! changes will be overwritten.                   !!
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!! source digest: sha256:32fc00895b8be3fbc84d692959de94a404f5f82b21067c863caae346f97800b2
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
+<p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.png" /></a> <a class="reference external image-reference" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/OCA/bank-payment/tree/17.0/account_payment_order_grouped_output"><img alt="OCA/bank-payment" src="https://img.shields.io/badge/github-OCA%2Fbank--payment-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/bank-payment-17-0/bank-payment-17-0-account_payment_order_grouped_output"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external image-reference" href="https://runboat.odoo-community.org/builds?repo=OCA/bank-payment&amp;target_branch=17.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
+<p>This module adds an option to generate extra grouped moves for the
+payment orders since the refactoring done to use native Odoo payments.</p>
+<p>This serves for easing the reconciliation on bank statements of large
+payment orders, handling them as one or several journal entries
+according payment date.</p>
+<p><strong>Table of contents</strong></p>
+<div class="contents local topic" id="contents">
+<ul class="simple">
+<li><a class="reference internal" href="#bug-tracker" id="toc-entry-1">Bug Tracker</a></li>
+<li><a class="reference internal" href="#credits" id="toc-entry-2">Credits</a><ul>
+<li><a class="reference internal" href="#authors" id="toc-entry-3">Authors</a></li>
+<li><a class="reference internal" href="#maintainers" id="toc-entry-4">Maintainers</a></li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="section" id="bug-tracker">
+<h1><a class="toc-backref" href="#toc-entry-1">Bug Tracker</a></h1>
+<p>Bugs are tracked on <a class="reference external" href="https://github.com/OCA/bank-payment/issues">GitHub Issues</a>.
+In case of trouble, please check there if your issue has already been reported.
+If you spotted it first, help us to smash it by providing a detailed and welcomed
+<a class="reference external" href="https://github.com/OCA/bank-payment/issues/new?body=module:%20account_payment_order_grouped_output%0Aversion:%2017.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p>
+<p>Do not contact contributors directly about support or help with technical issues.</p>
+</div>
+<div class="section" id="credits">
+<h1><a class="toc-backref" href="#toc-entry-2">Credits</a></h1>
+<div class="section" id="authors">
+<h2><a class="toc-backref" href="#toc-entry-3">Authors</a></h2>
+<ul class="simple">
+<li>ACSONE SA/NV</li>
+<li>Therp BV</li>
+<li>Tecnativa</li>
+<li>Akretion</li>
+</ul>
+</div>
+<div class="section" id="maintainers">
+<h2><a class="toc-backref" href="#toc-entry-4">Maintainers</a></h2>
+<p>This module is maintained by the OCA.</p>
+<a class="reference external image-reference" href="https://odoo-community.org">
+<img alt="Odoo Community Association" src="https://odoo-community.org/logo.png" />
+</a>
+<p>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.</p>
+<p>This module is part of the <a class="reference external" href="https://github.com/OCA/bank-payment/tree/17.0/account_payment_order_grouped_output">OCA/bank-payment</a> project on GitHub.</p>
+<p>You are welcome to contribute. To learn how please visit <a class="reference external" href="https://odoo-community.org/page/Contribute">https://odoo-community.org/page/Contribute</a>.</p>
+</div>
+</div>
+</div>
+</body>
+</html>
diff --git a/account_payment_order_grouped_output/tests/__init__.py b/account_payment_order_grouped_output/tests/__init__.py
new file mode 100644
index 000000000..be1d0340d
--- /dev/null
+++ b/account_payment_order_grouped_output/tests/__init__.py
@@ -0,0 +1,2 @@
+from . import test_payment_order_inbound_grouped
+from . import test_payment_order_outbound_grouped
diff --git a/account_payment_order_grouped_output/tests/test_payment_order_inbound_grouped.py b/account_payment_order_grouped_output/tests/test_payment_order_inbound_grouped.py
new file mode 100644
index 000000000..30e6a04e8
--- /dev/null
+++ b/account_payment_order_grouped_output/tests/test_payment_order_inbound_grouped.py
@@ -0,0 +1,51 @@
+# Copyright 2022 Tecnativa - Pedro M. Baeza
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
+
+from freezegun import freeze_time
+
+from odoo import fields
+from odoo.tests.common import tagged
+
+from odoo.addons.account_payment_order.tests.test_payment_order_inbound import (
+    TestPaymentOrderInboundBase,
+)
+
+
+@tagged("post_install", "-at_install")
+class TestPaymentOrderInbound(TestPaymentOrderInboundBase):
+    @freeze_time("2024-04-01")
+    def test_grouped_output(self):
+        self.inbound_mode.generate_move = True
+        self.inbound_mode.post_move = True
+        self.inbound_order.date_prefered = "fixed"
+        self.inbound_order.date_scheduled = "2024-08-01"
+        self.inbound_order.draft2open()
+        self.inbound_order.open2generated()
+        self.inbound_order.generated2uploaded()
+        grouped_moves = self.inbound_order.grouped_move_ids
+        self.assertFalse(grouped_moves)
+        # Add now a second line with different partner
+        self.inbound_order.action_uploaded_cancel()
+        self.inbound_order.cancel2draft()
+        old_partner = self.partner
+        self.partner = self.env["res.partner"].create({"name": "Test Partner 2"})
+        invoice2 = self._create_customer_invoice()
+        self.partner = old_partner
+        invoice2.action_post()
+        self.env["account.invoice.payment.line.multi"].with_context(
+            active_model="account.move", active_ids=invoice2.ids
+        ).create({}).run()
+        self.inbound_order.draft2open()
+        self.inbound_order.open2generated()
+        self.inbound_order.generated2uploaded()
+        grouped_moves = self.inbound_order.grouped_move_ids
+        self.assertTrue(grouped_moves)
+        self.assertTrue(grouped_moves.line_ids[0].reconciled)
+        self.assertTrue(
+            all(
+                x.date_maturity == fields.Date.from_string("2024-08-01")
+                for x in grouped_moves.line_ids
+            )
+        )
+        self.inbound_order.action_uploaded_cancel()
+        self.assertFalse(len(self.inbound_order.grouped_move_ids) > 0)
diff --git a/account_payment_order_grouped_output/tests/test_payment_order_outbound_grouped.py b/account_payment_order_grouped_output/tests/test_payment_order_outbound_grouped.py
new file mode 100644
index 000000000..9bd91c8b1
--- /dev/null
+++ b/account_payment_order_grouped_output/tests/test_payment_order_outbound_grouped.py
@@ -0,0 +1,71 @@
+# Copyright 2022 Tecnativa - Pedro M. Baeza
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
+
+from datetime import date, timedelta
+
+from freezegun import freeze_time
+
+from odoo import fields
+from odoo.tests.common import tagged
+
+from odoo.addons.account_payment_order.tests.test_payment_order_outbound import (
+    TestPaymentOrderOutboundBase,
+)
+
+
+@tagged("post_install", "-at_install")
+class TestPaymentOrderOutbound(TestPaymentOrderOutboundBase):
+    @freeze_time("2024-04-01")
+    def test_grouped_supplier_output(self):
+        self.mode.generate_move = True
+        self.mode.post_move = True
+        self.order = self.env["account.payment.order"].create(
+            {
+                "date_prefered": "due",
+                "payment_type": "outbound",
+                "payment_mode_id": self.mode.id,
+                "journal_id": self.bank_journal.id,
+                "description": "order with manual line",
+            }
+        )
+        vals = {
+            "order_id": self.order.id,
+            "partner_id": self.partner.id,
+            "communication": "manual line and manual date",
+            "currency_id": self.order.payment_mode_id.company_id.currency_id.id,
+            "amount_currency": 192.38,
+            "date": date.today() + timedelta(days=8),
+        }
+        self.env["account.payment.line"].create(vals)
+        self.order.date_prefered = "fixed"
+        self.order.date_scheduled = "2024-08-01"
+        self.order.draft2open()
+        self.order.open2generated()
+        self.order.generated2uploaded()
+        grouped_moves = self.order.grouped_move_ids
+        self.assertFalse(grouped_moves)
+        # Add now a second line with different partner
+        self.order.action_uploaded_cancel()
+        self.order.cancel2draft()
+        old_partner = self.partner
+        self.partner = self.env["res.partner"].create({"name": "Test Partner 2"})
+        invoice2 = self._create_supplier_invoice("test")
+        self.partner = old_partner
+        invoice2.action_post()
+        self.env["account.invoice.payment.line.multi"].with_context(
+            active_model="account.move", active_ids=invoice2.ids
+        ).create({}).run()
+        self.order.draft2open()
+        self.order.open2generated()
+        self.order.generated2uploaded()
+        grouped_moves = self.order.grouped_move_ids
+        self.assertTrue(grouped_moves)
+        self.assertTrue(grouped_moves.line_ids[0].reconciled)
+        self.assertTrue(
+            all(
+                x.date_maturity == fields.Date.from_string("2024-08-01")
+                for x in grouped_moves.line_ids
+            )
+        )
+        self.order.action_uploaded_cancel()
+        self.assertFalse(len(self.order.grouped_move_ids) > 0)
diff --git a/account_payment_order_grouped_output/views/account_payment_mode_views.xml b/account_payment_order_grouped_output/views/account_payment_mode_views.xml
new file mode 100644
index 000000000..8c2fce505
--- /dev/null
+++ b/account_payment_order_grouped_output/views/account_payment_mode_views.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<odoo>
+    <record id="account_payment_mode_form" model="ir.ui.view">
+        <field name="model">account.payment.mode</field>
+        <field
+            name="inherit_id"
+            ref="account_payment_order.account_payment_mode_form"
+        />
+        <field name="arch" type="xml">
+            <group name="payment_order_create_defaults" position="after">
+                <group
+                    name="accounting-config"
+                    string="Grouped Accounting Entries Options"
+                    invisible="not payment_order_ok"
+                >
+                    <field name="generate_move" />
+                    <field name="post_move" invisible="not generate_move" />
+                </group>
+            </group>
+        </field>
+    </record>
+</odoo>
diff --git a/account_payment_order_grouped_output/views/account_payment_order_views.xml b/account_payment_order_grouped_output/views/account_payment_order_views.xml
new file mode 100644
index 000000000..a326fc1ed
--- /dev/null
+++ b/account_payment_order_grouped_output/views/account_payment_order_views.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<odoo>
+    <record id="account_payment_order_form" model="ir.ui.view">
+        <field name="model">account.payment.order</field>
+        <field
+            name="inherit_id"
+            ref="account_payment_order.account_payment_order_form"
+        />
+        <field name="arch" type="xml">
+            <div class="oe_button_box" position="inside">
+                <button
+                    class="oe_stat_button"
+                    name="action_grouped_moves"
+                    type="object"
+                    icon="fa-bars"
+                >
+                    <field
+                        string="Grouped Entries"
+                        name="grouped_move_count"
+                        widget="statinfo"
+                    />
+                </button>
+            </div>
+        </field>
+    </record>
+</odoo>