[IMP] base: improve kanban of modules, cards not clickable (top-right menu)

[NEW] base: show enterprise module, with an 'upgrade' button
[IMP] *: some modules renaming, and improved copywriting of manifest
[IMP] *: utm on links to odoo.com

56 files changed, 316 insertions, 80 deletions

diff --git a/addons/account/__manifest__.py b/addons/account/__manifest__.py
index 5fc2facae3a..13d366f8200 100644
--- a/addons/account/__manifest__.py
+++ b/addons/account/__manifest__.py
@@ -1,10 +1,10 @@
 # -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 {
-    'name' : 'Invoicing Management',
+    'name' : 'Invoicing',
     'version' : '1.1',
     'summary': 'Invoices & Payments',
-    'sequence': 30,
+    'sequence': 15,
     'description': """
 Invoicing & Payments
 ====================
diff --git a/addons/account/views/account_portal_templates.xml b/addons/account/views/account_portal_templates.xml
index dc7d1c61f65..f7fb01a3f20 100644
--- a/addons/account/views/account_portal_templates.xml
+++ b/addons/account/views/account_portal_templates.xml
@@ -103,7 +103,7 @@
                             </div>
                         </div>
                         <div class="text-center d-none d-md-block mt4 o_portal_brand">
-                            Powered by <a target="_blank" href="http://www.odoo.com">Odoo</a>
+                            Powered by <a target="_blank" href="http://www.odoo.com?utm_source=db&amp;utm_medium=portal">Odoo</a>
                         </div>
                     </div>
                 </div>
diff --git a/addons/auth_signup/data/auth_signup_data.xml b/addons/auth_signup/data/auth_signup_data.xml
index 6e6c50845ce..658ea04d251 100644
--- a/addons/auth_signup/data/auth_signup_data.xml
+++ b/addons/auth_signup/data/auth_signup_data.xml
@@ -86,7 +86,7 @@
 <tr><td align="center" style="min-width: 590px;">
     <table border="0" cellpadding="0" cellspacing="0" width="590" style="min-width: 590px; background-color: #F1F1F1; color: #454748; padding: 8px; border-collapse:separate;">
       <tr><td style="text-align: center; font-size: 13px;">
-        Powered by <a target="_blank" href="https://www.odoo.com" style="color: #875A7B;">Odoo</a>
+        Powered by <a target="_blank" href="https://www.odoo.com?utm_source=db&amp;utm_medium=auth" style="color: #875A7B;">Odoo</a>
       </td></tr>
     </table>
 </td></tr>
@@ -144,7 +144,7 @@
                         Your sign in email is: <b><a href="/web/login?login=${object.email}" target="_blank">${object.email}</a></b><br /><br />
                         Never heard of Odoo? It’s a all-in-one business software loved by 3+ million users. It will considerably improve your experience at work and increase your productivity.
                         <br /><br />
-                        Have a look at the <a href="https://www.odoo.com/page/tour" style="color: #875A7B;">Odoo Tour</a> to discover the tool.
+                        Have a look at the <a href="https://www.odoo.com/page/tour?utm_source=db&amp;utm_medium=auth" style="color: #875A7B;">Odoo Tour</a> to discover the tool.
                         <br /><br />
                         Enjoy Odoo!<br />
                         --<br/>The ${object.company_id.name} Team
@@ -184,7 +184,7 @@
 <tr><td align="center" style="min-width: 590px;">
     <table border="0" cellpadding="0" cellspacing="0" width="590" style="min-width: 590px; background-color: #F1F1F1; color: #454748; padding: 8px; border-collapse:separate;">
       <tr><td style="text-align: center; font-size: 13px;">
-        Powered by <a target="_blank" href="https://www.odoo.com" style="color: #875A7B;">Odoo</a>
+        Powered by <a target="_blank" href="https://www.odoo.com?utm_source=db&amp;utm_medium=auth" style="color: #875A7B;">Odoo</a>
       </td></tr>
     </table>
 </td></tr>
@@ -276,7 +276,7 @@
 <tr><td align="center" style="min-width: 590px;">
     <table border="0" cellpadding="0" cellspacing="0" width="590" style="min-width: 590px; background-color: #F1F1F1; color: #454748; padding: 8px; border-collapse:separate;">
       <tr><td style="text-align: center; font-size: 13px;">
-        Powered by <a target="_blank" href="https://www.odoo.com" style="color: #875A7B;">Odoo</a>
+        Powered by <a target="_blank" href="https://www.odoo.com?utm_source=db&amp;utm_medium=auth" style="color: #875A7B;">Odoo</a>
       </td></tr>
     </table>
 </td></tr>
diff --git a/addons/calendar/__manifest__.py b/addons/calendar/__manifest__.py
index 3627eb721c8..b0b8b577ca3 100644
--- a/addons/calendar/__manifest__.py
+++ b/addons/calendar/__manifest__.py
@@ -6,7 +6,7 @@
     'version': '1.0',
     'sequence': 130,
     'depends': ['base', 'mail'],
-    'summary': 'Schedule your meetings and send invitations',
+    'summary': 'Schedule employees meetings',
     'description': """
 This is a full-featured calendar system.
 ========================================
diff --git a/addons/gamification/data/badge.xml b/addons/gamification/data/badge.xml
index 61112ffbd9a..6596bcfe0dc 100644
--- a/addons/gamification/data/badge.xml
+++ b/addons/gamification/data/badge.xml
@@ -139,7 +139,7 @@
 <tr><td align="center" style="min-width: 590px;">
     <table width="590" border="0" cellpadding="0" style="min-width: 590px; background-color: #F1F1F1; color: #454748; padding: 8px; border-collapse:separate;">
       <tr><td style="text-align: center; font-size: 14px;">
-        Powered by <a target="_blank" href="https://www.odoo.com" style="color: #875A7B;">Odoo</a>
+        Powered by <a target="_blank" href="https://www.odoo.com?utm_source=db&amp;utm_medium=gamification" style="color: #875A7B;">Odoo</a>
       </td></tr>
     </table>
 </td></tr>
diff --git a/addons/hr/data/hr_data.xml b/addons/hr/data/hr_data.xml
index 58afb0ede52..5416e7ecd06 100644
--- a/addons/hr/data/hr_data.xml
+++ b/addons/hr/data/hr_data.xml
@@ -46,7 +46,7 @@
 <tr><td align="center" style="min-width: 590px;">
     <table border="0" cellpadding="0" cellspacing="0" width="590" style="min-width: 590px; background-color: #F1F1F1; color: #454748; padding: 8px; border-collapse:separate;">
       <tr><td style="text-align: center; font-size: 13px;">
-        Powered by <a target="_blank" href="https://www.odoo.com" style="color: #875A7B;">Odoo</a>
+        Powered by <a target="_blank" href="https://www.odoo.com?utm_source=db&amp;utm_medium=hr" style="color: #875A7B;">Odoo</a>
       </td></tr>
     </table>
 </td></tr>
