From 182c8d2815dafead5a8f72fcd90efbe69a182eb7 Mon Sep 17 00:00:00 2001
From: Hiral Bhavsar <hbh@odoo.com>
Date: Tue, 4 Apr 2017 14:51:01 +0530
Subject: [PATCH] [IMP] account, crm, sale, sales_team, website: Rename the
 module 'sale_contract' to 'sale_subscription' and 'website_contract' to
 'website_subscription'.

---
 addons/account/views/web_planner_data.xml              | 2 +-
 addons/crm/data/web_planner_data.xml                   | 6 +++---
 addons/sale/models/sale_config_settings.py             | 2 +-
 addons/sale/views/sale_config_settings_views.xml       | 2 +-
 addons/sales_team/models/sale_config_settings.py       | 2 +-
 addons/sales_team/views/sale_config_settings_views.xml | 6 +++---
 addons/website/models/website_config_settings.py       | 2 +-
 addons/website/views/website_config_settings_views.xml | 4 ++--
 8 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/addons/account/views/web_planner_data.xml b/addons/account/views/web_planner_data.xml
index abd637d87d5..690d160f23e 100644
--- a/addons/account/views/web_planner_data.xml
+++ b/addons/account/views/web_planner_data.xml
@@ -447,7 +447,7 @@
                             <span class="fa fa-copy fa-4x"></span>
                             <h3><strong>Contracts &amp; Subscriptions</strong></h3>
                             <p>Manage time &amp; material contracts or fixed-price recurring subscriptions.</p>
-                            <a t-att-href="prepare_backend_url('base.open_module_tree', 'form', 'sale_contract')"
+                            <a t-att-href="prepare_backend_url('base.open_module_tree', 'form', 'sale_subscription')"
                                 class="btn odoo_purple">
                                 <span class="fa fa-arrow-circle-o-down"/> Install Now
                             </a>
diff --git a/addons/crm/data/web_planner_data.xml b/addons/crm/data/web_planner_data.xml
index 79158d91137..9fffb45f445 100644
--- a/addons/crm/data/web_planner_data.xml
+++ b/addons/crm/data/web_planner_data.xml
@@ -305,12 +305,12 @@
                                     </span>
                                 </div>
                                 <div class="panel-body">
-                                    <t t-if="not is_module_installed('website_contract')">
+                                    <t t-if="not is_module_installed('website_subscription')">
                                         <span class="text-muted">If you sell subscriptions (whether it's invoiced annually or monthly), activate the
-                                            <a t-att-href="prepare_backend_url('base.open_module_tree', 'form', 'website_contract')">Subscription Management</a> app.
+                                            <a t-att-href="prepare_backend_url('base.open_module_tree', 'form', 'website_subscription')">Subscription Management</a> app.
                                         </span>
                                     </t>
-                                    <t t-if="is_module_installed('website_contract')">
+                                    <t t-if="is_module_installed('website_subscription')">
                                         <h4><strong>Subscriptions</strong></h4>
                                         <p>
                                             Use subscription for recurring billing.
diff --git a/addons/sale/models/sale_config_settings.py b/addons/sale/models/sale_config_settings.py
index 9402d5abb2b..50c0c2d80aa 100644
--- a/addons/sale/models/sale_config_settings.py
+++ b/addons/sale/models/sale_config_settings.py
@@ -69,7 +69,7 @@ class SaleConfigSettings(models.TransientModel):
         oldname='deposit_product_id_setting',
         help='Default product used for payment advances')
     auto_done_setting = fields.Boolean("Lock Confirmed Orders")
-    module_sale_contract = fields.Boolean("Subscriptions")
+    module_sale_subscription = fields.Boolean("Subscriptions")
     module_website_sale_digital = fields.Boolean("Sell digital products - provide downloadable content on your customer portal")
 
     group_multi_currency = fields.Boolean("Multi-Currencies", implied_group='base.group_multi_currency')
