diff --git a/docsource/modules150-160.rst b/docsource/modules150-160.rst
index 20d035409bb0..87363625255b 100644
--- a/docsource/modules150-160.rst
+++ b/docsource/modules150-160.rst
@@ -538,7 +538,7 @@ Module coverage 15.0 -> 16.0
 +-------------------------------------------------+----------------------+-------------------------------------------------+
 | partner_autocomplete                            |                      |No DB layout changes.                            |
 +-------------------------------------------------+----------------------+-------------------------------------------------+
-| payment                                         |                      |                                                 |
+| payment                                         | Done                 |                                                 |
 +-------------------------------------------------+----------------------+-------------------------------------------------+
 | payment_adyen                                   |                      |                                                 |
 +-------------------------------------------------+----------------------+-------------------------------------------------+
diff --git a/openupgrade_scripts/scripts/payment/16.0.2.0/noupdate_changes.xml b/openupgrade_scripts/scripts/payment/16.0.2.0/noupdate_changes.xml
index be95e82f2768..6fb595bd083a 100644
--- a/openupgrade_scripts/scripts/payment/16.0.2.0/noupdate_changes.xml
+++ b/openupgrade_scripts/scripts/payment/16.0.2.0/noupdate_changes.xml
@@ -3,4 +3,253 @@
   <record id="payment_transaction_user_rule" model="ir.rule">
     <field name="groups" eval="[(4, ref('base.group_user')), (4, ref('base.group_portal'))]"/>
   </record>