diff --git a/addons/hr_holidays/__manifest__.py b/addons/hr_holidays/__manifest__.py
index e070dc21b73..4be06d2e2ab 100644
--- a/addons/hr_holidays/__manifest__.py
+++ b/addons/hr_holidays/__manifest__.py
@@ -5,7 +5,6 @@
     'name': 'Leaves',
     'version': '1.5',
     'category': 'Human Resources',
-    'sequence': 27,
     'summary': 'Allocate leaves and follow leave requests',
     'website': 'https://www.odoo.com/page/leaves',
     'description': """
diff --git a/addons/hr_recruitment/__manifest__.py b/addons/hr_recruitment/__manifest__.py
index b0f225d2fa1..2a3a732c797 100644
--- a/addons/hr_recruitment/__manifest__.py
+++ b/addons/hr_recruitment/__manifest__.py
@@ -6,7 +6,7 @@
     'version': '1.0',
     'category': 'Human Resources',
     'sequence': 90,
-    'summary': 'Handle your hiring process from applications to contracts',
+    'summary': 'Track your recruitment pipeline',
     'description': "",
     'website': 'https://www.odoo.com/page/recruitment',
     'depends': [
diff --git a/addons/hr_recruitment/data/hr_recruitment_data.xml b/addons/hr_recruitment/data/hr_recruitment_data.xml
index 786a623cd2e..404d6691b34 100644
--- a/addons/hr_recruitment/data/hr_recruitment_data.xml
+++ b/addons/hr_recruitment/data/hr_recruitment_data.xml
@@ -109,7 +109,7 @@
                 See you soon,
                 <div style="font-size: 11px; color: grey;">
                     -- <br/>
-                    Odoo HR Team
+                    The HR Team
                     % if 'website_url' in object.job_id and object.job_id.website_url
                         Discover <a href="/jobs" style="text-decoration:none;color:#717188;">all our jobs</a>.<br/>
                     % endif
@@ -126,14 +126,6 @@
                 quickly enough (just reply to this email).
                 <br/>
 
-                <hr width="97%" style="background-color: rgb(204,204,204); border: medium none; clear: both; display: block; font-size: 0px; min-height: 1px; line-height: 0; margin: 16px 0px 16px 0px;"/>
-                <h3 style="color:#9A6C8E;"><strong>Want to learn about us?</strong></h3>
-                <ol>
-                    <li><a style="color:#1CC5A9" href="https://www.odoo.com/blog/odoo-news-5/post/the-odoo-story-56">Founders' story</a></li>
-                    <li><a style="color:#1CC5A9" href="https://www.slideshare.net/openobject/the-odoo-culture">The Odoo Culture</a></li>
-                    <li><a style="color:#1CC5A9" href="https://www.odoo.com/page/about-us">About us</a></li>
-                </ol>
-
                 <hr width="97%" style="background-color: rgb(204,204,204); border: medium none; clear: both; display: block; font-size: 0px; min-height: 1px; line-height: 0; margin: 17px 0px 16px 0px;"/>
                 % set location = ''
                 % if object.job_id.address_id.name:
@@ -229,14 +221,6 @@
                 feedback</strong> or if you don't get news from us
                 quickly enough (just reply to this email).
 
-                <hr width="97%" style="background-color: rgb(204,204,204); border: medium none; clear: both; display: block; font-size: 0px; min-height: 1px; line-height: 0; margin: 16px 0px 16px 0px;"/>
-                <h3 style="color:#9A6C8E;"><strong>Want to learn more?</strong></h3>
-                <ol>
-                    <li><a style="color:#1CC5A9" href="https://www.odoo.com/blog/odoo-news-5/post/the-odoo-story-56">Founders' story</a></li>
-                    <li><a style="color:#1CC5A9" href="https://www.slideshare.net/openobject/the-odoo-culture">The Odoo Culture</a></li>
-                    <li><a style="color:#1CC5A9" href="https://www.odoo.com/page/about-us">About us</a></li>
-                </ol>
-
                 <hr width="97%" style="background-color: rgb(204,204,204); border: medium none; clear: both; display: block; font-size: 0px; min-height: 1px; line-height: 0; margin: 17px 0px 16px 0px;"/>
                 % set location = ''
                 % if object.job_id.address_id.name:
diff --git a/addons/hr_timesheet/__manifest__.py b/addons/hr_timesheet/__manifest__.py
index f576d958f41..cac0188cc03 100644
--- a/addons/hr_timesheet/__manifest__.py
+++ b/addons/hr_timesheet/__manifest__.py
@@ -3,11 +3,11 @@
 
 
 {
-    'name': 'Timesheets',
+    'name': 'Task Logs',
     'version': '1.0',
     'category': 'Human Resources',
     'sequence': 23,
-    'summary': 'Track and validate employee time',
+    'summary': 'Track employee time on tasks',
     'description': """
 This module implements a timesheet system.
 ==========================================
@@ -38,6 +38,6 @@ up a management by affair.
         'data/hr_timesheet_demo.xml',
     ],
     'installable': True,
-    'application': True,
+    'application': False,
     'auto_install': False,
 }
diff --git a/addons/hr_timesheet/views/hr_timesheet_views.xml b/addons/hr_timesheet/views/hr_timesheet_views.xml
index 8c45e14c07c..b6522f559e7 100644
--- a/addons/hr_timesheet/views/hr_timesheet_views.xml
+++ b/addons/hr_timesheet/views/hr_timesheet_views.xml
@@ -230,7 +230,7 @@
 
         <record id="act_hr_timesheet_line_view_kanban" model="ir.actions.act_window.view">
             <field name="view_mode">kanban</field>
-            <field name="sequence">3</field>
+            <field name="sequence">6</field>
             <field name="view_id" ref="hr_timesheet.view_kanban_account_analytic_line"/>
             <field name="act_window_id" ref="act_hr_timesheet_line"/>
         </record>
diff --git a/addons/mail/__manifest__.py b/addons/mail/__manifest__.py
index da64ac710ae..dc06344f35c 100644
--- a/addons/mail/__manifest__.py
+++ b/addons/mail/__manifest__.py
@@ -4,8 +4,7 @@
     'name': 'Discuss',
     'version': '1.0',
     'category': 'Discuss',
-    'sequence': 25,
-    'summary': 'Enhance team communication with private chat and channels',
+    'summary': 'Chat, mail gateway and private channels',
     'description': "",
     'website': 'https://www.odoo.com/page/discuss',
     'depends': ['base', 'base_setup', 'bus', 'web_tour'],
