diff --git a/account_invoice_base_invoicing_mode/i18n/account_invoice_base_invoicing_mode.pot b/account_invoice_base_invoicing_mode/i18n/account_invoice_base_invoicing_mode.pot
deleted file mode 100644
index 17619ac940a7..000000000000
--- a/account_invoice_base_invoicing_mode/i18n/account_invoice_base_invoicing_mode.pot
+++ /dev/null
@@ -1,94 +0,0 @@
-# Translation of Odoo Server.
-# This file contains the translation of the following modules:
-# * account_invoice_base_invoicing_mode
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: Odoo Server 14.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_invoice_base_invoicing_mode
-#: model:ir.model,name:account_invoice_base_invoicing_mode.model_res_partner
-msgid "Contact"
-msgstr ""
-
-#. module: account_invoice_base_invoicing_mode
-#: model:ir.model.fields,field_description:account_invoice_base_invoicing_mode.field_account_move__display_name
-#: model:ir.model.fields,field_description:account_invoice_base_invoicing_mode.field_queue_job__display_name
-#: model:ir.model.fields,field_description:account_invoice_base_invoicing_mode.field_res_partner__display_name
-#: model:ir.model.fields,field_description:account_invoice_base_invoicing_mode.field_sale_order__display_name
-msgid "Display Name"
-msgstr ""
-
-#. module: account_invoice_base_invoicing_mode
-#: model:ir.model.fields,help:account_invoice_base_invoicing_mode.field_res_partner__one_invoice_per_order
-#: model:ir.model.fields,help:account_invoice_base_invoicing_mode.field_res_users__one_invoice_per_order
-msgid "Do not group sale order into one invoice."
-msgstr ""
-
-#. module: account_invoice_base_invoicing_mode
-#: model:ir.model.fields,field_description:account_invoice_base_invoicing_mode.field_account_move__id
-#: model:ir.model.fields,field_description:account_invoice_base_invoicing_mode.field_queue_job__id
-#: model:ir.model.fields,field_description:account_invoice_base_invoicing_mode.field_res_partner__id
-#: model:ir.model.fields,field_description:account_invoice_base_invoicing_mode.field_sale_order__id
-msgid "ID"
-msgstr ""
-
-#. module: account_invoice_base_invoicing_mode
-#: model:ir.model.fields,field_description:account_invoice_base_invoicing_mode.field_res_partner__invoicing_mode
-#: model:ir.model.fields,field_description:account_invoice_base_invoicing_mode.field_res_users__invoicing_mode
-#: model:ir.model.fields,field_description:account_invoice_base_invoicing_mode.field_sale_order__invoicing_mode
-msgid "Invoicing Mode"
-msgstr ""
-
-#. module: account_invoice_base_invoicing_mode
-#: model:ir.model,name:account_invoice_base_invoicing_mode.model_account_move
-msgid "Journal Entry"
-msgstr ""
-
-#. module: account_invoice_base_invoicing_mode
-#: model:ir.model.fields,field_description:account_invoice_base_invoicing_mode.field_account_move____last_update
-#: model:ir.model.fields,field_description:account_invoice_base_invoicing_mode.field_queue_job____last_update
-#: model:ir.model.fields,field_description:account_invoice_base_invoicing_mode.field_res_partner____last_update
-#: model:ir.model.fields,field_description:account_invoice_base_invoicing_mode.field_sale_order____last_update
-msgid "Last Modified on"
-msgstr ""
-
-#. module: account_invoice_base_invoicing_mode
-#: model:ir.model.fields,field_description:account_invoice_base_invoicing_mode.field_res_partner__one_invoice_per_order
-#: model:ir.model.fields,field_description:account_invoice_base_invoicing_mode.field_res_users__one_invoice_per_order
-msgid "One invoice per order"
-msgstr ""
-
-#. module: account_invoice_base_invoicing_mode
-#: model:ir.model,name:account_invoice_base_invoicing_mode.model_queue_job
-msgid "Queue Job"
-msgstr ""
-
-#. module: account_invoice_base_invoicing_mode
-#: code:addons/account_invoice_base_invoicing_mode/models/queue_job.py:0
-#, python-format
-msgid "Related Record"
-msgstr ""
-
-#. module: account_invoice_base_invoicing_mode
-#: code:addons/account_invoice_base_invoicing_mode/models/queue_job.py:0
-#, python-format
-msgid "Related Records"
-msgstr ""
-
-#. module: account_invoice_base_invoicing_mode
-#: model:ir.model,name:account_invoice_base_invoicing_mode.model_sale_order
-msgid "Sales Order"
-msgstr ""
-
-#. module: account_invoice_base_invoicing_mode
-#: model:ir.model.fields.selection,name:account_invoice_base_invoicing_mode.selection__res_partner__invoicing_mode__standard
-msgid "Standard"
-msgstr ""
diff --git a/account_invoice_base_invoicing_mode/readme/ROADMAP.rst b/account_invoice_base_invoicing_mode/readme/ROADMAP.rst
deleted file mode 100644
index 05c4ba88716b..000000000000
--- a/account_invoice_base_invoicing_mode/readme/ROADMAP.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-On the version 13.0 PR it has been discussed to rename the modules like this:
-
- * account_invoice_base_invoicing_mode -> partner_invoicing_mode
- * account_invoice_mode_monthly -> partner_invoicing_mode_monthly
- * account_invoice_mode_at_shipping -> partner_invoicing_mode_at_shipping
-
-It would be great to do it, during the version 15.0 migration.
diff --git a/account_invoice_base_invoicing_mode/README.rst b/partner_invoicing_mode/README.rst
similarity index 100%
rename from account_invoice_base_invoicing_mode/README.rst
rename to partner_invoicing_mode/README.rst
diff --git a/account_invoice_base_invoicing_mode/__init__.py b/partner_invoicing_mode/__init__.py
similarity index 100%
rename from account_invoice_base_invoicing_mode/__init__.py
rename to partner_invoicing_mode/__init__.py
diff --git a/account_invoice_base_invoicing_mode/__manifest__.py b/partner_invoicing_mode/__manifest__.py
similarity index 79%
rename from account_invoice_base_invoicing_mode/__manifest__.py
rename to partner_invoicing_mode/__manifest__.py
index bbb2b9ab6591..806371887492 100644
--- a/account_invoice_base_invoicing_mode/__manifest__.py
+++ b/partner_invoicing_mode/__manifest__.py
@@ -1,9 +1,9 @@
# Copyright 2020 Camptocamp
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
{
- "name": "Account Invoice Base Invoicing Mode",
+ "name": "Partner Invoicing Mode",
"version": "15.0.1.0.0",
- "summary": "Base module for handling multiple invoicing mode",
+ "summary": "Base module for handling multiple partner invoicing mode",
"author": "Camptocamp, Odoo Community Association (OCA)",
"website": "https://github.com/OCA/account-invoicing",
"license": "AGPL-3",
diff --git a/account_invoice_base_invoicing_mode/data/queue_job_data.xml b/partner_invoicing_mode/data/queue_job_data.xml
similarity index 100%
rename from account_invoice_base_invoicing_mode/data/queue_job_data.xml
rename to partner_invoicing_mode/data/queue_job_data.xml
diff --git a/partner_invoicing_mode/migrations/15.0.1.0.0/pre-migrate.py b/partner_invoicing_mode/migrations/15.0.1.0.0/pre-migrate.py
new file mode 100644
index 000000000000..ce89c1848da4
--- /dev/null
+++ b/partner_invoicing_mode/migrations/15.0.1.0.0/pre-migrate.py
@@ -0,0 +1,11 @@
+# Copyright 2022 Camptocamp SA
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html)
+
+from openupgradelib import openupgrade
+
+
+@openupgrade.migrate(use_env=True)
+def migrate(env, version):
+ openupgrade.update_module_names(
+ env.cr, [("account_invoice_base_invoicing_mode", "partner_invoicing_mode")]
+ )
diff --git a/account_invoice_base_invoicing_mode/models/__init__.py b/partner_invoicing_mode/models/__init__.py
similarity index 100%
rename from account_invoice_base_invoicing_mode/models/__init__.py
rename to partner_invoicing_mode/models/__init__.py
diff --git a/account_invoice_base_invoicing_mode/models/account_invoice.py b/partner_invoicing_mode/models/account_invoice.py
similarity index 100%
rename from account_invoice_base_invoicing_mode/models/account_invoice.py
rename to partner_invoicing_mode/models/account_invoice.py
diff --git a/account_invoice_base_invoicing_mode/models/queue_job.py b/partner_invoicing_mode/models/queue_job.py
similarity index 100%
rename from account_invoice_base_invoicing_mode/models/queue_job.py
rename to partner_invoicing_mode/models/queue_job.py
diff --git a/account_invoice_base_invoicing_mode/models/res_partner.py b/partner_invoicing_mode/models/res_partner.py
similarity index 100%
rename from account_invoice_base_invoicing_mode/models/res_partner.py
rename to partner_invoicing_mode/models/res_partner.py
diff --git a/account_invoice_base_invoicing_mode/models/sale_order.py b/partner_invoicing_mode/models/sale_order.py
similarity index 100%
rename from account_invoice_base_invoicing_mode/models/sale_order.py
rename to partner_invoicing_mode/models/sale_order.py
diff --git a/account_invoice_base_invoicing_mode/readme/CONTRIBUTORS.rst b/partner_invoicing_mode/readme/CONTRIBUTORS.rst
similarity index 100%
rename from account_invoice_base_invoicing_mode/readme/CONTRIBUTORS.rst
rename to partner_invoicing_mode/readme/CONTRIBUTORS.rst
diff --git a/account_invoice_base_invoicing_mode/readme/CREDITS.rst b/partner_invoicing_mode/readme/CREDITS.rst
similarity index 100%
rename from account_invoice_base_invoicing_mode/readme/CREDITS.rst
rename to partner_invoicing_mode/readme/CREDITS.rst
diff --git a/account_invoice_base_invoicing_mode/readme/DESCRIPTION.rst b/partner_invoicing_mode/readme/DESCRIPTION.rst
similarity index 79%
rename from account_invoice_base_invoicing_mode/readme/DESCRIPTION.rst
rename to partner_invoicing_mode/readme/DESCRIPTION.rst
index 453a040bfc05..24dc0dad8807 100644
--- a/account_invoice_base_invoicing_mode/readme/DESCRIPTION.rst
+++ b/partner_invoicing_mode/readme/DESCRIPTION.rst
@@ -5,5 +5,5 @@ But it serves no purpose installed on its own.
The following modules use it to install specific invoicing mode :
- * `account_invoice_mode_at_shipping`
- * `account_invoice_mode_monthly`
+ * `partner_invoicing_mode_at_shipping`
+ * `partner_invoicing_mode_monthly`
diff --git a/account_invoice_base_invoicing_mode/static/description/icon.png b/partner_invoicing_mode/static/description/icon.png
similarity index 100%
rename from account_invoice_base_invoicing_mode/static/description/icon.png
rename to partner_invoicing_mode/static/description/icon.png
diff --git a/account_invoice_base_invoicing_mode/static/description/index.html b/partner_invoicing_mode/static/description/index.html
similarity index 100%
rename from account_invoice_base_invoicing_mode/static/description/index.html
rename to partner_invoicing_mode/static/description/index.html
diff --git a/account_invoice_base_invoicing_mode/views/res_partner.xml b/partner_invoicing_mode/views/res_partner.xml
similarity index 90%
rename from account_invoice_base_invoicing_mode/views/res_partner.xml
rename to partner_invoicing_mode/views/res_partner.xml
index db51c1d1d358..dd5a90420046 100644
--- a/account_invoice_base_invoicing_mode/views/res_partner.xml
+++ b/partner_invoicing_mode/views/res_partner.xml
@@ -6,7 +6,7 @@
-
+
diff --git a/setup/account_invoice_base_invoicing_mode/odoo/addons/account_invoice_base_invoicing_mode b/setup/account_invoice_base_invoicing_mode/odoo/addons/account_invoice_base_invoicing_mode
deleted file mode 120000
index d28ad4fff5f9..000000000000
--- a/setup/account_invoice_base_invoicing_mode/odoo/addons/account_invoice_base_invoicing_mode
+++ /dev/null
@@ -1 +0,0 @@
-../../../../account_invoice_base_invoicing_mode
\ No newline at end of file
diff --git a/setup/partner_invoicing_mode/odoo/addons/partner_invoicing_mode b/setup/partner_invoicing_mode/odoo/addons/partner_invoicing_mode
new file mode 120000
index 000000000000..11b8ae06e460
--- /dev/null
+++ b/setup/partner_invoicing_mode/odoo/addons/partner_invoicing_mode
@@ -0,0 +1 @@
+../../../../partner_invoicing_mode
\ No newline at end of file
diff --git a/setup/account_invoice_base_invoicing_mode/setup.py b/setup/partner_invoicing_mode/setup.py
similarity index 100%
rename from setup/account_invoice_base_invoicing_mode/setup.py
rename to setup/partner_invoicing_mode/setup.py