From c4b78c203a0f83490daefa5ad7e4cf4d0e17c321 Mon Sep 17 00:00:00 2001
From: "Antoine Vandevenne (anv)" <anv@odoo.com>
Date: Fri, 7 Oct 2022 10:23:27 +0000
Subject: [PATCH] [CLN] payment(_*): clean view hooks and split files per model

When the payment views were updated with commit odoo/odoo@f7b8f075, a
hook was improperly renamed to `code`, which doesn't help to figure out
its purpose. This commit renames it to `provider_credentials` which
better fits its role.

While doing so, the view files are also renamed and/or split by model to
increase their readability.

closes odoo/odoo#102976

X-original-commit: 49d126d4fce18761d0261adac00e115b840b9b47
Related: odoo/enterprise#32662
Signed-off-by: Antoine Vandevenne (anv) <anv@odoo.com>
---
 .../payment/views/payment_provider_views.xml  |  4 ++--
 addons/payment_adyen/__manifest__.py          |  3 ++-
 ...t_views.xml => payment_provider_views.xml} |  2 +-
 addons/payment_alipay/__manifest__.py         |  3 ++-
 ...t_views.xml => payment_provider_views.xml} |  2 +-
 addons/payment_aps/__manifest__.py            |  2 +-
 ...t_views.xml => payment_provider_views.xml} |  2 +-
 addons/payment_asiapay/__manifest__.py        |  2 +-
 ...t_views.xml => payment_provider_views.xml} |  2 +-
 addons/payment_authorize/__manifest__.py      |  4 +++-
 ...t_views.xml => payment_provider_views.xml} | 19 +++----------------
 .../views/payment_token_views.xml             | 17 +++++++++++++++++
 addons/payment_buckaroo/__manifest__.py       |  3 ++-
 ...t_views.xml => payment_provider_views.xml} |  2 +-
 addons/payment_custom/__manifest__.py         |  3 ++-
 ...t_views.xml => payment_provider_views.xml} |  0
 addons/payment_flutterwave/__manifest__.py    |  2 +-
 ...t_views.xml => payment_provider_views.xml} |  4 ++--
 addons/payment_mercado_pago/__manifest__.py   |  2 +-
 ...t_views.xml => payment_provider_views.xml} |  2 +-
 addons/payment_mollie/__manifest__.py         |  3 ++-
 ...t_views.xml => payment_provider_views.xml} |  3 ++-
 addons/payment_ogone/__manifest__.py          |  3 ++-
 ...t_views.xml => payment_provider_views.xml} |  2 +-
 addons/payment_paypal/__manifest__.py         |  4 +++-
 ...t_views.xml => payment_provider_views.xml} | 16 +---------------
 .../views/payment_transaction_views.xml       | 18 ++++++++++++++++++
 addons/payment_payulatam/__manifest__.py      |  3 ++-
 ...t_views.xml => payment_provider_views.xml} |  2 +-
 addons/payment_payumoney/__manifest__.py      |  3 ++-
 ...t_views.xml => payment_provider_views.xml} |  2 +-
 addons/payment_razorpay/__manifest__.py       |  2 +-
 ...t_views.xml => payment_provider_views.xml} |  2 +-
 addons/payment_sips/__manifest__.py           |  3 ++-
 ...t_views.xml => payment_provider_views.xml} |  2 +-
 addons/payment_stripe/__manifest__.py         |  3 ++-
 ...t_views.xml => payment_provider_views.xml} |  8 ++++----
 37 files changed, 91 insertions(+), 68 deletions(-)
 rename addons/payment_adyen/views/{payment_views.xml => payment_provider_views.xml} (96%)
 rename addons/payment_alipay/views/{payment_views.xml => payment_provider_views.xml} (95%)
 rename addons/payment_aps/views/{payment_views.xml => payment_provider_views.xml} (95%)
 rename addons/payment_asiapay/views/{payment_views.xml => payment_provider_views.xml} (95%)
 rename addons/payment_authorize/views/{payment_views.xml => payment_provider_views.xml} (73%)
 create mode 100644 addons/payment_authorize/views/payment_token_views.xml
 rename addons/payment_buckaroo/views/{payment_views.xml => payment_provider_views.xml} (92%)
 rename addons/payment_custom/views/{payment_views.xml => payment_provider_views.xml} (100%)
 rename addons/payment_flutterwave/views/{payment_views.xml => payment_provider_views.xml} (93%)
 rename addons/payment_mercado_pago/views/{payment_views.xml => payment_provider_views.xml} (92%)
 rename addons/payment_mollie/views/{payment_views.xml => payment_provider_views.xml} (90%)
 rename addons/payment_ogone/views/{payment_views.xml => payment_provider_views.xml} (96%)
 rename addons/payment_paypal/views/{payment_views.xml => payment_provider_views.xml} (68%)
 create mode 100644 addons/payment_paypal/views/payment_transaction_views.xml
 rename addons/payment_payulatam/views/{payment_views.xml => payment_provider_views.xml} (95%)
 rename addons/payment_payumoney/views/{payment_views.xml => payment_provider_views.xml} (94%)
 rename addons/payment_razorpay/views/{payment_views.xml => payment_provider_views.xml} (95%)
 rename addons/payment_sips/views/{payment_views.xml => payment_provider_views.xml} (95%)
 rename addons/payment_stripe/views/{payment_views.xml => payment_provider_views.xml} (95%)