diff --git a/addons/maintenance/__manifest__.py b/addons/maintenance/__manifest__.py
index bc38accb482..b9263c33b84 100644
--- a/addons/maintenance/__manifest__.py
+++ b/addons/maintenance/__manifest__.py
@@ -6,7 +6,7 @@
     'sequence': 125,
     'category': 'Human Resources',
     'description': """
-        Track equipment and manage maintenance requests.""",
+        Track equipments and maintenance requests""",
     'depends': ['mail'],
     'summary': 'Track equipment and manage maintenance requests',
     'website': 'https://www.odoo.com/page/tpm-maintenance-software',
diff --git a/addons/mrp/__manifest__.py b/addons/mrp/__manifest__.py
index 8f6cb72fb69..6206a3a1c91 100644
--- a/addons/mrp/__manifest__.py
+++ b/addons/mrp/__manifest__.py
@@ -7,8 +7,8 @@
     'version': '2.0',
     'website': 'https://www.odoo.com/page/manufacturing',
     'category': 'Manufacturing',
-    'sequence': 14,
-    'summary': 'Manufacture products and process work orders',
+    'sequence': 16,
+    'summary': 'Manufacturing Orders & BOMs',
     'depends': ['product', 'stock', 'resource'],
     'description': "",
     'data': [
diff --git a/addons/point_of_sale/__manifest__.py b/addons/point_of_sale/__manifest__.py
index b77754f9039..bdc5f4983ec 100644
--- a/addons/point_of_sale/__manifest__.py
+++ b/addons/point_of_sale/__manifest__.py
@@ -6,7 +6,7 @@
     'version': '1.0.1',
     'category': 'Point Of Sale',
     'sequence': 20,
-    'summary': 'Register sales in shops and restaurants with a touchscreen interface',
+    'summary': 'Tablet POS: shops and restaurants',
     'description': "",
     'depends': ['stock_account', 'barcodes', 'web_editor', 'digest'],
     'data': [
diff --git a/addons/portal/data/portal_data.xml b/addons/portal/data/portal_data.xml
index 47535af4f5e..04331178a48 100644
--- a/addons/portal/data/portal_data.xml
+++ b/addons/portal/data/portal_data.xml
@@ -84,7 +84,7 @@
 <tr><td align="center" style="min-width: 590px;">
     <table border="0" cellpadding="0" cellspacing="0" width="590" style="min-width: 590px; background-color: #F1F1F1; color: #454748; padding: 8px; border-collapse:separate;">
       <tr><td style="text-align: center; font-size: 13px;">
-        Powered by <a target="_blank" href="https://www.odoo.com" style="color: #875A7B;">Odoo</a>
+        Powered by <a target="_blank" href="https://www.odoo.com?utm_source=db&amp;utm_medium=portalinvite" style="color: #875A7B;">Odoo</a>
       </td></tr>
     </table>
 </td></tr>
diff --git a/addons/portal/views/portal_templates.xml b/addons/portal/views/portal_templates.xml
index 63c3b68d12a..840b44275e6 100644
--- a/addons/portal/views/portal_templates.xml
+++ b/addons/portal/views/portal_templates.xml
@@ -57,7 +57,7 @@
                 <footer >
                     <div class="container mt16 mb16" id="footer">
                         <div class="float-right" t-ignore="true" t-if="not editable">
-                            Powered by <a target="_blank" href="http://www.odoo.com">Odoo</a>
+                            Powered by <a target="_blank" href="http://www.odoo.com?utm_source=db&amp;utm_medium=portal">Odoo</a>
                         </div>
                     </div>
                 </footer>
diff --git a/addons/purchase/__manifest__.py b/addons/purchase/__manifest__.py
index 330f10f186e..d82795f39e2 100644
--- a/addons/purchase/__manifest__.py
+++ b/addons/purchase/__manifest__.py
@@ -6,7 +6,7 @@
     'version': '1.2',
     'category': 'Purchases',
     'sequence': 60,
-    'summary': 'Manage your purchase orders and agreements with your vendors',
+    'summary': 'Purchase orders, tenders and agreements',
     'description': "",
     'website': 'https://www.odoo.com/page/purchase',
     'depends': ['account'],
diff --git a/addons/sale_management/__manifest__.py b/addons/sale_management/__manifest__.py
index 8048b9adcc1..ed70455cbf2 100644
--- a/addons/sale_management/__manifest__.py
+++ b/addons/sale_management/__manifest__.py
@@ -5,8 +5,8 @@
     'name': 'Sales',
     'version': '1.0',
     'category': 'Sales',
-    'sequence': 15,
-    'summary': 'Send quotations, follow orders, create invoices',
+    'sequence': 17,
+    'summary': 'From quotes to invoices',
     'description': """
 Manage sales quotations and orders
 ==================================
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index 3f2d0ba0ee9..1f3ad37d2db 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -1493,7 +1493,7 @@
                 <li><i class="fa fa-check"></i> Mobile support</li>
                 <li><i class="fa fa-check"></i> Upgrade to future versions</li>
                 <li><i class="fa fa-check"></i> Bugfixes guarantee</li>
-                <li><a href="http://www.odoo.com/editions" target="_blank"><i class="fa fa-plus"></i> And more</a></li>
+                <li><a href="http://www.odoo.com/editions?utm_source=db&amp;utm_medium=enterprise" target="_blank"><i class="fa fa-plus"></i> And more</a></li>
             </ul>
         </div>
         <div class="col-6">
diff --git a/addons/web/views/webclient_templates.xml b/addons/web/views/webclient_templates.xml
index 34ae3f8dc9e..e7ffd017cc8 100644
--- a/addons/web/views/webclient_templates.xml
+++ b/addons/web/views/webclient_templates.xml
@@ -352,7 +352,7 @@
                         <t t-if="not disable_database_manager">
                             <a class="" href="/web/database/manager">Manage Databases</a> |
                         </t>
-                        <a href="https://www.odoo.com" target="_blank">Powered by <span>Odoo</span></a>
+                        <a href="https://www.odoo.com?utm_source=db&amp;utm_medium=auth" target="_blank">Powered by <span>Odoo</span></a>
                     </div>
                 </div>
             </div>
@@ -428,7 +428,7 @@
             </t>
         </div>
         <div class="o_sub_menu_footer">
-            Powered by <a href="http://www.odoo.com" target="_blank"><span>Odoo</span></a>
+            Powered by <a href="http://www.odoo.com?utm_source=db&amp;utm_medium=auth" target="_blank"><span>Odoo</span></a>
         </div>
     </template>
     <template id="web.menu_secondary_submenu">
