diff --git a/docsource/modules160-170.rst b/docsource/modules160-170.rst
index 98e6778dc37d..ff6488413500 100644
--- a/docsource/modules160-170.rst
+++ b/docsource/modules160-170.rst
@@ -24,7 +24,7 @@ Module coverage 16.0 -> 17.0
 +---------------------------------------------------+----------------------+-------------------------------------------------+
 | account_lock                                      |                      |                                                 |
 +---------------------------------------------------+----------------------+-------------------------------------------------+
-| account_payment                                   |                      |                                                 |
+| account_payment                                   | Done                 |                                                 |
 +---------------------------------------------------+----------------------+-------------------------------------------------+
 | |del| account_payment_invoice_online_payment_patch|                      |Merged into account_payment.                     |
 +---------------------------------------------------+----------------------+-------------------------------------------------+
diff --git a/openupgrade_scripts/scripts/account_payment/17.0.2.0/post-migration.py b/openupgrade_scripts/scripts/account_payment/17.0.2.0/post-migration.py
new file mode 100644
index 000000000000..ba65c4166202
--- /dev/null
+++ b/openupgrade_scripts/scripts/account_payment/17.0.2.0/post-migration.py
@@ -0,0 +1,13 @@
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
+
+from openupgradelib import openupgrade
+
+_deleted_xml_records = ["account_payment.payment_transaction_billing_rule"]
+
+
+@openupgrade.migrate()
+def migrate(env, version):
+    openupgrade.delete_records_safely_by_xml_id(
+        env,
+        _deleted_xml_records,
+    )
diff --git a/openupgrade_scripts/scripts/account_payment/17.0.2.0/pre-migration.py b/openupgrade_scripts/scripts/account_payment/17.0.2.0/pre-migration.py
new file mode 100644
index 000000000000..341a02ff1cad
--- /dev/null
+++ b/openupgrade_scripts/scripts/account_payment/17.0.2.0/pre-migration.py
@@ -0,0 +1,15 @@
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
+
+from openupgradelib import openupgrade
+
+_xmlid_renames = [
+    (
+        "account_payment_invoice_online_payment_patch.enable_portal_payment",
+        "account_payment.enable_portal_payment",
+    ),
+]
+
+
+@openupgrade.migrate()
+def migrate(env, version):
+    openupgrade.rename_xmlids(env.cr, _xmlid_renames)
diff --git a/openupgrade_scripts/scripts/account_payment/17.0.2.0/upgrade_analysis_work.txt b/openupgrade_scripts/scripts/account_payment/17.0.2.0/upgrade_analysis_work.txt
new file mode 100644
index 000000000000..3f9c850eeaa6
--- /dev/null
+++ b/openupgrade_scripts/scripts/account_payment/17.0.2.0/upgrade_analysis_work.txt
@@ -0,0 +1,23 @@
+---Models in module 'account_payment'---
+---Fields in module 'account_payment'---
+---XML records in module 'account_payment'---
+NEW ir.config_parameter: account_payment.enable_portal_payment [renamed from account_payment_invoice_online_payment_patch module] (noupdate)
+DEL ir.config_parameter: account_payment_invoice_online_payment_patch.enable_portal_payment [renamed to account_payment module] (noupdate)
+# DONE pre-migration rename XML-IDs
+
+NEW ir.model.access: account_payment.payment_transaction_user [renamed from payment module]
+# NOTHING TO DO
+
+DEL ir.rule: account_payment.payment_transaction_billing_rule (noupdate)
+# DONE: removed in post-migration
+
+NEW ir.ui.menu: account_payment.payment_method_menu
+DEL ir.ui.menu: account_payment.payment_icon_menu
+NEW ir.ui.view: account_payment.res_config_settings_view_form
+DEL ir.ui.view: account_payment.payment_checkout_inherit
+DEL ir.ui.view: account_payment.payment_manage_inherit
+DEL ir.ui.view: account_payment_invoice_online_payment_patch.portal_invoice_page_inherit_payment
+DEL ir.ui.view: account_payment_invoice_online_payment_patch.portal_my_invoices_payment
+DEL ir.ui.view: account_payment_invoice_online_payment_patch.res_config_settings_view_form
+NEW onboarding.onboarding.step: account_payment.onboarding_onboarding_step_payment_provider (noupdate)
+# NOTHING TO DO