diff --git a/addons/payment/views/payment_provider_views.xml b/addons/payment/views/payment_provider_views.xml
index 85d82f0001a..c8ad5de460e 100644
--- a/addons/payment/views/payment_provider_views.xml
+++ b/addons/payment/views/payment_provider_views.xml
@@ -70,8 +70,8 @@
                         </group>
                     </group>
                     <notebook attrs="{'invisible': ['&amp;', ('module_id', '!=', False), ('module_state', '!=', 'installed')]}">
-                        <page string="Credentials" name="provider_credentials" attrs="{'invisible': ['|', ('code', '=', 'none'), ('show_credentials_page', '=', False)]}">
-                            <group name="code"/>
+                        <page string="Credentials" name="credentials" attrs="{'invisible': ['|', ('code', '=', 'none'), ('show_credentials_page', '=', False)]}">
+                            <group name="provider_credentials"/>
                         </page>
                         <page string="Configuration" name="configuration">
                             <group name="provider_config">
diff --git a/addons/payment_adyen/__manifest__.py b/addons/payment_adyen/__manifest__.py
index a58ded12ac4..be8c4aad118 100644
--- a/addons/payment_adyen/__manifest__.py
+++ b/addons/payment_adyen/__manifest__.py
@@ -10,8 +10,9 @@
     'depends': ['payment'],
     'data': [
         'views/payment_adyen_templates.xml',
-        'views/payment_views.xml',
+        'views/payment_provider_views.xml',
         'views/payment_templates.xml',  # Only load the SDK on pages with a payment form.
+
         'data/payment_provider_data.xml',  # Depends on views/payment_adyen_templates.xml
     ],
     'application': True,
diff --git a/addons/payment_adyen/views/payment_views.xml b/addons/payment_adyen/views/payment_provider_views.xml
similarity index 96%
rename from addons/payment_adyen/views/payment_views.xml
rename to addons/payment_adyen/views/payment_provider_views.xml
index c7862f6edc4..ab55c411137 100644
--- a/addons/payment_adyen/views/payment_views.xml
+++ b/addons/payment_adyen/views/payment_provider_views.xml
@@ -6,7 +6,7 @@
         <field name="model">payment.provider</field>
         <field name="inherit_id" ref="payment.payment_provider_form"/>
         <field name="arch" type="xml">
-            <group name="code" position='inside'>
+            <group name="provider_credentials" position='inside'>
                 <group attrs="{'invisible': [('code', '!=', 'adyen')]}">
                     <field name="adyen_merchant_account" attrs="{'required':[('code', '=', 'adyen'), ('state', '!=', 'disabled')]}"/>
                     <field name="adyen_api_key" attrs="{'required':[('code', '=', 'adyen'), ('state', '!=', 'disabled')]}" password="True"/>
diff --git a/addons/payment_alipay/__manifest__.py b/addons/payment_alipay/__manifest__.py
index 656b12b3890..3ba48cb0020 100644
--- a/addons/payment_alipay/__manifest__.py
+++ b/addons/payment_alipay/__manifest__.py
@@ -9,7 +9,8 @@
     'depends': ['payment'],
     'data': [
         'views/payment_alipay_templates.xml',
-        'views/payment_views.xml',
+        'views/payment_provider_views.xml',
+
         'data/payment_provider_data.xml',
     ],
     'application': False,
diff --git a/addons/payment_alipay/views/payment_views.xml b/addons/payment_alipay/views/payment_provider_views.xml
similarity index 95%
rename from addons/payment_alipay/views/payment_views.xml
rename to addons/payment_alipay/views/payment_provider_views.xml
index 1431ae5e564..1c386a47f1b 100644
--- a/addons/payment_alipay/views/payment_views.xml
+++ b/addons/payment_alipay/views/payment_provider_views.xml
@@ -14,7 +14,7 @@
                     Consider disabling it and moving to <strong>Asiapay</strong>.
                 </div>
             </xpath>
-            <group name="code" position="inside">
+            <group name="provider_credentials" position="inside">
                 <group attrs="{'invisible': [('code', '!=', 'alipay')]}">
                     <field name="alipay_payment_method" widget="radio"/>
                     <field name="alipay_seller_email"