+
+  <!-- payment_provider form 16.0 -->
+  <record id="payment_provider_adyen" model="payment.provider">
+    <field name="name">Adyen</field>
+    <field name="display_as">Credit Card (powered by Adyen)</field>
+    <field name="image_128" type="base64" file="payment_adyen/static/description/icon.png"/>
+    <field name="module_id" ref="base.module_payment_adyen"/>
+    <!-- https://www.adyen.com/payment-methods -->
+    <field name="payment_icon_ids"
+        eval="[(6, 0, [
+        ref('payment.payment_icon_cc_bancontact'),
+        ref('payment.payment_icon_cc_maestro'),
+        ref('payment.payment_icon_cc_mastercard'),
+        ref('payment.payment_icon_cc_visa'),
+        ref('payment.payment_icon_cc_discover'),
+        ref('payment.payment_icon_cc_diners_club_intl'),
+        ref('payment.payment_icon_cc_jcb'),
+        ref('payment.payment_icon_cc_unionpay'),
+        ])]"/>
+  </record>
+
+  <record id="payment_provider_aps" model="payment.provider">
+    <field name="name">Amazon Payment Services</field>
+    <field name="display_as">Amazon Payment Services</field>
+    <field name="image_128" type="base64" file="payment_aps/static/description/icon.png"/>
+    <field name="module_id" ref="base.module_payment_aps"/>
+    <!-- https://paymentservices.amazon.com/docs/EN/24.html -->
+    <field name="payment_icon_ids"
+        eval="[(6, 0, [
+        ref('payment.payment_icon_cc_mastercard'),
+        ref('payment.payment_icon_cc_visa'),
+        ref('payment.payment_icon_sadad'),
+        ref('payment.payment_icon_mada'),
+        ])]"/>
+  </record>
+
+  <record id="payment_provider_asiapay" model="payment.provider">
+    <field name="name">Asiapay</field>
+    <field name="display_as">Credit Card (powered by Asiapay)</field>
+    <field name="image_128" type="base64" file="payment_asiapay/static/description/icon.png"/>
+    <field name="module_id" ref="base.module_payment_asiapay"/>
+    <!-- See https://www.asiapay.com/payment.html#option -->
+    <field name="payment_icon_ids"
+        eval="[(6, 0, [
+        ref('payment.payment_icon_cc_mastercard'),
+        ref('payment.payment_icon_cc_visa'),
+        ref('payment.payment_icon_cc_unionpay'),
+        ])]"/>
+  </record>
+
+  <record id="payment_provider_authorize" model="payment.provider">
+    <field name="name">Authorize.net</field>
+    <field name="display_as">Credit Card (powered by Authorize)</field>
+    <field name="image_128"
+        type="base64"
+        file="payment_authorize/static/description/icon.png"/>
+    <field name="module_id" ref="base.module_payment_authorize"/>
+    <!-- https://www.authorize.net/solutions/merchantsolutions/onlinemerchantaccount/ -->
+    <field name="payment_icon_ids"
+        eval="[(6, 0, [
+        ref('payment.payment_icon_cc_maestro'),
+        ref('payment.payment_icon_cc_mastercard'),
+        ref('payment.payment_icon_cc_discover'),
+        ref('payment.payment_icon_cc_diners_club_intl'),
+        ref('payment.payment_icon_cc_jcb'),
+        ref('payment.payment_icon_cc_visa'),
+        ])]"/>
+  </record>
+
+  <record id="payment_provider_buckaroo" model="payment.provider">
+    <field name="name">Buckaroo</field>
+    <field name="display_as">Credit Card (powered by Buckaroo)</field>
+    <field name="image_128"
+        type="base64"
+        file="payment_buckaroo/static/description/icon.png"/>
+    <field name="module_id" ref="base.module_payment_buckaroo"/>
+    <!-- https://www.buckaroo-payments.com/products/payment-methods/ -->
+    <field name="payment_icon_ids"
+        eval="[(6, 0, [
+        ref('payment.payment_icon_cc_bancontact'),
+        ref('payment.payment_icon_cc_maestro'),
+        ref('payment.payment_icon_cc_mastercard'),
+        ref('payment.payment_icon_cc_visa'),
+        ref('payment.payment_icon_cc_american_express'),
+        ])]"/>
+  </record>
+
+  <record id="payment_provider_demo" model="payment.provider">
+    <field name="name">Demo</field>
+    <field name="sequence">40</field>
+    <field name="image_128" type="base64" file="payment_demo/static/description/icon.png"/>
+    <field name="module_id" ref="base.module_payment_demo"/>
+  </record>
+
+  <record id="payment_provider_flutterwave" model="payment.provider">
+    <field name="name">Flutterwave</field>
+    <field name="image_128"
+        type="base64"
+        file="payment_flutterwave/static/description/icon.png"/>
+    <field name="module_id" ref="base.module_payment_flutterwave"/>
+    <!-- https://developer.flutterwave.com/docs/collecting-payments/payment-methods/ -->
+    <field name="payment_icon_ids" eval="[(6, 0, [
+        ref('payment.payment_icon_cc_visa'),
+        ref('payment.payment_icon_cc_mastercard'),
+        ref('payment.payment_icon_cc_american_express'),
+        ref('payment.payment_icon_mpesa'),
+        ref('payment.payment_icon_airtel_money'),
+        ref('payment.payment_icon_mtn_mobile_money'),
+        ref('payment.payment_icon_barter_by_flutterwave'),
+        ])]"/>
+  </record>
+
+  <record id="payment_provider_mercado_pago" model="payment.provider">
+    <field name="name">Mercado Pago</field>
+    <field name="display_as">Credit Card (powered by Mercado Pago)</field>
+    <field name="image_128"
+        type="base64"
+        file="payment_mercado_pago/static/description/icon.png"/>
+    <field name="module_id" ref="base.module_payment_mercado_pago"/>
+
+    <!-- Payment methods must be fetched from the API. See
+        https://www.mercadopago.com.ar/developers/en/reference/payment_methods/_payment_methods/
+    -->
+    <field name="payment_icon_ids"
+        eval="[(6, 0, [
+        ref('payment.payment_icon_cc_mastercard'),
+        ref('payment.payment_icon_cc_visa'),
+        ref('payment.payment_icon_cc_american_express'),
+        ref('payment.payment_icon_bbva_bancomer'),
+        ref('payment.payment_icon_citibanamex')
+        ])]"/>
+  </record>
+
+  <record id="payment_provider_mollie" model="payment.provider">
+    <field name="name">Mollie</field>
+    <field name="image_128" type="base64" file="payment_mollie/static/description/icon.png"/>
+    <field name="module_id" ref="base.module_payment_mollie"/>
+    <!-- https://www.mollie.com/en/payments -->
+    <field name="payment_icon_ids" eval="[(6, 0, [
+        ref('payment.payment_icon_cc_visa'),
+        ref('payment.payment_icon_cc_american_express'),
+        ref('payment.payment_icon_cc_maestro'),
+        ref('payment.payment_icon_cc_mastercard'),
+        ref('payment.payment_icon_cc_bancontact'),
+        ref('payment.payment_icon_cc_eps'),
+        ref('payment.payment_icon_cc_giropay'),
+        ref('payment.payment_icon_cc_p24'),
+        ref('payment.payment_icon_cc_ideal'),
+        ref('payment.payment_icon_paypal'),
+        ref('payment.payment_icon_apple_pay'),
+        ref('payment.payment_icon_sepa'),
+        ref('payment.payment_icon_kbc')
+        ])]"/>
+  </record>
+
+  <record id="payment_provider_paypal" model="payment.provider">
+    <field name="name">PayPal</field>
+    <field name="image_128" type="base64" file="payment_paypal/static/description/icon.png"/>
+    <field name="module_id" ref="base.module_payment_paypal"/>
+    <!-- https://www.paypal.com/us/selfhelp/article/Which-credit-cards-can-I-accept-with-PayPal-Merchant-Services-FAQ1525#business -->
+    <field name="payment_icon_ids"
+        eval="[(6, 0, [
+        ref('payment.payment_icon_cc_maestro'),
+        ref('payment.payment_icon_cc_mastercard'),
+        ref('payment.payment_icon_cc_discover'),
+        ref('payment.payment_icon_cc_diners_club_intl'),
+        ref('payment.payment_icon_cc_jcb'),
+        ref('payment.payment_icon_cc_american_express'),
+        ref('payment.payment_icon_cc_unionpay'),
+        ref('payment.payment_icon_cc_visa'),
+        ])]"/>
+  </record>
+
+  <record id="payment_provider_razorpay" model="payment.provider">
+    <field name="name">Razorpay</field>
+    <field name="display_as">Credit &amp; Debit Card, UPI (Powered by Razorpay)</field>
+    <field name="image_128" type="base64" file="payment_razorpay/static/description/icon.png"/>
+    <field name="module_id" ref="base.module_payment_razorpay"/>
+    <!-- https://razorpay.com/docs/payments/payment-methods/#supported-payment-methods -->
+    <field name="payment_icon_ids"
+        eval="[(6, 0, [
+        ref('payment.payment_icon_cc_maestro'),
+        ref('payment.payment_icon_cc_mastercard'),
+        ref('payment.payment_icon_cc_rupay'),
+        ref('payment.payment_icon_cc_diners_club_intl'),
+        ref('payment.payment_icon_cc_american_express'),
+        ref('payment.payment_icon_cc_visa')
+        ])]"/>
+  </record>
+
+  <record id="payment_provider_sepa_direct_debit" model="payment.provider">
+    <field name="name">SEPA Direct Debit</field>
+    <field name="sequence">20</field>
+    <field name="image_128"
+        type="base64"
+        file="base/static/img/icons/payment_sepa_direct_debit.png"/>
+    <field name="module_id" ref="base.module_payment_sepa_direct_debit"/>
+  </record>
+
+  <record id="payment_provider_sips" model="payment.provider">
+    <field name="name">Sips</field>
+    <field name="display_as">Credit Card (powered by Sips)</field>
+    <field name="image_128" type="base64" file="payment_sips/static/description/icon.png"/>
+    <field name="module_id" ref="base.module_payment_sips"/>
+    <!-- See http://sips.worldline.com/en-us/home/features/payment-types-and-acquirers.html -->
+    <field name="payment_icon_ids"
+        eval="[(6, 0, [
+        ref('payment.payment_icon_cc_maestro'),
+        ref('payment.payment_icon_cc_mastercard'),
+        ref('payment.payment_icon_cc_discover'),
+        ref('payment.payment_icon_cc_diners_club_intl'),
+        ref('payment.payment_icon_cc_jcb'),
+        ref('payment.payment_icon_cc_american_express'),
+        ref('payment.payment_icon_cc_bancontact'),
+        ref('payment.payment_icon_cc_unionpay'),
+        ref('payment.payment_icon_cc_visa'),
+        ])]"/>
+  </record>
+
+  <record id="payment_provider_stripe" model="payment.provider">
+    <field name="name">Stripe</field>
+    <field name="display_as">Credit &amp; Debit Card</field>
+    <field name="image_128" type="base64" file="payment_stripe/static/description/icon.png"/>
+    <field name="module_id" ref="base.module_payment_stripe"/>
+    <!--
+      See https://stripe.com/payments/payment-methods-guide
+      See https://support.goteamup.com/hc/en-us/articles/115002089349-Which-cards-and-payment-types-can-I-accept-with-Stripe-
+    -->
+    <field name="payment_icon_ids"
+        eval="[(6, 0, [
+        ref('payment.payment_icon_cc_maestro'),
+        ref('payment.payment_icon_cc_mastercard'),
+        ref('payment.payment_icon_cc_discover'),
+        ref('payment.payment_icon_cc_diners_club_intl'),
+        ref('payment.payment_icon_cc_jcb'),
+        ref('payment.payment_icon_cc_american_express'),
+        ref('payment.payment_icon_cc_visa'),
+        ])]"/>
+  </record>
+
+  <record id="payment_provider_transfer" model="payment.provider">
+    <field name="name">Wire Transfer</field>
+    <field name="sequence">30</field>
+    <field name="image_128"
+        type="base64"
+        file="payment_custom/static/description/icon.png"/>
+    <field name="module_id" ref="base.module_payment_custom"/>
+  </record>
+
 </odoo>
