diff --git a/odoo/addons/base/data/ir_module_module.xml b/odoo/addons/base/data/ir_module_module.xml
index 92970737040..95bd2121d03 100644
--- a/odoo/addons/base/data/ir_module_module.xml
+++ b/odoo/addons/base/data/ir_module_module.xml
@@ -8,6 +8,7 @@
             <field name="sequence">17</field>
             <field name="category_id" ref="base.module_category_administration"/>
             <field name="application" eval="True"/>
+            <field name="state">uninstallable</field>
             <field name="summary">Create and Customize Applications</field>
             <field name="license">OEEL-1</field>
             <field name="author">Odoo S.A.</field>
@@ -22,6 +23,7 @@
             <field name="sequence">11</field>
             <field name="category_id" ref="base.module_category_hr_timesheet"/>
             <field name="application" eval="True"/>
+            <field name="state">uninstallable</field>
             <field name="summary">Track time &amp; costs</field>
             <field name="license">OEEL-1</field>
             <field name="author">Odoo S.A.</field>
@@ -36,6 +38,7 @@
             <field name="shortdesc">Accounting</field>
             <field name="category_id" ref="base.module_category_accounting_and_finance"/>
             <field name="application" eval="True"/>
+            <field name="state">uninstallable</field>
             <field name="summary">Accounting, Taxes, Budgets, Assets...</field>
             <field name="license">OEEL-1</field>
             <field name="author">Odoo S.A.</field>
@@ -50,6 +53,7 @@
             <field name="sequence">65</field>
             <field name="category_id" ref="base.module_category_helpdesk"/>
             <field name="application" eval="True"/>
+            <field name="state">uninstallable</field>
             <field name="summary">Track support tickets</field>
             <field name="license">OEEL-1</field>
             <field name="author">Odoo S.A.</field>
@@ -63,6 +67,7 @@
             <field name="shortdesc">Appraisal</field>
             <field name="category_id" ref="base.module_category_hr_appraisal"/>
             <field name="application" eval="True"/>
+            <field name="state">uninstallable</field>
             <field name="summary">Assess your employees</field>
             <field name="license">OEEL-1</field>
             <field name="author">Odoo S.A.</field>
@@ -77,6 +82,7 @@
             <field name="sequence">111</field>
             <field name="category_id" ref="base.module_category_mass_mailing"/>
             <field name="application" eval="True"/>
+            <field name="state">uninstallable</field>
             <field name="summary">Build automated mailing campaigns</field>
             <field name="license">OEEL-1</field>
             <field name="author">Odoo S.A.</field>
@@ -91,6 +97,7 @@
             <field name="category_id" ref="base.module_category_manufacturing"/>
             <field name="sequence">17</field>
             <field name="application" eval="True"/>
+            <field name="state">uninstallable</field>
             <field name="summary">PLM, ECOs, Versions</field>
             <field name="license">OEEL-1</field>
             <field name="author">Odoo S.A.</field>
@@ -105,6 +112,7 @@
             <field name="sequence">17</field>
             <field name="category_id" ref="base.module_category_manufacturing"/>
             <field name="application" eval="True"/>
+            <field name="state">uninstallable</field>
             <field name="summary">Quality Alerts, Control Points</field>
             <field name="license">OEEL-1</field>
             <field name="author">Odoo S.A.</field>
@@ -131,6 +139,7 @@
             <field name="shortdesc">Project Forecast</field>
             <field name="category_id" ref="base.module_category_project_management"/>
             <field name="application" eval="True"/>
+            <field name="state">uninstallable</field>
             <field name="summary">Project forecasts, resource allocation</field>
             <field name="license">OEEL-1</field>
             <field name="author">Odoo S.A.</field>
@@ -144,6 +153,7 @@
             <field name="shortdesc">Subscriptions</field>
             <field name="category_id" ref="base.module_category_sales_management"/>
             <field name="application" eval="True"/>
+            <field name="state">uninstallable</field>
             <field name="summary">MRR, Churn, Recurring payments</field>
             <field name="license">OEEL-1</field>
             <field name="author">Odoo S.A.</field>
@@ -171,6 +181,7 @@
             <field name="sequence">14</field>
             <field name="category_id" ref="base.module_category_warehouse_management"/>
             <field name="application" eval="True"/>
+            <field name="state">uninstallable</field>
             <field name="summary">Barcode scanner for warehouses</field>
             <field name="license">OEEL-1</field>
             <field name="author">Odoo S.A.</field>
@@ -185,6 +196,7 @@
             <field name="sequence">100</field>
             <field name="category_id" ref="base.module_category_sales_management"/>
             <field name="application" eval="True"/>
+            <field name="state">uninstallable</field>
             <field name="summary">Call using VoIP</field>
             <field name="license">OEEL-1</field>
             <field name="author">Odoo S.A.</field>