diff --git a/addons/payment_aps/__manifest__.py b/addons/payment_aps/__manifest__.py
index 356f3eb25e8..badf228759b 100644
--- a/addons/payment_aps/__manifest__.py
+++ b/addons/payment_aps/__manifest__.py
@@ -9,7 +9,7 @@
     'depends': ['payment'],
     'data': [
         'views/payment_aps_templates.xml',
-        'views/payment_views.xml',
+        'views/payment_provider_views.xml',
 
         'data/payment_provider_data.xml',
     ],
diff --git a/addons/payment_aps/views/payment_views.xml b/addons/payment_aps/views/payment_provider_views.xml
similarity index 95%
rename from addons/payment_aps/views/payment_views.xml
rename to addons/payment_aps/views/payment_provider_views.xml
index fcec6c12256..0e439e5f08d 100644
--- a/addons/payment_aps/views/payment_views.xml
+++ b/addons/payment_aps/views/payment_provider_views.xml
@@ -6,7 +6,7 @@
         <field name="model">payment.provider</field>
         <field name="inherit_id" ref="payment.payment_provider_form"/>
         <field name="arch" type="xml">
-            <group name="code" position='inside'>
+            <group name="provider_credentials" position='inside'>
                 <group attrs="{'invisible': [('code', '!=', 'aps')]}">
                     <field name="aps_merchant_identifier"
                            string="Merchant Identifier"
diff --git a/addons/payment_asiapay/__manifest__.py b/addons/payment_asiapay/__manifest__.py
index 7a8a3bb0643..7ec49449c0f 100644
--- a/addons/payment_asiapay/__manifest__.py
+++ b/addons/payment_asiapay/__manifest__.py
@@ -9,8 +9,8 @@
                "many different payment methods.",
     'depends': ['payment'],
     'data': [
-        'views/payment_views.xml',
         'views/payment_asiapay_templates.xml',
+        'views/payment_provider_views.xml',
 
         'data/payment_provider_data.xml',
     ],
diff --git a/addons/payment_asiapay/views/payment_views.xml b/addons/payment_asiapay/views/payment_provider_views.xml
similarity index 95%
rename from addons/payment_asiapay/views/payment_views.xml
rename to addons/payment_asiapay/views/payment_provider_views.xml
index bc56f075947..4606b82b2d1 100644
--- a/addons/payment_asiapay/views/payment_views.xml
+++ b/addons/payment_asiapay/views/payment_provider_views.xml
@@ -6,7 +6,7 @@
         <field name="model">payment.provider</field>
         <field name="inherit_id" ref="payment.payment_provider_form"/>
         <field name="arch" type="xml">
-            <group name="code" position='inside'>
+            <group name="provider_credentials" position='inside'>
                 <group attrs="{'invisible': [('code', '!=', 'asiapay')]}">
                     <field name="asiapay_merchant_id"
                            string="Merchant ID"
diff --git a/addons/payment_authorize/__manifest__.py b/addons/payment_authorize/__manifest__.py
index 86597191f10..b3e270913e5 100644
--- a/addons/payment_authorize/__manifest__.py
+++ b/addons/payment_authorize/__manifest__.py
@@ -9,8 +9,10 @@
     'description': """Authorize.Net Payment Provider""",
     'depends': ['payment'],
     'data': [
-        'views/payment_views.xml',
         'views/payment_authorize_templates.xml',
+        'views/payment_provider_views.xml',
+        'views/payment_token_views.xml',
+
         'data/payment_provider_data.xml',
     ],
     'application': True,
diff --git a/addons/payment_authorize/views/payment_views.xml b/addons/payment_authorize/views/payment_provider_views.xml
similarity index 73%
rename from addons/payment_authorize/views/payment_views.xml
rename to addons/payment_authorize/views/payment_provider_views.xml
index cc8a388bee7..15e7dbbbfe0 100644
--- a/addons/payment_authorize/views/payment_views.xml
+++ b/addons/payment_authorize/views/payment_provider_views.xml
@@ -6,7 +6,7 @@
         <field name="model">payment.provider</field>
         <field name="inherit_id" ref="payment.payment_provider_form"/>
         <field name="arch" type="xml">
-            <group name="code" position='inside'>
+            <group name="provider_credentials" position='inside'>
                 <group attrs="{'invisible': [('code', '!=', 'authorize')]}">
                     <field name="authorize_login" attrs="{'required':[('code', '=', 'authorize'), ('state', '!=', 'disabled')]}"/>
                     <field name="authorize_transaction_key" password="True" attrs="{'required':[ ('code', '=', 'authorize'), ('state', '!=', 'disabled')]}"/>
@@ -27,7 +27,7 @@
                 <field name="authorize_payment_method_type"
                        attrs="{'invisible': [('code', '!=', 'authorize')], 'required':[('code', '=', 'authorize'), ('state', '!=', 'disabled')]}"/>
             </field>