diff --git a/openupgrade_scripts/scripts/payment/16.0.2.0/post-migration.py b/openupgrade_scripts/scripts/payment/16.0.2.0/post-migration.py
new file mode 100644
index 000000000000..7c473057baa6
--- /dev/null
+++ b/openupgrade_scripts/scripts/payment/16.0.2.0/post-migration.py
@@ -0,0 +1,9 @@
+# Copyright 2023 Coop IT Easy SC
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from openupgradelib import openupgrade
+
+
+@openupgrade.migrate()
+def migrate(env, version):
+    openupgrade.load_data(env.cr, "payment", "16.0.2.0/noupdate_changes.xml")
diff --git a/openupgrade_scripts/scripts/payment/16.0.2.0/pre-migration.py b/openupgrade_scripts/scripts/payment/16.0.2.0/pre-migration.py
new file mode 100644
index 000000000000..c4d235da850d
--- /dev/null
+++ b/openupgrade_scripts/scripts/payment/16.0.2.0/pre-migration.py
@@ -0,0 +1,283 @@
+# Copyright 2023 Coop IT Easy SC
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from openupgradelib import openupgrade
+
+_model_renames = [
+    ("payment.acquirer", "payment.provider"),
+]
+
+_table_renames = [
+    ("payment_acquirer", "payment_provider"),
+    ("payment_acquirer_payment_icon_rel", "payment_provider_payment_icon_rel"),
+]
+
+_field_moves = [
+    {
+        "model": "account.bank.statement.line",
+        "moved_fields": [
+            "amount_paid",
+            "authorized_transaction_ids",
+            "transaction_ids",
+            "payment_acquirer_id",
+            "payment_acquirer_state",
+        ],
+        "old_module": "payment",
+        "new_module": "account_payment",
+    },
+    {
+        "model": "account.move",
+        "moved_fields": [
+            "amount_paid",
+            "authorized_transaction_ids",
+            "transaction_ids",
+        ],
+        "old_module": "payment",
+        "new_module": "account_payment",
+    },
+    {
+        "model": "account.payment",
+        "moved_fields": [
+            "amount_available_for_refund",
+            "amount_paid",
+            "authorized_transaction_ids",
+            "payment_token_id",
+            "payment_transaction_id",
+            "refunds_count",
+            "source_payment_id",
+            "suitable_payment_token_ids",
+            "transaction_ids",
+            "use_electronic_payment_method",
+        ],
+        "old_module": "payment",
+        "new_module": "account_payment",
+    },
+    {
+        "model": "payment.transaction",
+        "moved_fields": [
+            "invoice_ids",
+            "invoices_count",
+            "payment_id",
+        ],
+        "old_module": "payment",
+        "new_module": "account_payment",
+    },
+]
+
+_field_renames = [
+    (
+        "account.payment.method.line",
+        "account_payment_method_line",
+        "payment_acquirer_id",
+        "payment_provider_id",
+    ),
+    (
+        "account.payment.method.line",
+        "account_payment_method_line",
+        "payment_acquirer_state",
+        "payment_provider_state",
+    ),
+    (
+        "payment.icon",
+        "payment_icon",
+        "acquirer_ids",
+        "provider_ids",
+    ),
+    (
+        "payment.token",
+        "payment_token",
+        "acquirer_id",
+        "provider_id",
+    ),
+    (
+        "payment.token",
+        "payment_token",
+        "acquirer_ref",
+        "provider_ref",
+    ),
+    (
+        "payment.token",
+        "payment_token",
+        "name",
+        "payment_details",
+    ),
+    (
+        "payment.transaction",
+        "payment_transaction",
+        "acquirer_id",
+        "provider_id",
+    ),
+    (
+        "payment.transaction",
+        "payment_transaction",
+        "acquirer_reference",
+        "provider_reference",
+    ),
+    (
+        "res.company",
+        "res_company",
+        "payment_acquirer_onboarding_state",
+        "payment_provider_onboarding_state",
+    ),
+]
+
+_xmlid_renames = [
+    (
+        "payment.action_invoice_order_generate_link",
+        "account_payment.action_invoice_order_generate_link",
+    ),
+    (
+        "payment.action_payment_acquirer",
+        "payment.action_payment_provider",
+    ),
+    (
+        "payment.payment_acquirer_onboarding_wizard",
+        "payment.payment_provider_onboarding_wizard",
+    ),
+    (
+        "payment.payment_acquirer_system",
+        "payment.payment_provider_system",
+    ),
+    (
+        "payment.payment_link_wizard",
+        "account_payment.payment_link_wizard",
+    ),
+    (
+        "payment.payment_refund_wizard",
+        "account_payment.payment_refund_wizard",
+    ),
+    (
+        "payment.payment_acquirer_company_rule",
+        "payment.payment_provider_company_rule",
+    ),
+    (
+        "payment.payment_token_billing_rule",
+        "account_payment.payment_token_billing_rule",
+    ),
+    (
+        "payment.payment_transaction_billing_rule",
+        "account_payment.payment_transaction_billing_rule",
+    ),
+    (
+        "payment.payment_acquirer_menu",
+        "account_payment.payment_provider_menu",
+    ),
+    (
+        "payment.payment_icon_menu",
+        "account_payment.payment_icon_menu",
+    ),
+    (
+        "payment.payment_token_menu",
+        "account_payment.payment_token_menu",
+    ),
+    (
+        "payment.payment_transaction_menu",
+        "account_payment.payment_transaction_menu",
+    ),
+    (
+        "payment.account_invoice_view_form_inherit_payment",
+        "account_payment.account_invoice_view_form_inherit_payment",
+    ),
+    (
+        "payment.payment_acquirer_form",
+        "account_payment.payment_provider_form",
+    ),
+    (
+        "payment.payment_acquirer_kanban",
+        "account_payment.payment_provider_kanban",
+    ),
+    (
+        "payment.payment_acquirer_list",
+        "account_payment.payment_provider_list",
+    ),
+    (
+        "payment.payment_acquirer_onboarding_wizard_form",
+        "payment.payment_provider_onboarding_wizard_form",
+    ),
+    (
+        "payment.payment_acquirer_search",
+        "account_payment.payment_provider_search",
+    ),
+    (
+        "payment.payment_refund_wizard_view_form",
+        "account_payment.payment_refund_wizard_view_form",
+    ),
+    (
+        "payment.view_account_journal_form",
+        "account_payment.view_account_journal_form",
+    ),
+    (
+        "payment.view_account_payment_form_inherit_payment",
+        "account_payment.view_account_payment_form_inherit_payment",
+    ),
+    (
+        "payment.view_account_payment_register_form_inherit_payment",
+        "account_payment.view_account_payment_register_form_inherit_payment",
+    ),
+    (
+        "payment.payment_acquirer_adyen",
+        "payment.payment_provider_adyen",
+    ),
+    (
+        "payment.payment_acquirer_alipay",
+        "payment.payment_provider_alipay",
+    ),
+    (
+        "payment.payment_acquirer_authorize",
+        "payment.payment_provider_authorize",
+    ),
+    (
+        "payment.payment_acquirer_buckaroo",
+        "payment.payment_provider_buckaroo",
+    ),
+    (
+        "payment.payment_acquirer_mollie",
+        "payment.payment_provider_mollie",
+    ),
+    (
+        "payment.payment_acquirer_ogone",
+        "payment.payment_provider_ogone",
+    ),
+    (
+        "payment.payment_acquirer_paypal",
+        "payment.payment_provider_paypal",
+    ),
+    (
+        "payment.payment_acquirer_payulatam",
+        "payment.payment_provider_payulatam",
+    ),
+    (
+        "payment.payment_acquirer_payumoney",
+        "payment.payment_provider_payumoney",
+    ),
+    (
+        "payment.payment_acquirer_sepa_direct_debit",
+        "payment.payment_provider_sepa_direct_debit",
+    ),
+    (
+        "payment.payment_acquirer_sips",
+        "payment.payment_provider_sips",
+    ),
+    (
+        "payment.payment_acquirer_stripe",
+        "payment.payment_provider_stripe",
+    ),
+    (
+        "payment.payment_acquirer_test",
+        "payment.payment_provider_test",
+    ),
+    (
+        "payment.payment_acquirer_transfer",
+        "payment.payment_provider_transfer",
+    ),
+]
+
+
+@openupgrade.migrate()
+def migrate(env, version):
+    openupgrade.rename_models(env.cr, _model_renames)
+    openupgrade.rename_tables(env.cr, _table_renames)
+    for field_move_args in _field_moves:
+        openupgrade.update_module_moved_fields(env.cr, **field_move_args)
+    openupgrade.rename_fields(env, _field_renames)
+    openupgrade.rename_xmlids(env.cr, _xmlid_renames)
diff --git a/openupgrade_scripts/scripts/payment/16.0.2.0/upgrade_analysis_work.txt b/openupgrade_scripts/scripts/payment/16.0.2.0/upgrade_analysis_work.txt
new file mode 100644
index 000000000000..364d0bd8ff26
--- /dev/null
+++ b/openupgrade_scripts/scripts/payment/16.0.2.0/upgrade_analysis_work.txt
@@ -0,0 +1,417 @@
+---Models in module 'payment'---
+obsolete model payment.acquirer
+# DONE: pre-migration: Renamed to payment.provider
+
+obsolete model payment.acquirer.onboarding.wizard [transient]
+# NOTHING TO DO: Transient model renamed to payment.provider.onboarding.wizard
+
+model payment.refund.wizard (moved to account_payment) [transient]
+# NOTHING TO DO: it's transient, it will be deleted from this module and added to the other one.
+
+new model payment.provider
+# NOTHING TO DO: already done, see comment above
+
+new model payment.provider.onboarding.wizard [transient]
+# NOTHING TO DO: renamed transient modele (see above)
+
+---Fields in module 'payment'---
+payment      / account.bank.statement.line / amount_paid (float)           : module is now 'account_payment' ('payment')
+payment      / account.bank.statement.line / authorized_transaction_ids (many2many): module is now 'account_payment' ('payment')
+payment      / account.bank.statement.line / transaction_ids (many2many)   : module is now 'account_payment' ('payment')
+payment      / account.move             / amount_paid (float)           : module is now 'account_payment' ('payment')
+payment      / account.move             / authorized_transaction_ids (many2many): module is now 'account_payment' ('payment')
+payment      / account.move             / transaction_ids (many2many)   : module is now 'account_payment' ('payment')
+payment      / account.payment          / amount_available_for_refund (float): module is now 'account_payment' ('payment')
+payment      / account.payment          / amount_paid (float)           : module is now 'account_payment' ('payment')
+payment      / account.payment          / authorized_transaction_ids (many2many): module is now 'account_payment' ('payment')
+payment      / account.payment          / payment_token_id (many2one)   : module is now 'account_payment' ('payment')
+payment      / account.payment          / payment_transaction_id (many2one): module is now 'account_payment' ('payment')
+payment      / account.payment          / refunds_count (integer)       : module is now 'account_payment' ('payment')
+payment      / account.payment          / source_payment_id (many2one)  : module is now 'account_payment' ('payment')
+payment      / account.payment          / suitable_payment_token_ids (many2many): module is now 'account_payment' ('payment')
+payment      / account.payment          / transaction_ids (many2many)   : module is now 'account_payment' ('payment')
+payment      / account.payment          / use_electronic_payment_method (boolean): module is now 'account_payment' ('payment')
+# DONE: pre-migration: moved to account_payment
+
+payment      / account.payment.method.line / payment_acquirer_id (many2one): DEL relation: payment.acquirer
+# DONE: pre-migration: moved to account_payment AND renamed to payment_provider_id
+# DONE: pre-migration: field account.payment.method.line.payment_acquirer_state is also renamed to account.payment.method.line.payment_provider_state and moved to account_payment
+
+
+## payment.acquirer (renamed to payment.provider)
+
+payment      / payment.acquirer         / allow_tokenization (boolean)  : DEL
+# DONE: pre-migration: moved to payment.provider
+
+payment      / payment.acquirer         / auth_msg (html)               : DEL
+# DONE: pre-migration: moved to payment.provider
+
+payment      / payment.acquirer         / cancel_msg (html)             : DEL
+# DONE: pre-migration: moved to payment.provider
+
+payment      / payment.acquirer         / capture_manually (boolean)    : DEL
+# DONE: pre-migration: moved to payment.provider
+
+payment      / payment.acquirer         / color (integer)               : DEL
+# DONE: pre-migration: moved to payment.provider
+
+payment      / payment.acquirer         / company_id (many2one)         : DEL relation: res.company, required
+# DONE: pre-migration: moved to payment.provider
+
+payment      / payment.acquirer         / country_ids (many2many)       : DEL relation: res.country
+# DONE: pre-migration: moved to payment.provider
+
+payment      / payment.acquirer         / description (html)            : DEL
+# NOTHING TO DO: feature lost.
+
+payment      / payment.acquirer         / display_as (char)             : DEL
+# DONE: pre-migration: moved to payment.provider
+
+payment      / payment.acquirer         / done_msg (html)               : DEL
+# DONE: pre-migration: moved to payment.provider
+
+payment      / payment.acquirer         / fees_active (boolean)         : DEL
+# DONE: pre-migration: moved to payment.provider
+
+payment      / payment.acquirer         / fees_dom_fixed (float)        : DEL
+# DONE: pre-migration: moved to payment.provider
+
+payment      / payment.acquirer         / fees_dom_var (float)          : DEL
+# DONE: pre-migration: moved to payment.provider
+
+payment      / payment.acquirer         / fees_int_fixed (float)        : DEL
+# DONE: pre-migration: moved to payment.provider
+
+payment      / payment.acquirer         / fees_int_var (float)          : DEL
+# DONE: pre-migration: moved to payment.provider
+
+payment      / payment.acquirer         / image_128 (binary)            : DEL attachment: True
+# DONE: pre-migration: moved to payment.provider
+
+payment      / payment.acquirer         / inline_form_view_id (many2one): DEL relation: ir.ui.view
+# DONE: pre-migration: moved to payment.provider
+
+payment      / payment.acquirer         / module_id (many2one)          : DEL relation: ir.module.module
+# DONE: pre-migration: moved to payment.provider
+
+payment      / payment.acquirer         / module_state (selection)      : DEL selection_keys: function
+# DONE: pre-migration: moved to payment.provider
+
+payment      / payment.acquirer         / name (char)                   : DEL required
+# DONE: pre-migration: moved to payment.provider
+
+payment      / payment.acquirer         / payment_icon_ids (many2many)  : DEL relation: payment.icon
+# DONE: pre-migration: moved to payment.provider
+
+payment      / payment.acquirer         / pending_msg (html)            : DEL
+# DONE: pre-migration: moved to payment.provider
+
+payment      / payment.acquirer         / pre_msg (html)                : DEL
+# DONE: pre-migration: moved to payment.provider
+
+payment      / payment.acquirer         / provider (selection)          : DEL required, selection_keys: ['none']
+# NOTHING TO DO: Not needed anymore.
+
+payment      / payment.acquirer         / redirect_form_view_id (many2one): DEL relation: ir.ui.view
+# DONE: pre-migration: moved to payment.provider
+
+payment      / payment.acquirer         / sequence (integer)            : DEL
+# DONE: pre-migration: moved to payment.provider
+
+payment      / payment.acquirer         / state (selection)             : DEL required, selection_keys: ['disabled', 'enabled', 'test']
+# DONE: pre-migration: moved to payment.provider
+
+payment      / payment.acquirer         / support_authorization (boolean): DEL
+payment      / payment.acquirer         / support_fees_computation (boolean): DEL
+payment      / payment.acquirer         / support_refund (selection)    : DEL selection_keys: ['full_only', 'partial']
+payment      / payment.acquirer         / support_tokenization (boolean): DEL
+# NOTHING TO DO: Not needed anymore or lost feature
+
+
+## payment.icon
+
+payment      / payment.icon             / acquirer_ids (many2many)      : DEL relation: payment.acquirer
+payment      / payment.icon             / provider_ids (many2many)      : NEW relation: payment.provider
+# DONE: pre-migration: Renamed from acquirer_ids to provider_ids. Renamed relation table payment_acquirer_payment_icon_rel -> payment_provider_payment_icon_rel
+
+
+## payment.provider (previously payment.acquirer)
+
+payment      / payment.provider         / allow_express_checkout (boolean): NEW
+# NOTHING TO DO: new feature.
+
+payment      / payment.provider         / allow_tokenization (boolean)  : NEW
+# NOTHING TO DO: From payment.acquirer. See comment above.
+
+payment      / payment.provider         / auth_msg (html)               : NEW hasdefault: default
+# NOTHING TO DO: From payment.acquirer. See comment above.
+
+payment      / payment.provider         / available_country_ids (many2many): NEW relation: res.country
+# NOTHING TO DO: new feature.
+
+payment      / payment.provider         / cancel_msg (html)             : NEW hasdefault: default
+# NOTHING TO DO: From payment.acquirer. See comment above.
+
+payment      / payment.provider         / capture_manually (boolean)    : NEW
+# NOTHING TO DO: From payment.acquirer. See comment above.
+
+payment      / payment.provider         / code (selection)              : NEW required, selection_keys: ['none'], hasdefault: default
+payment      / payment.provider         / color (integer)               : NEW isfunction: function, stored
+# NOTHING TO DO: From payment.acquirer. See comment above.
+
+payment      / payment.provider         / company_id (many2one)         : NEW relation: res.company, required, hasdefault: default
+# NOTHING TO DO: From payment.acquirer. See comment above.
+
+payment      / payment.provider         / display_as (char)             : NEW
+# NOTHING TO DO: From payment.acquirer. See comment above.
+
+payment      / payment.provider         / done_msg (html)               : NEW hasdefault: default
+# NOTHING TO DO: From payment.acquirer. See comment above.
+
+payment      / payment.provider         / express_checkout_form_view_id (many2one): NEW relation: ir.ui.view
+# NOTHING TO DO: new feature.
+
+payment      / payment.provider         / fees_active (boolean)         : NEW
+# NOTHING TO DO: From payment.acquirer. See comment above.
+
+payment      / payment.provider         / fees_dom_fixed (float)        : NEW
+# NOTHING TO DO: From payment.acquirer. See comment above.
+
+payment      / payment.provider         / fees_dom_var (float)          : NEW
+# NOTHING TO DO: From payment.acquirer. See comment above.
+
+payment      / payment.provider         / fees_int_fixed (float)        : NEW
+# NOTHING TO DO: From payment.acquirer. See comment above.
+
+payment      / payment.provider         / fees_int_var (float)          : NEW
+# NOTHING TO DO: From payment.acquirer. See comment above.
+
+payment      / payment.provider         / image_128 (binary)            : NEW attachment: True
+# NOTHING TO DO: From payment.acquirer. See comment above.
+
+payment      / payment.provider         / inline_form_view_id (many2one): NEW relation: ir.ui.view
+# NOTHING TO DO: From payment.acquirer. See comment above.
+
+payment      / payment.provider         / is_published (boolean)        : NEW
+# NOTHING TO DO: new feature.
+
+payment      / payment.provider         / maximum_amount (float)        : NEW
+# NOTHING TO DO: new feature.
+
+payment      / payment.provider         / module_id (many2one)          : NEW relation: ir.module.module
+# NOTHING TO DO: From payment.acquirer. See comment above.
+
+payment      / payment.provider         / module_state (selection)      : NEW selection_keys: function, isrelated: related, stored
+# NOTHING TO DO: From payment.acquirer. See comment above.
+
+payment      / payment.provider         / name (char)                   : NEW required
+# NOTHING TO DO: From payment.acquirer. See comment above.
+
+payment      / payment.provider         / payment_icon_ids (many2many)  : NEW relation: payment.icon
+# NOTHING TO DO: From payment.acquirer. See comment above.
+
+payment      / payment.provider         / pending_msg (html)            : NEW hasdefault: default
+# NOTHING TO DO: From payment.acquirer. See comment above.
+
+payment      / payment.provider         / pre_msg (html)                : NEW
+# NOTHING TO DO: From payment.acquirer. See comment above.
+
+payment      / payment.provider         / redirect_form_view_id (many2one): NEW relation: ir.ui.view
+# NOTHING TO DO: From payment.acquirer. See comment above.
+
+payment      / payment.provider         / sequence (integer)            : NEW
+# NOTHING TO DO: From payment.acquirer. See comment above.
+
+payment      / payment.provider         / state (selection)             : NEW required, selection_keys: ['disabled', 'enabled', 'test'], hasdefault: default
+# NOTHING TO DO: From payment.acquirer. See comment above.
+
+payment      / payment.provider         / token_inline_form_view_id (many2one): NEW relation: ir.ui.view
+# NOTHING TO DO: new feature.
+
+
+## payment.token
+
+payment      / payment.token            / acquirer_id (many2one)        : DEL relation: payment.acquirer, required
+# DONE: pre-migration: renamed to provider_id
+
+payment      / payment.token            / acquirer_ref (char)           : DEL required
+# DONE: pre-migration: renamed to provider_ref
+
+payment      / payment.token            / name (char)                   : DEL required
+# DONE: pre-migration: renamed to payment_details
+
+payment      / payment.token            / payment_details (char)        : NEW
+payment      / payment.token            / provider_id (many2one)        : NEW relation: payment.provider, required
+payment      / payment.token            / provider_ref (char)           : NEW required
+# NOTHING TO DO: already done, see comment above.
+
+
+
+## payment.transaction
+
+payment      / payment.transaction      / acquirer_id (many2one)        : DEL relation: payment.acquirer, required
+# DONE: pre-migration: renamed to provider_id
+
+payment      / payment.transaction      / acquirer_reference (char)     : DEL
+# DONE: pre-migration: renamed to provider_reference
+
+payment      / payment.transaction      / child_transaction_ids (one2many): NEW relation: payment.transaction
+# NOTHING TO DO: new feature
+
+payment      / payment.transaction      / invoice_ids (many2many)       : module is now 'account_payment' ('payment')
+payment      / payment.transaction      / invoices_count (integer)      : module is now 'account_payment' ('payment')
+payment      / payment.transaction      / payment_id (many2one)         : module is now 'account_payment' ('payment')
+# DONE: pre-migration: moved to account_payment
+
+payment      / payment.transaction      / provider_id (many2one)        : NEW relation: payment.provider, required
+payment      / payment.transaction      / provider_reference (char)     : NEW
+# NOTHING TO DO: already done, see comment above.
+
+## res.company
+
+payment      / res.company              / payment_acquirer_onboarding_state (selection): DEL selection_keys: ['done', 'just_done', 'not_done']
+payment      / res.company              / payment_provider_onboarding_state (selection): NEW selection_keys: ['done', 'just_done', 'not_done'], hasdefault: default
+# DONE: pre-migration: Renamed from payment_acquirer_onboarding_state to payment_provider_onboarding_state
+
+---XML records in module 'payment'---
+NEW ir.actions.act_window: payment.action_payment_provider
+# NOTHING TO DO: already done see comment below
+
+DEL ir.actions.act_window: payment.action_invoice_order_generate_link [renamed to account_payment module]
+# DONE: pre-migration: moved to account_payment
+
+DEL ir.actions.act_window: payment.action_open_payment_onboarding_payment_acquirer_wizard
+# NOTHING TO DO: not used anymore
+
+DEL ir.actions.act_window: payment.action_payment_acquirer
+# DONE: pre-migration: renamed to payment.action_payment_provider
+
+NEW ir.model.access: payment.access_payment_link_wizard
+# NOTHING TO DO
+
+NEW ir.model.access: payment.payment_provider_onboarding_wizard
+# NOTHING TO DO: already done, see comment below
+
+NEW ir.model.access: payment.payment_provider_system
+# NOTHING TO DO: already done, see comment below
+
+DEL ir.model.access: payment.payment_acquirer_onboarding_wizard
+# DONE: pre-migration: renamed to payment.payment_provider_onboarding_wizard
+
+DEL ir.model.access: payment.payment_acquirer_system
+# DONE: pre-migration: renamed to payment.payment_provider_system
+
+DEL ir.model.access: payment.payment_link_wizard [renamed to account_payment module]
+DEL ir.model.access: payment.payment_refund_wizard [renamed to account_payment module]
+# DONE: pre-migration: moved to account_payment
+
+NEW ir.rule: payment.payment_provider_company_rule (noupdate)
+DEL ir.rule: payment.payment_acquirer_company_rule (noupdate)
+# DONE: pre-migration: renamed payment_acquirer_company_rule -> payment_provider_company_rule
+
+DEL ir.rule: payment.payment_token_billing_rule [renamed to account_payment module] (noupdate)
+DEL ir.rule: payment.payment_transaction_billing_rule [renamed to account_payment module] (noupdate)
+# DONE: pre-migration: moved to account_payment
+
+DEL ir.ui.menu: payment.payment_acquirer_menu
+# DONE: pre-migration: moved and renamed payment.payment_acquirer_menu -> account_payment.payment_provider_menu
+
+DEL ir.ui.menu: payment.payment_icon_menu [renamed to account_payment module]
+DEL ir.ui.menu: payment.payment_token_menu [renamed to account_payment module]
+DEL ir.ui.menu: payment.payment_transaction_menu [renamed to account_payment module]
+# DONE: pre-migration: moved to account_payment
+
+NEW ir.ui.view: payment.express_checkout
+# NOTHING TO DO
+
+NEW ir.ui.view: payment.payment_provider_form
+# NOTHING TO DO: already done, see comment below
+
+NEW ir.ui.view: payment.payment_provider_kanban
+# NOTHING TO DO: already done, see comment below
+
+NEW ir.ui.view: payment.payment_provider_list
+# NOTHING TO DO: already done, see comment below
+
+NEW ir.ui.view: payment.payment_provider_onboarding_wizard_form
+# NOTHING TO DO: already done, see comment below
+
+NEW ir.ui.view: payment.payment_provider_search
+# NOTHING TO DO: already done, see comment below
+
+DEL ir.ui.view: payment.account_invoice_view_form_inherit_payment
+# DONE: pre-migration: moved to account_payment
+
+DEL ir.ui.view: payment.onboarding_payment_acquirer_step
+# NOTHING TO DO: it seams that the feature has been moved to other modules
+
+DEL ir.ui.view: payment.payment_acquirer_form
+# DONE: pre-migration: renamed payment_acquirer_form -> payment_provider_form
+
+DEL ir.ui.view: payment.payment_acquirer_kanban
+# DONE: pre-migration: renamed payment_acquirer_kanban -> payment_provider_kanban
+
+DEL ir.ui.view: payment.payment_acquirer_list
+# DONE: pre-migration: renamed payment_acquirer_list -> payment_provider_list
+
+DEL ir.ui.view: payment.payment_acquirer_onboarding_wizard_form
+# DONE: pre-migration: renamed payment_acquirer_onboarding_wizard_form -> payment_provider_onboarding_wizard_form
+
+DEL ir.ui.view: payment.payment_acquirer_search
+# DONE: pre-migration: renamed payment_acquirer_search -> payment_provider_search
+
+DEL ir.ui.view: payment.payment_refund_wizard_view_form
+# DONE: pre-migration: moved to account_payment
+
+DEL ir.ui.view: payment.view_account_journal_form
+# DONE: pre-migration: moved to account_payment
+
+DEL ir.ui.view: payment.view_account_payment_form_inherit_payment
+# DONE: pre-migration: moved to account_payment
+
+DEL ir.ui.view: payment.view_account_payment_register_form_inherit_payment
+# DONE: pre-migration: moved to account_payment
+
+DEL payment.acquirer: payment.payment_acquirer_adyen (noupdate)
+DEL payment.acquirer: payment.payment_acquirer_alipay (noupdate)
+DEL payment.acquirer: payment.payment_acquirer_authorize (noupdate)
+DEL payment.acquirer: payment.payment_acquirer_buckaroo (noupdate)
+DEL payment.acquirer: payment.payment_acquirer_mollie (noupdate)
+DEL payment.acquirer: payment.payment_acquirer_ogone (noupdate)
+DEL payment.acquirer: payment.payment_acquirer_paypal (noupdate)
+DEL payment.acquirer: payment.payment_acquirer_payulatam (noupdate)
+DEL payment.acquirer: payment.payment_acquirer_payumoney (noupdate)
+DEL payment.acquirer: payment.payment_acquirer_sepa_direct_debit (noupdate)
+DEL payment.acquirer: payment.payment_acquirer_sips (noupdate)
+DEL payment.acquirer: payment.payment_acquirer_stripe (noupdate)
+DEL payment.acquirer: payment.payment_acquirer_test (noupdate)
+DEL payment.acquirer: payment.payment_acquirer_transfer (noupdate)
+# DONE: pre-migration: renamed acquirer to provider
+
+NEW payment.icon: payment.payment_icon_airtel_money
+NEW payment.icon: payment.payment_icon_barter_by_flutterwave
+NEW payment.icon: payment.payment_icon_bbva_bancomer
+NEW payment.icon: payment.payment_icon_cc_rupay
+NEW payment.icon: payment.payment_icon_citibanamex
+NEW payment.icon: payment.payment_icon_mada
+NEW payment.icon: payment.payment_icon_mpesa
+NEW payment.icon: payment.payment_icon_mtn_mobile_money
+NEW payment.icon: payment.payment_icon_sadad
+# NOTHING TO DO: new feature
+
+NEW payment.provider: payment.payment_provider_adyen (noupdate)
+NEW payment.provider: payment.payment_provider_aps (noupdate)
+NEW payment.provider: payment.payment_provider_asiapay (noupdate)
+NEW payment.provider: payment.payment_provider_authorize (noupdate)
+NEW payment.provider: payment.payment_provider_buckaroo (noupdate)
+NEW payment.provider: payment.payment_provider_demo (noupdate)
+NEW payment.provider: payment.payment_provider_flutterwave (noupdate)
+NEW payment.provider: payment.payment_provider_mercado_pago (noupdate)
+NEW payment.provider: payment.payment_provider_mollie (noupdate)
+NEW payment.provider: payment.payment_provider_paypal (noupdate)
+NEW payment.provider: payment.payment_provider_razorpay (noupdate)
+NEW payment.provider: payment.payment_provider_sepa_direct_debit (noupdate)
+NEW payment.provider: payment.payment_provider_sips (noupdate)
+NEW payment.provider: payment.payment_provider_stripe (noupdate)
+NEW payment.provider: payment.payment_provider_transfer (noupdate)
+# DONE: post-migration: added noupdate_changes manually