diff --git a/addons/sale/views/sale_config_settings_views.xml b/addons/sale/views/sale_config_settings_views.xml
index 0effa047813..391148fdfce 100644
--- a/addons/sale/views/sale_config_settings_views.xml
+++ b/addons/sale/views/sale_config_settings_views.xml
@@ -468,7 +468,7 @@
                     </div>
                 </div>
             </xpath>
-            <xpath expr="//div[@id='sale_contract']" position="after">
+            <xpath expr="//div[@id='sale_subscription']" position="after">
                 <div class="col-xs-12 col-md-6 o_setting_box">
                     <div class="o_setting_left_pane">
                         <field name="module_account_accountant"/>
diff --git a/addons/sales_team/models/sale_config_settings.py b/addons/sales_team/models/sale_config_settings.py
index dffa4888516..ab6a74a1076 100644
--- a/addons/sales_team/models/sale_config_settings.py
+++ b/addons/sales_team/models/sale_config_settings.py
@@ -14,5 +14,5 @@ class SaleConfigSettings(models.TransientModel):
     module_sale = fields.Boolean("Sales")
     module_website_sign = fields.Boolean("eSign")
     module_helpdesk = fields.Boolean("Helpdesk")
-    module_sale_contract = fields.Boolean("Subscriptions")
+    module_sale_subscription = fields.Boolean("Subscriptions")
     module_account_accountant = fields.Boolean("Accounting")
diff --git a/addons/sales_team/views/sale_config_settings_views.xml b/addons/sales_team/views/sale_config_settings_views.xml
index 628f217904c..4e2c4625ef0 100644
--- a/addons/sales_team/views/sale_config_settings_views.xml
+++ b/addons/sales_team/views/sale_config_settings_views.xml
@@ -59,12 +59,12 @@
                                 </div>
                             </div>
                         </div>
-                        <div class="col-xs-12 col-md-6 o_setting_box" id="sale_contract">
+                        <div class="col-xs-12 col-md-6 o_setting_box" id="sale_subscription">
                             <div class="o_setting_left_pane">
-                                <field name="module_sale_contract" widget="upgrade_boolean"/>
+                                <field name="module_sale_subscription" widget="upgrade_boolean"/>
                             </div>
                             <div class="o_setting_right_pane">
-                                <label for="module_sale_contract"/>
+                                <label for="module_sale_subscription"/>
                                 <div class="text-muted">
                                     Sell recurring services with automated billing
                                 </div>
diff --git a/addons/website/models/website_config_settings.py b/addons/website/models/website_config_settings.py
index 35e20e77290..718938a5103 100644
--- a/addons/website/models/website_config_settings.py
+++ b/addons/website/models/website_config_settings.py
@@ -43,7 +43,7 @@ class WebsiteConfigSettings(models.TransientModel):
     module_website_slides = fields.Boolean("Slides")
     module_website_hr_recruitment = fields.Boolean("Jobs")
     module_website_sale = fields.Boolean("eCommerce")
-    module_website_contract = fields.Boolean("Subscriptions")
+    module_website_subscription = fields.Boolean("Subscriptions")
     module_website_event_sale = fields.Boolean("Event Tickets")
 
     favicon = fields.Binary('Favicon', related='website_id.favicon')
diff --git a/addons/website/views/website_config_settings_views.xml b/addons/website/views/website_config_settings_views.xml
index fe04057717b..7b11f25fe13 100644
--- a/addons/website/views/website_config_settings_views.xml
+++ b/addons/website/views/website_config_settings_views.xml
@@ -267,10 +267,10 @@
                                 </div>
                                 <div class="col-xs-12 col-md-6 o_setting_box" id="subscriptions_install_setting">
                                     <div class="o_setting_left_pane">
-                                        <field name="module_website_contract" widget="upgrade_boolean"/>
+                                        <field name="module_website_subscription" widget="upgrade_boolean"/>
                                     </div>
                                     <div class="o_setting_right_pane">
-                                        <label for="module_website_contract"/>
+                                        <label for="module_website_subscription"/>
                                         <div class="text-muted">
                                             Sell recurring services with automated billing and payments
                                         </div>