-            <xpath expr="//field[@name='available_country_ids']" position="after">
+            <field name="available_country_ids" position="after">
                 <label for="authorize_currency_id" string="Currency" attrs="{'invisible': [('code', '!=', 'authorize')]}"/>
                 <div attrs="{'invisible': [('code', '!=', 'authorize')]}">
                     <field name="authorize_currency_id"/>
@@ -35,20 +35,7 @@
                             name="action_update_merchant_details"
                             string="Set Account Currency"/>
                 </div>
-            </xpath>
-        </field>
-    </record>
-
-    <record id="payment_token_form" model="ir.ui.view">
-        <field name='name'>Authorize.Net Token Form</field>
-        <field name='model'>payment.token</field>
-        <field name="inherit_id" ref="payment.payment_token_form"/>
-        <field name="arch" type="xml">
-            <xpath expr='//field[@name="provider_ref"]' position='after'>
-                <field name="provider_code" invisible="1"/>
-                <field name="authorize_profile" attrs="{'invisible':[('provider_code', '!=', 'authorize')]}"/>
-                <field name="authorize_payment_method_type" attrs="{'invisible': [('provider_code', '!=', 'authorize')]}"/>
-            </xpath>
+            </field>
         </field>
     </record>
 
diff --git a/addons/payment_authorize/views/payment_token_views.xml b/addons/payment_authorize/views/payment_token_views.xml
new file mode 100644
index 00000000000..883e6082c93
--- /dev/null
+++ b/addons/payment_authorize/views/payment_token_views.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+    <record id="payment_token_form" model="ir.ui.view">
+        <field name="name">Authorize.Net Token Form</field>
+        <field name="model">payment.token</field>
+        <field name="inherit_id" ref="payment.payment_token_form"/>
+        <field name="arch" type="xml">
+            <field name="provider_ref" position="after">
+                <field name="provider_code" invisible="1"/>
+                <field name="authorize_profile" attrs="{'invisible':[('provider_code', '!=', 'authorize')]}"/>
+                <field name="authorize_payment_method_type" attrs="{'invisible': [('provider_code', '!=', 'authorize')]}"/>
+            </field>
+        </field>
+    </record>
+
+</odoo>
diff --git a/addons/payment_buckaroo/__manifest__.py b/addons/payment_buckaroo/__manifest__.py
index 6a3210a81c2..cec9bdba0bb 100644
--- a/addons/payment_buckaroo/__manifest__.py
+++ b/addons/payment_buckaroo/__manifest__.py
@@ -9,8 +9,9 @@
     'description': """Buckaroo Payment Provider""",
     'depends': ['payment'],
     'data': [
-        'views/payment_views.xml',
         'views/payment_buckaroo_templates.xml',
+        'views/payment_provider_views.xml',
+
         'data/payment_provider_data.xml',
     ],
     'application': True,
diff --git a/addons/payment_buckaroo/views/payment_views.xml b/addons/payment_buckaroo/views/payment_provider_views.xml
similarity index 92%
rename from addons/payment_buckaroo/views/payment_views.xml
rename to addons/payment_buckaroo/views/payment_provider_views.xml
index 8cdb03de95c..c853341f3cd 100644
--- a/addons/payment_buckaroo/views/payment_views.xml
+++ b/addons/payment_buckaroo/views/payment_provider_views.xml
@@ -6,7 +6,7 @@
         <field name="model">payment.provider</field>
         <field name="inherit_id" ref="payment.payment_provider_form"/>
         <field name="arch" type="xml">
-            <group name="code" position='inside'>
+            <group name="provider_credentials" position='inside'>
                 <group attrs="{'invisible': [('code', '!=', 'buckaroo')]}">
                     <field name="buckaroo_website_key" attrs="{'required':[ ('code', '=', 'buckaroo'), ('state', '!=', 'disabled')]}"/>
                     <field name="buckaroo_secret_key" string="Secret Key" attrs="{'required':[ ('code', '=', 'buckaroo'), ('state', '!=', 'disabled')]}" password="True"/>
