diff --git a/pms/README.rst b/pms/README.rst
index 91414fbd4..6329949c3 100644
--- a/pms/README.rst
+++ b/pms/README.rst
@@ -7,7 +7,7 @@ PMS (Property Management System)
    !! This file is generated by oca-gen-addon-readme !!
    !! changes will be overwritten.                   !!
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-   !! source digest: sha256:6c5b31264d3e7504c6c81ec1ae9fc2222be30ccd7362e5d444f6d7cfe97069fa
+   !! source digest: sha256:084d2899cbc7b06f7ece70261b11256045c44b256ebff405d42812f6f32dd1fc
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 .. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
diff --git a/pms/__manifest__.py b/pms/__manifest__.py
index 66a462429..b048ea5ac 100644
--- a/pms/__manifest__.py
+++ b/pms/__manifest__.py
@@ -100,9 +100,12 @@
         "report/proforma_report.xml",
         "views/account_portal_templates.xml",
         "views/payment_acquirer_views.xml",
-        "views/account_analytic_distribution_view.xml",
-        "views/account_analytic_line_view.xml",
+        "views/account_analytic_distribution_views.xml",
+        "views/account_analytic_line_views.xml",
         "views/res_partner_category.xml",
+        "views/res_partner_id_category_views.xml",
+        "views/res_partner_id_number_views.xml",
+        "views/res_country_views.xml",
     ],
     "demo": [
         "demo/pms_master_data_no_update.xml",
diff --git a/pms/static/description/index.html b/pms/static/description/index.html
index f9f2d0b40..7f9f245c0 100644
--- a/pms/static/description/index.html
+++ b/pms/static/description/index.html
@@ -367,7 +367,7 @@ ul.auto-toc {
 !! This file is generated by oca-gen-addon-readme !!
 !! changes will be overwritten.                   !!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-!! source digest: sha256:6c5b31264d3e7504c6c81ec1ae9fc2222be30ccd7362e5d444f6d7cfe97069fa
+!! source digest: sha256:084d2899cbc7b06f7ece70261b11256045c44b256ebff405d42812f6f32dd1fc
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
 <p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.png" /></a> <a class="reference external image-reference" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/OCA/pms/tree/14.0/pms"><img alt="OCA/pms" src="https://img.shields.io/badge/github-OCA%2Fpms-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/pms-14-0/pms-14-0-pms"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external image-reference" href="https://runboat.odoo-community.org/builds?repo=OCA/pms&amp;target_branch=14.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
 <p>This module is an all-in-one property management system (PMS) focused on medium-sized properties
diff --git a/pms/views/account_analytic_distribution_view.xml b/pms/views/account_analytic_distribution_views.xml
similarity index 100%
rename from pms/views/account_analytic_distribution_view.xml
rename to pms/views/account_analytic_distribution_views.xml
diff --git a/pms/views/account_analytic_line_view.xml b/pms/views/account_analytic_line_views.xml
similarity index 100%
rename from pms/views/account_analytic_line_view.xml
rename to pms/views/account_analytic_line_views.xml
diff --git a/pms/views/res_country_views.xml b/pms/views/res_country_views.xml
new file mode 100644
index 000000000..bd9b4ad33
--- /dev/null
+++ b/pms/views/res_country_views.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<odoo>
+
+    <record id="view_country_form" model="ir.ui.view">
+        <field name="name">view.country.form</field>
+        <field name="model">res.country</field>
+        <field name="inherit_id" ref="base.view_country_form" />
+        <field name="arch" type="xml">
+            <xpath expr="//field[@name='state_required']" position="after">
+                <field name="priority" />
+            </xpath>
+        </field>
+    </record>
+
+</odoo>
diff --git a/pms/views/res_partner_id_category_views.xml b/pms/views/res_partner_id_category_views.xml
new file mode 100644
index 000000000..98ba24020
--- /dev/null
+++ b/pms/views/res_partner_id_category_views.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<odoo>
+    <record id="view_partner_id_category_form_inherited" model="ir.ui.view">
+        <field name="name">view.partner.id.category.form.inherited</field>
+        <field name="model">res.partner.id_category</field>
+        <field
+            name="inherit_id"
+            ref="partner_identification.view_partner_id_category_form"
+        />
+        <field name="arch" type="xml">
+            <xpath expr='//field[@name="code"]' position='after'>
+                <field name="country_ids" widget="many2many_tags" />
+            </xpath>
+        </field>
+    </record>
+    <record id="view_partner_id_category_tree_inherited" model="ir.ui.view">
+        <field name="name">view.partner.id.category.tree.inherited</field>
+        <field name="model">res.partner.id_category</field>
+        <field
+            name="inherit_id"
+            ref="partner_identification.view_partner_id_category_tree"
+        />
+        <field name="arch" type="xml">
+            <xpath expr='//field[@name="code"]' position='after'>
+                <field name="country_ids" widget="many2many_tags" />
+            </xpath>
+        </field>
+    </record>
+</odoo>
diff --git a/pms/views/res_partner_id_number_views.xml b/pms/views/res_partner_id_number_views.xml
new file mode 100644
index 000000000..5090b88c4
--- /dev/null
+++ b/pms/views/res_partner_id_number_views.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<odoo>
+    <record id="inherit_partner_id_numbers_form" model="ir.ui.view">
+        <field name="name">inherit.res.partner.id_number.form</field>
+        <field name="model">res.partner.id_number</field>
+        <field
+            name="inherit_id"
+            ref="partner_identification.view_partner_id_numbers_form"
+        />
+        <field name="arch" type="xml">
+            <xpath expr="//field[@name='valid_until']" position="after">
+                <field name="country_id" />
+            </xpath>
+        </field>
+    </record>
+    <record id="inherit_partner_id_numbers_tree" model="ir.ui.view">
+        <field name="name">inherit.res.partner.id_number.tree</field>
+        <field name="model">res.partner.id_number</field>
+        <field
+            name="inherit_id"
+            ref="partner_identification.view_partner_id_numbers_tree"
+        />
+        <field name="arch" type="xml">
+            <xpath expr="//field[@name='valid_until']" position="after">
+                <field name="country_id" />
+            </xpath>
+        </field>
+    </record>
+</odoo>