@@ -198,6 +210,7 @@
             <field name="shortdesc">Appointments</field>
             <field name="category_id" ref="base.module_category_sales_management"/>
             <field name="application" eval="True"/>
+            <field name="state">uninstallable</field>
             <field name="summary">Online appointments scheduler</field>
             <field name="license">OEEL-1</field>
             <field name="author">Odoo S.A.</field>
@@ -212,6 +225,7 @@
             <field name="shortdesc">MRP II</field>
             <field name="category_id" ref="base.module_category_manufacturing"/>
             <field name="application" eval="True"/>
+            <field name="state">uninstallable</field>
             <field name="summary">Work Orders, Planing, Routing</field>
             <field name="license">OEEL-1</field>
             <field name="author">Odoo S.A.</field>
@@ -226,6 +240,7 @@
             <field name="shortdesc">Android &amp; iPhone</field>
             <field name="category_id" ref="base.module_category_administration"/>
             <field name="application" eval="True"/>
+            <field name="state">uninstallable</field>
             <field name="summary">Support for Android &amp; iOS Apps</field>
             <field name="license">OEEL-1</field>
             <field name="author">Odoo S.A.</field>
@@ -239,6 +254,7 @@
             <field name="shortdesc">Twitter Wall</field>
             <field name="summary">Interactive twitter wall for events</field>
             <field name="category_id" ref="base.module_category_website"/>
+            <field name="state">uninstallable</field>
             <field name="license">OEEL-1</field>
             <field name="author">Odoo S.A.</field>
             <field name="to_buy" eval="True"/>
@@ -250,6 +266,7 @@
             <field name="shortdesc">Form Builder</field>
             <field name="summary">Customize web forms with drag and drop</field>
             <field name="category_id" ref="base.module_category_website"/>
+            <field name="state">uninstallable</field>
             <field name="license">OEEL-1</field>
             <field name="author">Odoo S.A.</field>
             <field name="to_buy" eval="True"/>
diff --git a/odoo/addons/base/views/ir_module_views.xml b/odoo/addons/base/views/ir_module_views.xml
index 30cdd249f17..ebf6700ecea 100644
--- a/odoo/addons/base/views/ir_module_views.xml
+++ b/odoo/addons/base/views/ir_module_views.xml
@@ -67,7 +67,7 @@
                         </h3>
                         <div>
                             <button name="button_immediate_install" string="Install" attrs="{'invisible': ['|', ('to_buy','=',True), ('state','!=', 'uninstalled')]}" type="object" class="btn btn-primary"/>
-                            <a href="https://odoo.com/pricing?utm_source=db&amp;utm_medium=module" class="btn btn-primary" states="uninstalled" attrs="{'invisible': [('to_buy','=',False)]}" role="button">Upgrade</a>
+                            <a href="https://odoo.com/pricing?utm_source=db&amp;utm_medium=module" class="btn btn-primary" states="uninstalled,uninstallable" attrs="{'invisible': [('to_buy','=',False)]}" role="button">Upgrade</a>
                             <button name="button_immediate_upgrade" states="installed" string="Upgrade" type="object" class="btn btn-primary"/>
                             <button name="button_uninstall_wizard" states="installed" string="Uninstall" type="object"  class="btn btn-secondary"/>
                             <button name="button_uninstall_cancel" states="to remove" string="Cancel Uninstall" type="object" class="btn btn-secondary"/>
@@ -187,7 +187,7 @@
                             <a t-att-href="record.website.raw_value" target="_blank" attrs="{'invisible':[('website', '=', '')]}" class="btn btn-sm btn-secondary float-right" role="button">Learn More</a>
                             <a type="edit" class="btn btn-secondary btn-sm float-right" role="button" attrs="{'invisible': [('website', '&lt;&gt;', '')]}">Module Info</a>
                             <button type="object" class="btn btn-primary btn-sm" name="button_immediate_install" states="uninstalled" t-if="! record.to_buy.raw_value">Install</button>
-                            <a href="https://odoo.com/pricing?utm_source=db&amp;utm_medium=module" class="btn btn-info btn-sm" states="uninstalled" t-if="record.to_buy.raw_value" role="button">Upgrade</a>
+                            <a href="https://odoo.com/pricing?utm_source=db&amp;utm_medium=module" class="btn btn-info btn-sm" states="uninstalled,uninstallable" t-if="record.to_buy.raw_value" role="button">Upgrade</a>
                             <div t-if="installed" class="text-muted float-left">Installed</div>
                             <button states="to remove" type="object" class="btn btn-sm btn-primary" name="button_uninstall_cancel">Cancel Uninstall</button>
                             <button states="to install" type="object" class="btn btn-sm btn-primary" name="button_install_cancel">Cancel Install</button>