diff --git a/addons/payment_custom/__manifest__.py b/addons/payment_custom/__manifest__.py
index 03e5cf6a13c..049fb3ea9d2 100644
--- a/addons/payment_custom/__manifest__.py
+++ b/addons/payment_custom/__manifest__.py
@@ -8,7 +8,8 @@
     'depends': ['payment'],
     'data': [
         'views/payment_custom_templates.xml',
-        'views/payment_views.xml',
+        'views/payment_provider_views.xml',
+
         'data/payment_provider_data.xml',
     ],
     'assets': {
diff --git a/addons/payment_custom/views/payment_views.xml b/addons/payment_custom/views/payment_provider_views.xml
similarity index 100%
rename from addons/payment_custom/views/payment_views.xml
rename to addons/payment_custom/views/payment_provider_views.xml
diff --git a/addons/payment_flutterwave/__manifest__.py b/addons/payment_flutterwave/__manifest__.py
index 1a36f76000f..15eebfb4260 100644
--- a/addons/payment_flutterwave/__manifest__.py
+++ b/addons/payment_flutterwave/__manifest__.py
@@ -9,8 +9,8 @@
                "methods.",
     'depends': ['payment'],
     'data': [
-        'views/payment_views.xml',
         'views/payment_flutterwave_templates.xml',
+        'views/payment_provider_views.xml',
 
         'data/payment_provider_data.xml',
     ],
diff --git a/addons/payment_flutterwave/views/payment_views.xml b/addons/payment_flutterwave/views/payment_provider_views.xml
similarity index 93%
rename from addons/payment_flutterwave/views/payment_views.xml
rename to addons/payment_flutterwave/views/payment_provider_views.xml
index a8e84f8ad9a..3678427eee7 100644
--- a/addons/payment_flutterwave/views/payment_views.xml
+++ b/addons/payment_flutterwave/views/payment_provider_views.xml
@@ -6,7 +6,7 @@
         <field name="model">payment.provider</field>
         <field name="inherit_id" ref="payment.payment_provider_form"/>
         <field name="arch" type="xml">
-            <xpath expr="//group[@name='code']" position="inside">
+            <group name="provider_credentials" position="inside">
                 <group attrs="{'invisible': [('code', '!=', 'flutterwave')]}"
                        name="flutterwave_credentials">
                     <field name="flutterwave_public_key"
@@ -21,7 +21,7 @@
                            attrs="{'required':[('code', '=', 'flutterwave'), ('state', '!=', 'disabled')]}"
                            password="True"/>
                 </group>
-            </xpath>
+            </group>
         </field>
     </record>
 
diff --git a/addons/payment_mercado_pago/__manifest__.py b/addons/payment_mercado_pago/__manifest__.py
index bea24b7683a..65ba92fb684 100644
--- a/addons/payment_mercado_pago/__manifest__.py
+++ b/addons/payment_mercado_pago/__manifest__.py
@@ -10,7 +10,7 @@
     'depends': ['payment'],
     'data': [
         'views/payment_mercado_pago_templates.xml',
-        'views/payment_views.xml',
+        'views/payment_provider_views.xml',
 
         'data/payment_provider_data.xml',  # Depends on views/payment_mercado_pago_templates.xml
     ],
diff --git a/addons/payment_mercado_pago/views/payment_views.xml b/addons/payment_mercado_pago/views/payment_provider_views.xml
similarity index 92%
rename from addons/payment_mercado_pago/views/payment_views.xml
rename to addons/payment_mercado_pago/views/payment_provider_views.xml
index db938414ded..4fcb2c45d1e 100644
--- a/addons/payment_mercado_pago/views/payment_views.xml
+++ b/addons/payment_mercado_pago/views/payment_provider_views.xml
@@ -6,7 +6,7 @@
         <field name="model">payment.provider</field>
         <field name="inherit_id" ref="payment.payment_provider_form"/>
         <field name="arch" type="xml">
-            <group name="code" position="inside">
+            <group name="provider_credentials" position="inside">
                 <group attrs="{'invisible': [('code', '!=', 'mercado_pago')]}">
                     <field name="mercado_pago_access_token"
                            string="Access Token"
diff --git a/addons/payment_mollie/__manifest__.py b/addons/payment_mollie/__manifest__.py
index 25e001e767f..63cd755155a 100755
--- a/addons/payment_mollie/__manifest__.py
+++ b/addons/payment_mollie/__manifest__.py
@@ -13,7 +13,8 @@
     'depends': ['payment'],
     'data': [
         'views/payment_mollie_templates.xml',
-        'views/payment_views.xml',
+        'views/payment_provider_views.xml',
+
         'data/payment_provider_data.xml',
     ],
     'application': True,
diff --git a/addons/payment_mollie/views/payment_views.xml b/addons/payment_mollie/views/payment_provider_views.xml
similarity index 90%
rename from addons/payment_mollie/views/payment_views.xml
rename to addons/payment_mollie/views/payment_provider_views.xml
index 78fa3940816..f7c93034f75 100755
--- a/addons/payment_mollie/views/payment_views.xml
+++ b/addons/payment_mollie/views/payment_provider_views.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
+
     <record id="payment_provider_form" model="ir.ui.view">
         <field name="name">Mollie Provider Form</field>
         <field name="model">payment.provider</field>
         <field name="inherit_id" ref="payment.payment_provider_form"/>
         <field name="arch" type="xml">
-            <group name="code" position='inside'>
+            <group name="provider_credentials" position="inside">
                 <group attrs="{'invisible': [('code', '!=', 'mollie')]}">
                     <field name="mollie_api_key" string="API Key" attrs="{'required': [('code', '=', 'mollie'), ('state', '!=', 'disabled')]}" password="True"/>
                 </group>
diff --git a/addons/payment_ogone/__manifest__.py b/addons/payment_ogone/__manifest__.py
index 3f1f616e36f..9df4745140c 100644
--- a/addons/payment_ogone/__manifest__.py
+++ b/addons/payment_ogone/__manifest__.py
@@ -8,8 +8,9 @@
     'summary': "This module is deprecated.",
     'depends': ['payment'],
     'data': [
-        'views/payment_views.xml',
         'views/payment_ogone_templates.xml',
+        'views/payment_provider_views.xml',
+
         'data/payment_provider_data.xml',
     ],
     'application': False,
diff --git a/addons/payment_ogone/views/payment_views.xml b/addons/payment_ogone/views/payment_provider_views.xml
similarity index 96%
rename from addons/payment_ogone/views/payment_views.xml
rename to addons/payment_ogone/views/payment_provider_views.xml
index 673906268d8..a85182a2d33 100644
--- a/addons/payment_ogone/views/payment_views.xml
+++ b/addons/payment_ogone/views/payment_provider_views.xml
@@ -14,7 +14,7 @@
                     Consider disabling it and moving to <strong>Stripe</strong>.
                 </div>
             </xpath>
-            <group name="code" position="inside">
+            <group name="provider_credentials" position="inside">
                 <group attrs="{'invisible': [('code', '!=', 'ogone')]}">
                     <field name="ogone_pspid" attrs="{'required':[('code', '=', 'ogone'), ('state', '!=', 'disabled')]}"/>
                     <field name="ogone_userid" attrs="{'required':[('code', '=', 'ogone'), ('state', '!=', 'disabled')]}"/>
diff --git a/addons/payment_paypal/__manifest__.py b/addons/payment_paypal/__manifest__.py
index 799d29402b0..6522db3a9c2 100644
--- a/addons/payment_paypal/__manifest__.py
+++ b/addons/payment_paypal/__manifest__.py
@@ -9,8 +9,10 @@
     'description': """Paypal Payment Provider""",
     'depends': ['payment'],
     'data': [
-        'views/payment_views.xml',
         'views/payment_paypal_templates.xml',
+        'views/payment_provider_views.xml',
+        'views/payment_transaction_views.xml',
+
         'data/payment_provider_data.xml',
         'data/payment_paypal_email_data.xml',
     ],
diff --git a/addons/payment_paypal/views/payment_views.xml b/addons/payment_paypal/views/payment_provider_views.xml
similarity index 68%
rename from addons/payment_paypal/views/payment_views.xml
rename to addons/payment_paypal/views/payment_provider_views.xml
index 7e108041a13..1143d32d026 100644
--- a/addons/payment_paypal/views/payment_views.xml
+++ b/addons/payment_paypal/views/payment_provider_views.xml
@@ -6,7 +6,7 @@
         <field name="model">payment.provider</field>
         <field name="inherit_id" ref="payment.payment_provider_form"/>
         <field name="arch" type="xml">
-            <group name="code" position='inside'>
+            <group name="provider_credentials" position='inside'>
                 <group attrs="{'invisible': [('code', '!=', 'paypal')]}">
                     <field name="paypal_email_account"
                            attrs="{'required':[('code', '=', 'paypal'), ('state', '!=', 'disabled')]}"/>
@@ -27,18 +27,4 @@
         </field>
     </record>
 
-    <record id="payment_transaction_form" model="ir.ui.view">
-        <field name="name">PayPal Transaction Form</field>
-        <field name="model">payment.transaction</field>
-        <field name="inherit_id" ref="payment.payment_transaction_form"/>
-        <field name="arch" type="xml">
-            <xpath expr="//field[@name='provider_reference']" position="after">
-                <field name="paypal_type"
-                       readonly="1"
-                       attrs="{'invisible': [('provider_code', '!=', 'paypal')]}"
-                       groups="base.group_no_one"/>
-            </xpath>
-        </field>
-    </record>
-
 </odoo>
diff --git a/addons/payment_paypal/views/payment_transaction_views.xml b/addons/payment_paypal/views/payment_transaction_views.xml
new file mode 100644
index 00000000000..fafc7c503e4
--- /dev/null
+++ b/addons/payment_paypal/views/payment_transaction_views.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+    <record id="payment_transaction_form" model="ir.ui.view">
+        <field name="name">PayPal Transaction Form</field>
+        <field name="model">payment.transaction</field>
+        <field name="inherit_id" ref="payment.payment_transaction_form"/>
+        <field name="arch" type="xml">
+            <field name="provider_reference" position="after">
+                <field name="paypal_type"
+                       readonly="1"
+                       attrs="{'invisible': [('provider_code', '!=', 'paypal')]}"
+                       groups="base.group_no_one"/>
+            </field>
+        </field>
+    </record>
+
+</odoo>
diff --git a/addons/payment_payulatam/__manifest__.py b/addons/payment_payulatam/__manifest__.py
index d9c3af4ce71..1ec7dcc8b03 100644
--- a/addons/payment_payulatam/__manifest__.py
+++ b/addons/payment_payulatam/__manifest__.py
@@ -8,8 +8,9 @@
     'summary': "This module is deprecated.",
     'depends': ['payment'],
     'data': [
-        'views/payment_views.xml',
         'views/payment_payulatam_templates.xml',
+        'views/payment_provider_views.xml',
+
         'data/payment_provider_data.xml',
     ],
     'application': False,
diff --git a/addons/payment_payulatam/views/payment_views.xml b/addons/payment_payulatam/views/payment_provider_views.xml
similarity index 95%
rename from addons/payment_payulatam/views/payment_views.xml
rename to addons/payment_payulatam/views/payment_provider_views.xml
index 1e4fe69a752..18f38a8f922 100644
--- a/addons/payment_payulatam/views/payment_views.xml
+++ b/addons/payment_payulatam/views/payment_provider_views.xml
@@ -14,7 +14,7 @@
                     Consider disabling it and moving to <strong>Mercado Pago</strong>.
                 </div>
             </xpath>
-            <group name="code" position="inside">
+            <group name="provider_credentials" position="inside">
                 <group attrs="{'invisible': [('code', '!=', 'payulatam')]}">
                     <field name="payulatam_merchant_id"
                            attrs="{'required':[('code', '=', 'payulatam'), ('state', '!=', 'disabled')]}"/>
diff --git a/addons/payment_payumoney/__manifest__.py b/addons/payment_payumoney/__manifest__.py
index d475f143dc3..a1154d5d90e 100644
--- a/addons/payment_payumoney/__manifest__.py
+++ b/addons/payment_payumoney/__manifest__.py
@@ -8,8 +8,9 @@
     'summary': "This module is deprecated.",
     'depends': ['payment'],
     'data': [
-        'views/payment_views.xml',
         'views/payment_payumoney_templates.xml',
+        'views/payment_provider_views.xml',
+
         'data/payment_provider_data.xml',
     ],
     'application': False,
diff --git a/addons/payment_payumoney/views/payment_views.xml b/addons/payment_payumoney/views/payment_provider_views.xml
similarity index 94%
rename from addons/payment_payumoney/views/payment_views.xml
rename to addons/payment_payumoney/views/payment_provider_views.xml
index 503cf5b5dd7..21a8636ea9b 100644
--- a/addons/payment_payumoney/views/payment_views.xml
+++ b/addons/payment_payumoney/views/payment_provider_views.xml
@@ -14,7 +14,7 @@
                     Consider disabling it and moving to <strong>Razorpay</strong>.
                 </div>
             </xpath>
-            <group name="code" position="inside">
+            <group name="provider_credentials" position="inside">
                 <group attrs="{'invisible': [('code', '!=', 'payumoney')]}">
                     <field name="payumoney_merchant_key" attrs="{'required':[ ('code', '=', 'payumoney'), ('state', '!=', 'disabled')]}"/>
                     <field name="payumoney_merchant_salt" attrs="{'required':[ ('code', '=', 'payumoney'), ('state', '!=', 'disabled')]}" password="True"/>
diff --git a/addons/payment_razorpay/__manifest__.py b/addons/payment_razorpay/__manifest__.py
index 685a16b7bf6..c6fa81ac529 100644
--- a/addons/payment_razorpay/__manifest__.py
+++ b/addons/payment_razorpay/__manifest__.py
@@ -8,7 +8,7 @@
     'summary': "A Indian online payment provider covering 100+ payment methods.",
     'depends': ['payment'],
     'data': [
-        'views/payment_views.xml',
+        'views/payment_provider_views.xml',
         'views/payment_razorpay_templates.xml',
 
         'data/payment_provider_data.xml',  # Depends on views/payment_razorpay_templates.xml
diff --git a/addons/payment_razorpay/views/payment_views.xml b/addons/payment_razorpay/views/payment_provider_views.xml
similarity index 95%
rename from addons/payment_razorpay/views/payment_views.xml
rename to addons/payment_razorpay/views/payment_provider_views.xml
index 94946bb6b06..4a4d040bdb9 100644
--- a/addons/payment_razorpay/views/payment_views.xml
+++ b/addons/payment_razorpay/views/payment_provider_views.xml
@@ -6,7 +6,7 @@
         <field name="model">payment.provider</field>
         <field name="inherit_id" ref="payment.payment_provider_form"/>
         <field name="arch" type="xml">
-            <group name="code" position='inside'>
+            <group name="provider_credentials" position='inside'>
                 <group name="razorpay_credentials"
                        attrs="{'invisible': [('code', '!=', 'razorpay')]}">
                     <field name="razorpay_key_id"
diff --git a/addons/payment_sips/__manifest__.py b/addons/payment_sips/__manifest__.py
index 107bed71155..5a664a3bf9c 100644
--- a/addons/payment_sips/__manifest__.py
+++ b/addons/payment_sips/__manifest__.py
@@ -14,8 +14,9 @@ Other SIPS providers may be compatible, though this is
 not guaranteed.""",
     'depends': ['payment'],
     'data': [
-        'views/payment_views.xml',
+        'views/payment_provider_views.xml',
         'views/payment_sips_templates.xml',
+
         'data/payment_provider_data.xml',
     ],
     'application': True,
diff --git a/addons/payment_sips/views/payment_views.xml b/addons/payment_sips/views/payment_provider_views.xml
similarity index 95%
rename from addons/payment_sips/views/payment_views.xml
rename to addons/payment_sips/views/payment_provider_views.xml
index c46e99494d3..bce8e39b240 100644
--- a/addons/payment_sips/views/payment_views.xml
+++ b/addons/payment_sips/views/payment_provider_views.xml
@@ -6,7 +6,7 @@
         <field name="model">payment.provider</field>
         <field name="inherit_id" ref="payment.payment_provider_form"/>
         <field name="arch" type="xml">
-            <group name="code" position='inside'>
+            <group name="provider_credentials" position='inside'>
                 <group attrs="{'invisible': [('code', '!=', 'sips')]}">
                     <field name="sips_merchant_id" attrs="{'required':[ ('code', '=', 'sips'), ('state', '!=', 'disabled')]}"/>
                     <field name="sips_secret" string="Secret Key" attrs="{'required':[ ('code', '=', 'sips'), ('state', '!=', 'disabled')]}" password="True"/>
diff --git a/addons/payment_stripe/__manifest__.py b/addons/payment_stripe/__manifest__.py
index 7abbaab7a28..d9739cd4609 100644
--- a/addons/payment_stripe/__manifest__.py
+++ b/addons/payment_stripe/__manifest__.py
@@ -9,9 +9,10 @@
     'description': """Stripe Payment Provider""",
     'depends': ['payment'],
     'data': [
+        'views/payment_provider_views.xml',
         'views/payment_stripe_templates.xml',
         'views/payment_templates.xml',  # Only load the SDK on pages with a payment form.
-        'views/payment_views.xml',
+
         'data/payment_provider_data.xml',  # Depends on views/payment_stripe_templates.xml
     ],
     'application': True,
diff --git a/addons/payment_stripe/views/payment_views.xml b/addons/payment_stripe/views/payment_provider_views.xml
similarity index 95%
rename from addons/payment_stripe/views/payment_views.xml
rename to addons/payment_stripe/views/payment_provider_views.xml
index 49986802951..233c0246d91 100644
--- a/addons/payment_stripe/views/payment_views.xml
+++ b/addons/payment_stripe/views/payment_provider_views.xml
@@ -6,7 +6,7 @@
         <field name="model">payment.provider</field>
         <field name="inherit_id" ref="payment.payment_provider_form"/>
         <field name="arch" type="xml">
-            <xpath expr="//group[@name='code']" position="before">
+            <group name="provider_credentials" position="before">
                 <div invisible="context.get('stripe_onboarding', False)"
                      name="stripe_onboarding_group"
                      attrs="{'invisible': ['|', '|', ('code', '!=', 'stripe'), ('stripe_secret_key', '!=', False), ('stripe_publishable_key', '!=', False)]}">
@@ -17,8 +17,8 @@
                             colspan="2"
                             attrs="{'invisible': [('state', '=', 'enabled')]}"/>
                 </div>
-            </xpath>
-            <xpath expr="//group[@name='code']" position="inside">
+            </group>
+            <group name="provider_credentials" position="inside">
                 <group attrs="{'invisible': [('code', '!=', 'stripe')]}" name="stripe_credentials">
                     <field name="stripe_publishable_key" attrs="{'required':[('code', '=', 'stripe'), ('state', '!=', 'disabled')]}"/>
                     <field name="stripe_secret_key" attrs="{'required':[('code', '=', 'stripe'), ('state', '!=', 'disabled')]}" password="True"/>
@@ -39,7 +39,7 @@
                         Get your Secret and Publishable keys
                     </a>
                 </div>
-            </xpath>
+            </group>
             <field name="allow_express_checkout" position="replace">
                 <label for="allow_express_checkout" attrs="{'invisible': ['|', ('support_express_checkout', '=', False), ('show_allow_express_checkout', '=', False)]}"/>
                 <div class="o_row" col="2" attrs="{'invisible': ['|', ('support_express_checkout', '=', False), ('show_allow_express_checkout', '=', False)]}">