diff --git a/addons/website/__manifest__.py b/addons/website/__manifest__.py
index 780a255667b..143e6c280f6 100644
--- a/addons/website/__manifest__.py
+++ b/addons/website/__manifest__.py
@@ -4,7 +4,7 @@
 {
     'name': 'Website',
     'category': 'Website',
-    'sequence': 50,
+    'sequence': 7,
     'summary': 'Build a website fully integrated with your operations',
     'website': 'https://www.odoo.com/page/website-builder',
     'version': '1.0',
diff --git a/addons/website/views/website_templates.xml b/addons/website/views/website_templates.xml
index c7a7eee18a3..3d7d7201a7a 100644
--- a/addons/website/views/website_templates.xml
+++ b/addons/website/views/website_templates.xml
@@ -224,8 +224,8 @@
 
 <template id="brand_promotion" name="Brand Promotion">
     <div class="o_brand_promotion">
-        Create a <a target="_blank" href="http://www.odoo.com/page/website-builder">free website</a> with
-        <a target="_blank" class="badge badge-danger" href="http://www.odoo.com/page/website-builder">Odoo</a>
+        Create a <a target="_blank" href="http://www.odoo.com/page/website-builder?utm_source=db&amp;utm_medium=website">free website</a> with
+        <a target="_blank" class="badge badge-danger" href="http://www.odoo.com/page/website-builder?utm_source=db&amp;utm_medium=website">Odoo</a>
     </div>
 </template>
 
diff --git a/addons/website_crm_partner_assign/data/crm_partner_assign_data.xml b/addons/website_crm_partner_assign/data/crm_partner_assign_data.xml
index 7505007ac67..3d605579f1f 100644
--- a/addons/website_crm_partner_assign/data/crm_partner_assign_data.xml
+++ b/addons/website_crm_partner_assign/data/crm_partner_assign_data.xml
@@ -110,7 +110,7 @@
 <tr><td align="center" style="min-width: 590px;">
     <table border="0" cellpadding="0" cellspacing="0" width="590" style="min-width: 590px; background-color: #F1F1F1; color: #454748; padding: 8px; border-collapse:separate;">
       <tr><td style="text-align: center; font-size: 13px;">
-        Powered by <a target="_blank" href="https://www.odoo.com" style="color: #875A7B;">Odoo</a>
+        Powered by <a target="_blank" href="https://www.odoo.com?utm_source=db&amp;utm_medium=website" style="color: #875A7B;">Odoo</a>
       </td></tr>
     </table>
 </td></tr>
diff --git a/addons/website_event/__manifest__.py b/addons/website_event/__manifest__.py
index b11138844fd..f2c01a1ad72 100644
--- a/addons/website_event/__manifest__.py
+++ b/addons/website_event/__manifest__.py
@@ -4,7 +4,7 @@
     'name': 'Events',
     'category': 'Website',
     'sequence': 166,
-    'summary': 'Promote events and manage online registrations',
+    'summary': 'Publish events, sell tickets',
     'website': 'https://www.odoo.com/page/events',
     'description': "",
     'depends': ['website', 'website_partner', 'website_mail', 'event'],
diff --git a/addons/website_event/views/event_templates.xml b/addons/website_event/views/event_templates.xml
index 9578d66115d..63b64c275be 100644
--- a/addons/website_event/views/event_templates.xml
+++ b/addons/website_event/views/event_templates.xml
@@ -702,8 +702,8 @@
 <template id="website_event.brand_promotion" inherit_id="website.brand_promotion">
     <xpath expr="//div[hasclass('o_brand_promotion')]" position="replace">
         <div class="o_brand_promotion">
-            Powered by <a target="_blank" class="badge badge-danger" href="http://www.odoo.com/page/website-builder">Odoo</a>.
-            Try the <a target="_blank" href="http://www.odoo.com/page/website-builder">open source website builder</a>.
+            Powered by <a target="_blank" class="badge badge-danger" href="http://www.odoo.com/page/website-builder?utm_source=db&amp;utm_medium=website">Odoo</a>.
+            Try the <a target="_blank" href="http://www.odoo.com/page/website-builder?utm_source=db&amp;utm_medium=website">open source website builder</a>.
         </div>
     </xpath>
 </template>
diff --git a/addons/website_forum/data/forum_data.xml b/addons/website_forum/data/forum_data.xml
index 1567ab8d770..f4073cd71ab 100644
--- a/addons/website_forum/data/forum_data.xml
+++ b/addons/website_forum/data/forum_data.xml
@@ -228,7 +228,7 @@
 <tr><td align="center" style="min-width: 590px;">
     <table border="0" cellpadding="0" cellspacing="0" width="590" style="min-width: 590px; background-color: #F1F1F1; color: #454748; padding: 8px; border-collapse:separate;">
         <tr><td style="text-align: center; font-size: 13px;">
-            Powered by <a target="_blank" href="https://www.odoo.com" style="color: #875A7B;">Odoo</a>
+            Powered by <a target="_blank" href="https://www.odoo.com?utm_source=db&amp;utm_medium=forum" style="color: #875A7B;">Odoo</a>
         </td></tr>
     </table>
 </td></tr>
diff --git a/addons/website_mail_channel/data/mail_template_data.xml b/addons/website_mail_channel/data/mail_template_data.xml
index 0c53da05992..8d04ca72122 100644
--- a/addons/website_mail_channel/data/mail_template_data.xml
+++ b/addons/website_mail_channel/data/mail_template_data.xml
@@ -79,7 +79,7 @@
 <tr><td align="center" style="min-width: 590px;">
     <table border="0" cellpadding="0" cellspacing="0" width="590" style="min-width: 590px; background-color: #F1F1F1; color: #454748; padding: 8px; border-collapse:separate;">
       <tr><td style="text-align: center; font-size: 13px;">
-        Powered by <a target="_blank" href="https://www.odoo.com" style="color: #875A7B;">Odoo</a>
+        Powered by <a target="_blank" href="https://www.odoo.com?utm_source=db&amp;utm_medium=mail" style="color: #875A7B;">Odoo</a>
       </td></tr>
     </table>
 </td></tr>
@@ -166,7 +166,7 @@
 <tr><td align="center" style="min-width: 590px;">
     <table border="0" cellpadding="0" cellspacing="0" width="590" style="min-width: 590px; background-color: #F1F1F1; color: #454748; padding: 8px; border-collapse:separate;">
       <tr><td style="text-align: center; font-size: 13px;">
-        Powered by <a target="_blank" href="https://www.odoo.com" style="color: #875A7B;">Odoo</a>
+        Powered by <a target="_blank" href="https://www.odoo.com?utm_source=db&amp;utm_medium=mail" style="color: #875A7B;">Odoo</a>
       </td></tr>
     </table>
 </td></tr>
diff --git a/addons/website_quote/views/website_quote_templates.xml b/addons/website_quote/views/website_quote_templates.xml
index 26dc036962a..9b73aaf69f4 100644
--- a/addons/website_quote/views/website_quote_templates.xml
+++ b/addons/website_quote/views/website_quote_templates.xml
@@ -726,8 +726,8 @@
   <template id="website_quote.brand_promotion" inherit_id="website.brand_promotion">
       <xpath expr="//div[hasclass('o_brand_promotion')]" position="replace">
           <div class="o_brand_promotion">
-              Powered by <a target="_blank" class="badge badge-danger" href="http://www.odoo.com/page/website-builder">Odoo</a>,
-              an awesome <a target="_blank" href="http://www.odoo.com/page/crm">Open Source CRM</a>.
+              Powered by <a target="_blank" class="badge badge-danger" href="http://www.odoo.com/page/website-builder?utm_source=db&amp;utm_medium=website">Odoo</a>,
+              an awesome <a target="_blank" href="http://www.odoo.com/page/crm?utm_source=db&amp;utm_medium=website">Open Source CRM</a>.
           </div>
       </xpath>
   </template>
diff --git a/addons/website_sale/data/mail_template_data.xml b/addons/website_sale/data/mail_template_data.xml
index 9f28bc05af8..5cecc496363 100644
--- a/addons/website_sale/data/mail_template_data.xml
+++ b/addons/website_sale/data/mail_template_data.xml
@@ -97,7 +97,7 @@
 <tr><td align="center" style="min-width: 590px;">
     <table border="0" cellpadding="0" cellspacing="0" width="590" style="min-width: 590px; background-color: #F1F1F1; color: #454748; padding: 8px; border-collapse:separate;">
       <tr><td style="text-align: center; font-size: 13px;">
-        Powered by <a target="_blank" href="https://www.odoo.com" style="color: #875A7B;">Odoo</a>
+        Powered by <a target="_blank" href="https://www.odoo.com?utm_source=db&amp;utm_medium=website" style="color: #875A7B;">Odoo</a>
       </td></tr>
     </table>
 </td></tr>
diff --git a/addons/website_sale/views/templates.xml b/addons/website_sale/views/templates.xml
index 1daaaa6d6f0..78322a9805d 100644
--- a/addons/website_sale/views/templates.xml
+++ b/addons/website_sale/views/templates.xml
@@ -1597,8 +1597,8 @@
     <template id="website_sale.brand_promotion" inherit_id="website.brand_promotion">
         <xpath expr="//div[hasclass('o_brand_promotion')]" position="replace">
             <div class="o_brand_promotion">
-                Powered by <a target="_blank" class="badge badge-danger" href="http://www.odoo.com/page/website-builder">Odoo</a>,
-                the #1 <a target="_blank" href="http://www.odoo.com/page/e-commerce">Open Source eCommerce</a>.
+                Powered by <a target="_blank" class="badge badge-danger" href="http://www.odoo.com/page/website-builder?utm_source=db&amp;utm_medium=website">Odoo</a>,
+                the #1 <a target="_blank" href="http://www.odoo.com/page/e-commerce?utm_source=db&amp;utm_medium=website">Open Source eCommerce</a>.
             </div>
         </xpath>
     </template>
diff --git a/addons/website_slides/__manifest__.py b/addons/website_slides/__manifest__.py
index b31571171d2..28948a80ea5 100644
--- a/addons/website_slides/__manifest__.py
+++ b/addons/website_slides/__manifest__.py
@@ -3,7 +3,7 @@
     'name': 'Slides',
     'version': '1.0',
     'sequence': 145,
-    'summary': 'Publish videos, presentations and documents',
+    'summary': 'Publish videos, slides and documents',
     'website': 'https://www.odoo.com/page/slides',
     'category': 'Website',
     'description': """
diff --git a/odoo/addons/base/__manifest__.py b/odoo/addons/base/__manifest__.py
index 637656cb70a..d47214a5ce9 100644
--- a/odoo/addons/base/__manifest__.py
+++ b/odoo/addons/base/__manifest__.py
@@ -46,6 +46,7 @@ The kernel of Odoo, needed for all installation.
         'views/ir_qweb_widget_templates.xml',
         'views/ir_module_views.xml',
         'data/ir_module_category_data.xml',
+        'data/ir_module_module.xml',
         'report/ir_module_reports.xml',
         'report/ir_module_report_templates.xml',
         'wizard/base_module_update_views.xml',
diff --git a/odoo/addons/base/data/base_data.sql b/odoo/addons/base/data/base_data.sql
index 67d2fb9ada5..760205e3a89 100644
--- a/odoo/addons/base/data/base_data.sql
+++ b/odoo/addons/base/data/base_data.sql
@@ -64,6 +64,7 @@ CREATE TABLE ir_module_module (
     license character varying(32),
     sequence integer DEFAULT 100,
     auto_install boolean default False,
+    to_buy boolean default False,
     primary key(id)
 );
 ALTER TABLE ir_module_module add constraint name_uniq unique (name);
diff --git a/odoo/addons/base/data/ir_module_category_data.xml b/odoo/addons/base/data/ir_module_category_data.xml
index 9ee32afd9dd..64ae170d68a 100644
--- a/odoo/addons/base/data/ir_module_category_data.xml
+++ b/odoo/addons/base/data/ir_module_category_data.xml
@@ -161,6 +161,13 @@
             <field name="sequence">25</field>
         </record>
 
+        <record model="ir.module.category" id="module_category_helpdesk">
+            <field name="name">After-Sales</field>
+            <field name="description">After-sales services</field>
+            <field name="sequence">2</field>
+        </record>
+
+
         <record model="ir.module.category" id="module_category_theme">
             <field name="name">Theme</field>
             <field name="exclusive" eval="1"/>
diff --git a/odoo/addons/base/data/ir_module_module.xml b/odoo/addons/base/data/ir_module_module.xml
new file mode 100644
index 00000000000..0cd9dd6189a
--- /dev/null
+++ b/odoo/addons/base/data/ir_module_module.xml
@@ -0,0 +1,239 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <data>
+
+        <record model="ir.module.module" id="base.module_web_studio">
+            <field name="name">web_studio</field>
+            <field name="shortdesc">Studio</field>
+            <field name="sequence">17</field>
+            <field name="category_id" ref="base.module_category_administration"/>
+            <field name="application" eval="True"/>
+            <field name="summary">Create and Customize Applications</field>
+            <field name="license">OEEL-1</field>
+            <field name="author">Odoo S.A.</field>
+            <field name="to_buy" eval="True"/>
+            <field name="icon">/base/static/img/icons/web_studio.png</field>
+            <field name="website">https://odoo.com/page/studio?utm_source=db&amp;utm_medium=module</field>
+        </record>
+
+        <record model="ir.module.module" id="base.module_timesheet_grid">
+            <field name="name">timesheet_grid</field>
+            <field name="shortdesc">Timesheets</field>
+            <field name="sequence">11</field>
+            <field name="category_id" ref="base.module_category_hr_timesheet"/>
+            <field name="application" eval="True"/>
+            <field name="summary">Track time &amp; costs</field>
+            <field name="license">OEEL-1</field>
+            <field name="author">Odoo S.A.</field>
+            <field name="to_buy" eval="True"/>
+            <field name="icon">/base/static/img/icons/timesheet_grid.png</field>
+            <field name="website">https://www.odoo.com/page/timesheet-mobile-app?utm_source=db&amp;utm_medium=module</field>
+        </record>
+
+        <record model="ir.module.module" id="base.module_account_accountant">
+            <field name="name">account_accountant</field>
+            <field name="sequence">15</field>
+            <field name="shortdesc">Accounting</field>
+            <field name="category_id" ref="base.module_category_accounting_and_finance"/>
+            <field name="application" eval="True"/>
+            <field name="summary">Accounting, Taxes, Budgets, Assets...</field>
+            <field name="license">OEEL-1</field>
+            <field name="author">Odoo S.A.</field>
+            <field name="to_buy" eval="True"/>
+            <field name="icon">/base/static/img/icons/account_accountant.png</field>
+            <field name="website">https://www.odoo.com/page/accounting?utm_source=db&amp;utm_medium=module</field>
+        </record>
+
+        <record model="ir.module.module" id="base.module_helpdesk">
+            <field name="name">helpdesk</field>
+            <field name="shortdesc">Helpdesk</field>
+            <field name="sequence">65</field>
+            <field name="category_id" ref="base.module_category_helpdesk"/>
+            <field name="application" eval="True"/>
+            <field name="summary">Track support tickets</field>
+            <field name="license">OEEL-1</field>
+            <field name="author">Odoo S.A.</field>
+            <field name="to_buy" eval="True"/>
+            <field name="icon">/base/static/img/icons/helpdesk.png</field>
+            <field name="website">https://www.odoo.com/page/helpdesk?utm_source=db&amp;utm_medium=module</field>
+        </record>
+
+        <record model="ir.module.module" id="base.module_hr_appraisal">
+            <field name="name">hr_appraisal</field>
+            <field name="shortdesc">Appraisal</field>
+            <field name="category_id" ref="base.module_category_hr_appraisal"/>
+            <field name="application" eval="True"/>
+            <field name="summary">Assess your employees</field>
+            <field name="license">OEEL-1</field>
+            <field name="author">Odoo S.A.</field>
+            <field name="to_buy" eval="True"/>
+            <field name="icon">/base/static/img/icons/hr_appraisal.png</field>
+            <field name="website">https://www.odoo.com/page/appraisal?utm_source=db&amp;utm_medium=module</field>
+        </record>
+
+        <record model="ir.module.module" id="base.module_marketing_automation">
+            <field name="name">marketing_automation</field>
+            <field name="shortdesc">Marketing Automation</field>
+            <field name="sequence">111</field>
+            <field name="category_id" ref="base.module_category_mass_mailing"/>
+            <field name="application" eval="True"/>
+            <field name="summary">Build automated mailing campaigns</field>
+            <field name="license">OEEL-1</field>
+            <field name="author">Odoo S.A.</field>
+            <field name="to_buy" eval="True"/>
+            <field name="icon">/base/static/img/icons/marketing_automation.png</field>
+            <field name="website">https://www.odoo.com/page/marketing-automation?utm_source=db&amp;utm_medium=module</field>
+        </record>
+
+        <record model="ir.module.module" id="base.module_mrp_plm">
+            <field name="name">mrp_plm</field>
+            <field name="shortdesc">Product Lifecycle Management (PLM)</field>
+            <field name="category_id" ref="base.module_category_manufacturing"/>
+            <field name="sequence">17</field>
+            <field name="application" eval="True"/>
+            <field name="summary">PLM, ECOs, Versions</field>
+            <field name="license">OEEL-1</field>
+            <field name="author">Odoo S.A.</field>
+            <field name="to_buy" eval="True"/>
+            <field name="icon">/base/static/img/icons/mrp_plm.png</field>
+            <field name="website">https://www.odoo.com/page/mrp-plm?utm_source=db&amp;utm_medium=module</field>
+        </record>
+
+        <record model="ir.module.module" id="base.module_quality_control">
+            <field name="name">quality_control</field>
+            <field name="shortdesc">Quality</field>
+            <field name="sequence">17</field>
+            <field name="category_id" ref="base.module_category_manufacturing"/>
+            <field name="application" eval="True"/>
+            <field name="summary">Quality Alerts, Control Points</field>
+            <field name="license">OEEL-1</field>
+            <field name="author">Odoo S.A.</field>
+            <field name="to_buy" eval="True"/>
+            <field name="icon">/base/static/img/icons/quality_control.png</field>
+            <field name="website">https://www.odoo.com/page/quality-management-software?utm_source=db&amp;utm_medium=module</field>
+        </record>
+
+        <record model="ir.module.module" id="base.module_sale_ebay">
+            <field name="name">sale_ebay</field>
+            <field name="shortdesc">eBay Connector</field>
+            <field name="category_id" ref="base.module_category_sales_management"/>
+            <field name="application" eval="True"/>
+            <field name="summary">Sell on eBay easily</field>
+            <field name="license">OEEL-1</field>
+            <field name="author">Odoo S.A.</field>
+            <field name="to_buy" eval="True"/>
+            <field name="icon">/base/static/img/icons/sale_ebay.png</field>
+            <field name="website">https://www.odoo.com/page/sales?utm_source=db&amp;utm_medium=module</field>
+        </record>
+
+        <record model="ir.module.module" id="base.module_project_forecast">
+            <field name="name">project_forecast</field>
+            <field name="shortdesc">Project Forecast</field>
+            <field name="category_id" ref="base.module_category_project_management"/>
+            <field name="application" eval="True"/>
+            <field name="summary">Project forecasts, resource allocation</field>
+            <field name="license">OEEL-1</field>
+            <field name="author">Odoo S.A.</field>
+            <field name="to_buy" eval="True"/>
+            <field name="icon">/base/static/img/icons/project_forecast.png</field>
+            <field name="website">https://www.odoo.com/page/project?utm_source=db&amp;utm_medium=module</field>
+        </record>
+
+        <record model="ir.module.module" id="base.module_sale_subscription">
+            <field name="name">sale_subscription</field>
+            <field name="shortdesc">Subscriptions</field>
+            <field name="category_id" ref="base.module_category_sales_management"/>
+            <field name="application" eval="True"/>
+            <field name="summary">MRR, Churn, Recurring payments</field>
+            <field name="license">OEEL-1</field>
+            <field name="author">Odoo S.A.</field>
+            <field name="to_buy" eval="True"/>
+            <field name="icon">/base/static/img/icons/sale_subscription.png</field>
+            <field name="website">https://www.odoo.com/page/subscriptions?utm_source=db&amp;utm_medium=module</field>
+        </record>
+
+        <record model="ir.module.module" id="base.module_sign">
+            <field name="name">sign</field>
+            <field name="shortdesc">Sign</field>
+            <field name="category_id" ref="base.module_category_sign"/>
+            <field name="application" eval="True"/>
+            <field name="summary">Send documents to sign online</field>
+            <field name="license">OEEL-1</field>
+            <field name="author">Odoo S.A.</field>
+            <field name="to_buy" eval="True"/>
+            <field name="icon">/base/static/img/icons/sign.png</field>
+            <field name="website">https://www.odoo.com/page/sign?utm_source=db&amp;utm_medium=module</field>
+        </record>
+
+        <record model="ir.module.module" id="base.module_stock_barcode">
+            <field name="name">stock_barcode</field>
+            <field name="shortdesc">Barcode</field>
+            <field name="sequence">14</field>
+            <field name="category_id" ref="base.module_category_warehouse_management"/>
+            <field name="application" eval="True"/>
+            <field name="summary">Barcode scanner for warehouses</field>
+            <field name="license">OEEL-1</field>
+            <field name="author">Odoo S.A.</field>
+            <field name="to_buy" eval="True"/>
+            <field name="icon">/base/static/img/icons/stock_barcode.png</field>
+            <field name="website">https://www.odoo.com/page/warehouse?utm_source=db&amp;utm_medium=module</field>
+        </record>
+
+        <record model="ir.module.module" id="base.module_voip">
+            <field name="name">voip</field>
+            <field name="shortdesc">VoIP</field>
+            <field name="sequence">100</field>
+            <field name="category_id" ref="base.module_category_sales_management"/>
+            <field name="application" eval="True"/>
+            <field name="summary">Call using VoIP</field>
+            <field name="license">OEEL-1</field>
+            <field name="author">Odoo S.A.</field>
+            <field name="to_buy" eval="True"/>
+            <field name="icon">/base/static/img/icons/voip.png</field>
+            <field name="website">https://www.odoo.com/page/crm?utm_source=db&amp;utm_medium=module</field>
+        </record>
+
+        <record model="ir.module.module" id="base.module_website_calendar">
+            <field name="name">website_calendar</field>
+            <field name="shortdesc">Appointments</field>
+            <field name="category_id" ref="base.module_category_sales_management"/>
+            <field name="application" eval="True"/>
+            <field name="summary">Online appointments scheduler</field>
+            <field name="license">OEEL-1</field>
+            <field name="author">Odoo S.A.</field>
+            <field name="to_buy" eval="True"/>
+            <field name="icon">/base/static/img/icons/website_calendar.png</field>
+            <field name="website">https://www.odoo.com/page/appointments?utm_source=db&amp;utm_medium=module</field>
+        </record>
+
+        <record model="ir.module.module" id="base.module_mrp_workorder">
+            <field name="name">mrp_workorder</field>
+            <field name="sequence">16</field>
+            <field name="shortdesc">MRP II</field>
+            <field name="category_id" ref="base.module_category_manufacturing"/>
+            <field name="application" eval="True"/>
+            <field name="summary">Work Orders, Planing, Routing</field>
+            <field name="license">OEEL-1</field>
+            <field name="author">Odoo S.A.</field>
+            <field name="to_buy" eval="True"/>
+            <field name="icon">/base/static/img/icons/mrp_workorder.png</field>
+            <field name="website">https://www.odoo.com/page/mrp-cloud-software?utm_source=db&amp;utm_medium=module</field>
+        </record>
+
+        <record model="ir.module.module" id="base.module_web_mobile">
+            <field name="name">web_mobile</field>
+            <field name="sequence">220</field>
+            <field name="shortdesc">Android &amp; iPhone</field>
+            <field name="category_id" ref="base.module_category_administration"/>
+            <field name="application" eval="True"/>
+            <field name="summary">Support for Android &amp; iOS Apps</field>
+            <field name="license">OEEL-1</field>
+            <field name="author">Odoo S.A.</field>
+            <field name="to_buy" eval="True"/>
+            <field name="icon">/base/static/img/icons/web_mobile.png</field>
+            <field name="website">https://play.google.com/store/apps/details?id=com.odoo.mobile</field>
+        </record>
+
+
+    </data>
+</odoo>
diff --git a/odoo/addons/base/models/ir_module.py b/odoo/addons/base/models/ir_module.py
index caf9a51ca87..96ad1370808 100644
--- a/odoo/addons/base/models/ir_module.py
+++ b/odoo/addons/base/models/ir_module.py
@@ -292,6 +292,7 @@ class Module(models.Model):
     application = fields.Boolean('Application', readonly=True)
     icon = fields.Char('Icon URL')
     icon_image = fields.Binary(string='Icon', compute='_get_icon_image')
+    to_buy = fields.Boolean('Odoo Enterprise Module', default=False)
 
     _sql_constraints = [
         ('name_uniq', 'UNIQUE (name)', 'The name of the module must be unique!'),
@@ -685,7 +686,7 @@ class Module(models.Model):
             values = self.get_values_from_terp(terp)
 
             if mod:
-                updated_values = {}
+                updated_values = {'to_buy': False}
                 for key in values:
                     old = getattr(mod, key)
                     updated = tools.ustr(values[key]) if isinstance(values[key], pycompat.string_types) else values[key]
diff --git a/odoo/addons/base/static/img/icons/account_accountant.png b/odoo/addons/base/static/img/icons/account_accountant.png
new file mode 100644
index 00000000000..9f0c5c6dad4
--- /dev/null
+++ b/odoo/addons/base/static/img/icons/account_accountant.png
diff --git a/odoo/addons/base/static/img/icons/helpdesk.png b/odoo/addons/base/static/img/icons/helpdesk.png
new file mode 100644
index 00000000000..da83205e710
--- /dev/null
+++ b/odoo/addons/base/static/img/icons/helpdesk.png
diff --git a/odoo/addons/base/static/img/icons/hr_appraisal.png b/odoo/addons/base/static/img/icons/hr_appraisal.png
new file mode 100644
index 00000000000..9728a68221a
--- /dev/null
+++ b/odoo/addons/base/static/img/icons/hr_appraisal.png
diff --git a/odoo/addons/base/static/img/icons/marketing_automation.png b/odoo/addons/base/static/img/icons/marketing_automation.png
new file mode 100644
index 00000000000..018a04f691e
--- /dev/null
+++ b/odoo/addons/base/static/img/icons/marketing_automation.png
diff --git a/odoo/addons/base/static/img/icons/mrp_plm.png b/odoo/addons/base/static/img/icons/mrp_plm.png
new file mode 100644
index 00000000000..4e74a62b9e0
--- /dev/null
+++ b/odoo/addons/base/static/img/icons/mrp_plm.png
diff --git a/odoo/addons/base/static/img/icons/mrp_workorder.png b/odoo/addons/base/static/img/icons/mrp_workorder.png
new file mode 100644
index 00000000000..c8ecda7cfc2
--- /dev/null
+++ b/odoo/addons/base/static/img/icons/mrp_workorder.png
diff --git a/odoo/addons/base/static/img/icons/project_forecast.png b/odoo/addons/base/static/img/icons/project_forecast.png
new file mode 100644
index 00000000000..cfa73818cd5
--- /dev/null
+++ b/odoo/addons/base/static/img/icons/project_forecast.png
diff --git a/odoo/addons/base/static/img/icons/quality_control.png b/odoo/addons/base/static/img/icons/quality_control.png
new file mode 100644
index 00000000000..302e23dd4e8
--- /dev/null
+++ b/odoo/addons/base/static/img/icons/quality_control.png
diff --git a/odoo/addons/base/static/img/icons/sale_ebay.png b/odoo/addons/base/static/img/icons/sale_ebay.png
new file mode 100644
index 00000000000..bd83ea1cb94
--- /dev/null
+++ b/odoo/addons/base/static/img/icons/sale_ebay.png
diff --git a/odoo/addons/base/static/img/icons/sale_subscription.png b/odoo/addons/base/static/img/icons/sale_subscription.png
new file mode 100644
index 00000000000..d77f97979bc
--- /dev/null
+++ b/odoo/addons/base/static/img/icons/sale_subscription.png
diff --git a/odoo/addons/base/static/img/icons/sign.png b/odoo/addons/base/static/img/icons/sign.png
new file mode 100644
index 00000000000..332788e6294
--- /dev/null
+++ b/odoo/addons/base/static/img/icons/sign.png
diff --git a/odoo/addons/base/static/img/icons/stock_barcode.png b/odoo/addons/base/static/img/icons/stock_barcode.png
new file mode 100644
index 00000000000..41297d6a972
--- /dev/null
+++ b/odoo/addons/base/static/img/icons/stock_barcode.png
diff --git a/odoo/addons/base/static/img/icons/timesheet_grid.png b/odoo/addons/base/static/img/icons/timesheet_grid.png
new file mode 100644
index 00000000000..fa79f0327ff
--- /dev/null
+++ b/odoo/addons/base/static/img/icons/timesheet_grid.png
diff --git a/odoo/addons/base/static/img/icons/voip.png b/odoo/addons/base/static/img/icons/voip.png
new file mode 100644
index 00000000000..32e9057ddc2
--- /dev/null
+++ b/odoo/addons/base/static/img/icons/voip.png
diff --git a/odoo/addons/base/static/img/icons/web_mobile.png b/odoo/addons/base/static/img/icons/web_mobile.png
new file mode 100644
index 00000000000..8eb7f8b4423
--- /dev/null
+++ b/odoo/addons/base/static/img/icons/web_mobile.png
diff --git a/odoo/addons/base/static/img/icons/web_studio.png b/odoo/addons/base/static/img/icons/web_studio.png
new file mode 100644
index 00000000000..761e6d1fcfe
--- /dev/null
+++ b/odoo/addons/base/static/img/icons/web_studio.png
diff --git a/odoo/addons/base/static/img/icons/website_calendar.png b/odoo/addons/base/static/img/icons/website_calendar.png
new file mode 100644
index 00000000000..e03b8ac63b6
--- /dev/null
+++ b/odoo/addons/base/static/img/icons/website_calendar.png
diff --git a/odoo/addons/base/static/src/css/modules.css b/odoo/addons/base/static/src/css/modules.css
index bbda49fd6cc..47216367186 100644
--- a/odoo/addons/base/static/src/css/modules.css
+++ b/odoo/addons/base/static/src/css/modules.css
@@ -13,12 +13,6 @@
     padding-left: 85px;
 }
 
-.oe_module_action .float-right {
-    position: absolute;
-    bottom: 8px;
-    right: 8px;
-}
-
 .oe_module_desc h4 {
     margin: 0;
     font-size: 13px;
@@ -27,7 +21,7 @@
 
 .oe_module_name > span  {
     color: #999999;
-    height: 36px;
+    min-height: 26px;
     line-height: 1.2;
     display: inline-block;
 }
diff --git a/odoo/addons/base/views/ir_module_views.xml b/odoo/addons/base/views/ir_module_views.xml
index df5a741065a..2bb22ec606a 100644
--- a/odoo/addons/base/views/ir_module_views.xml
+++ b/odoo/addons/base/views/ir_module_views.xml
@@ -66,7 +66,8 @@
                             By <field name="author" class="oe_inline" placeholder="Author Name"/>
                         </h3>
                         <div>
-                            <button name="button_immediate_install" states="uninstalled" string="Install" type="object" class="btn btn-primary"/>
+                            <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>
                             <button name="button_immediate_upgrade" states="installed" string="Upgrade" type="object" class="btn btn-primary"/>
                             <button name="button_discover" string="Discover" type="object" attrs="{'invisible':['|', ('website', '=', False), ('application', '=', False)]}" class="btn btn-secondary"/>
                             <button name="button_uninstall_wizard" states="installed" string="Uninstall" type="object"  class="btn btn-secondary"/>
@@ -83,6 +84,7 @@
                                     <field name="website" widget="url" attrs="{'invisible':[('website','=',False)]}"/>
                                     <field name="category_id" widget="selection"/>
                                     <field name="summary"/>
+                                    <field name="to_buy" invisible="1"/>
                                 </group>
                                 <group>
                                     <field name="name"/>
@@ -139,6 +141,7 @@
                     <field name="shortdesc"/>
                     <field name="name" groups="base.group_no_one"/>
                     <field name="author"/>
+                    <field name="website"/>
                     <field name="installed_version"/>
                     <field name="state"/>
                     <field name="category_id" invisible="1"/>
@@ -151,6 +154,7 @@
             <field name="arch" type="xml">
                 <kanban create="false">
                   <field name="icon"/>
+                  <field name="to_buy"/>
                   <field name="name"/>
                   <field name="state"/>
                   <field name="summary"/>
@@ -158,13 +162,14 @@
                   <field name="application"/>
                   <templates>
                     <t t-name="kanban-box">
-                      <div class="oe_module_vignette oe_kanban_global_click">
+                      <div class="oe_module_vignette">
                         <t t-set="installed" t-value="record.state.raw_value == 'installed'"/>
                         <div t-if="installed or record.website.raw_value and record.application.raw_value" class="o_dropdown_kanban dropdown">
                             <a class="dropdown-toggle o-no-caret btn" data-toggle="dropdown" href="#" role="button" aria-label="Dropdown menu" title="Dropdown menu">
                                 <span class="fa fa-ellipsis-v"/>
                             </a>
                             <div class="dropdown-menu" role="menu" aria-labelledby="dLabel">
+                                <a type="edit" class="dropdown-item">More Info</a>
                                 <a t-if="record.website.raw_value and record.application.raw_value" role="menuitem" class="dropdown-item" t-att-href="record.website.raw_value" target="_blank">Discover</a>
                                 <a t-if="installed" name="button_immediate_upgrade" type="object" role="menuitem" class="dropdown-item">Upgrade</a>
                                 <a t-if="installed" name="button_uninstall_wizard" type="object" role="menuitem" class="dropdown-item">Uninstall</a>
@@ -172,16 +177,22 @@
                         </div>
                         <img t-attf-src="#{record.icon.value}" class="oe_module_icon" alt="Icon"/>
                         <div class="oe_module_desc" t-att-title="record.shortdesc.value">
-                          <h4 class="o_kanban_record_title"><field name="shortdesc"/></h4>
+                          <h4 class="o_kanban_record_title">
+                            <field name="shortdesc"/>&amp;nbsp;
+                            <code groups="base.group_no_one"><field name="name"/></code>
+                          </h4>
                           <p class="oe_module_name">
-                             <t t-if="record.summary.raw_value"><field name="summary"/><br/></t>
+                             <t t-if="record.summary.raw_value"><field name="summary"/></t>
                           </p>
                           <div class="oe_module_action">
-                            <code groups="base.group_no_one"><small><field name="name"/></small></code>
-                            <button type="object" class="btn btn-primary float-right" name="button_immediate_install" states="uninstalled">Install</button>
-                            <span t-if="installed" class="float-right text-muted mr8">Installed</span>
-                            <button states="to remove" type="object" class="btn btn-primary float-right" name="button_uninstall_cancel">Cancel UnInstall</button>
-                            <button states="to install" type="object" class="btn btn-primary float-right" name="button_install_cancel">Cancel Install</button>
+
+                            <button name="button_discover" type="object" attrs="{'invisible':[('website', '=', False)]}" class="btn btn-secondary float-right">Discover</button>
+                            <button type="object" class="btn btn-primary" 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" states="uninstalled" t-if="record.to_buy.raw_value" role="button">Upgrade</a>
+
+                            <div t-if="installed" class="text-muted mt8 float-left">Installed</div>
+                            <button states="to remove" type="object" class="btn btn-primary" name="button_uninstall_cancel">Cancel UnInstall</button>
+                            <button states="to install" type="object" class="btn btn-primary" name="button_install_cancel">Cancel Install</button>
                           </div>
                         </div>
                       </div>