From 56f905d9984d808bd1786e89df632a493998cf17 Mon Sep 17 00:00:00 2001
From: Luc De Meyer <luc.demeyer@noviat.com>
Date: Thu, 29 Jun 2023 11:20:47 +0200
Subject: [PATCH] [MIG] account_payment_order_transfer_journal: Migration to
 16.0

---
 .../__manifest__.py                           |  9 ++++----
 .../models/__init__.py                        |  2 +-
 .../models/account_payment_line.py            | 14 +++++++++++++
 .../models/account_payment_order.py           | 15 -------------
 .../readme/CONTRIBUTORS.rst                   |  1 +
 .../views/account_journal.xml                 | 21 -------------------
 .../views/account_journal_views.xml           | 17 +++++++++++++++
 7 files changed, 38 insertions(+), 41 deletions(-)
 create mode 100644 account_payment_order_transfer_journal/models/account_payment_line.py
 delete mode 100644 account_payment_order_transfer_journal/models/account_payment_order.py
 delete mode 100644 account_payment_order_transfer_journal/views/account_journal.xml
 create mode 100644 account_payment_order_transfer_journal/views/account_journal_views.xml

diff --git a/account_payment_order_transfer_journal/__manifest__.py b/account_payment_order_transfer_journal/__manifest__.py
index ec4fc1a6e..e107d39d0 100644
--- a/account_payment_order_transfer_journal/__manifest__.py
+++ b/account_payment_order_transfer_journal/__manifest__.py
@@ -1,17 +1,18 @@
 # Copyright 2022 ACSONE SA/NV
+# Copyright 2023 Noviat
 # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
 
 {
     "name": "Account Payement Order Transfer Journal",
     "summary": """
-        Add the possibility to book payement order operations on a transfert journal.""",
-    "version": "14.0.1.0.0",
+        Add the possibility to book payment order operations on a transfert journal.""",
+    "version": "16.0.1.0.0",
     "license": "AGPL-3",
-    "author": "ACSONE SA/NV,Odoo Community Association (OCA)",
+    "author": "ACSONE SA/NV,Noviat,Odoo Community Association (OCA)",
     "website": "https://github.com/OCA/bank-payment",
     "depends": ["account_payment_order"],
     "data": [
-        "views/account_journal.xml",
+        "views/account_journal_views.xml",
     ],
     "demo": [],
 }
diff --git a/account_payment_order_transfer_journal/models/__init__.py b/account_payment_order_transfer_journal/models/__init__.py
index eb04dbf35..d1408893f 100644
--- a/account_payment_order_transfer_journal/models/__init__.py
+++ b/account_payment_order_transfer_journal/models/__init__.py
@@ -1,2 +1,2 @@
 from . import account_journal
-from . import account_payment_order
+from . import account_payment_line
diff --git a/account_payment_order_transfer_journal/models/account_payment_line.py b/account_payment_order_transfer_journal/models/account_payment_line.py
new file mode 100644
index 000000000..a26ceb68e
--- /dev/null
+++ b/account_payment_order_transfer_journal/models/account_payment_line.py
@@ -0,0 +1,14 @@
+# Copyright 2023 Noviat
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
+
+from odoo import models
+
+
+class AccountPaymentLine(models.Model):
+    _inherit = "account.payment.line"
+
+    def _prepare_account_payment_vals(self):
+        vals = super()._prepare_account_payment_vals()
+        if self.order_id.journal_id.transfer_journal_id:
+            vals["journal_id"] = self.order_id.journal_id.transfer_journal_id.id
+        return vals
diff --git a/account_payment_order_transfer_journal/models/account_payment_order.py b/account_payment_order_transfer_journal/models/account_payment_order.py
deleted file mode 100644
index 9a20cbac7..000000000
--- a/account_payment_order_transfer_journal/models/account_payment_order.py
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 2022 ACSONE SA/NV
-# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
-
-from odoo import models
-
-
-class AccountPaymentOrder(models.Model):
-
-    _inherit = "account.payment.order"
-
-    def _prepare_move(self, bank_lines=None):
-        res = super()._prepare_move(bank_lines=bank_lines)
-        if self.journal_id.transfer_journal_id:
-            res["journal_id"] = self.journal_id.transfer_journal_id.id
-        return res
diff --git a/account_payment_order_transfer_journal/readme/CONTRIBUTORS.rst b/account_payment_order_transfer_journal/readme/CONTRIBUTORS.rst
index 94a5ccf20..074a9b413 100644
--- a/account_payment_order_transfer_journal/readme/CONTRIBUTORS.rst
+++ b/account_payment_order_transfer_journal/readme/CONTRIBUTORS.rst
@@ -1 +1,2 @@
 * Adrien Peiffer <adrien.peiffer@acsone.eu> (https://acsone.eu)
+* Luc De Meyer <luc.demeyer@noviat.com> (https://noviat.com)
diff --git a/account_payment_order_transfer_journal/views/account_journal.xml b/account_payment_order_transfer_journal/views/account_journal.xml
deleted file mode 100644
index c23e15953..000000000
--- a/account_payment_order_transfer_journal/views/account_journal.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!-- Copyright 2022 ACSONE SA/NV
-     License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). -->
-<odoo>
-
-    <record model="ir.ui.view" id="account_journal_form_view">
-        <field
-            name="name"
-        >account.journal.form (in account_payment_order_transfer_journal)</field>
-        <field name="model">account.journal</field>
-        <field name="inherit_id" ref="account.view_account_journal_form" />
-        <field name="arch" type="xml">
-            <xpath expr="//page[@name='journal_entries']/group/group" position="before">
-                <group>
-                    <field name="transfer_journal_id" />
-                </group>
-            </xpath>
-        </field>
-    </record>
-
-</odoo>
diff --git a/account_payment_order_transfer_journal/views/account_journal_views.xml b/account_payment_order_transfer_journal/views/account_journal_views.xml
new file mode 100644
index 000000000..c7e5da023
--- /dev/null
+++ b/account_payment_order_transfer_journal/views/account_journal_views.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<odoo>
+
+    <record id="view_account_journal_form" model="ir.ui.view">
+        <field
+            name="name"
+        >account.journal.form (in account_payment_order_transfer_journal)</field>
+        <field name="model">account.journal</field>
+        <field name="inherit_id" ref="account.view_account_journal_form" />
+        <field name="arch" type="xml">
+            <field name="payment_sequence" position="after">
+                <field name="transfer_journal_id" />
+            </field>
+        </field>
+    </record>
+
+</odoo>