From 2ac3d7b5700d159869a63b8dd49801aa6bd0db36 Mon Sep 17 00:00:00 2001
From: amoyaux <amoyaux@gmail.com>
Date: Thu, 9 Feb 2017 11:35:37 +0100
Subject: [PATCH] [FIX] sale, website_sale: enterprise symbol in settings

In the sale settings view, the field company research hasn't
the enterprise symbol though the related module is in enterprise.
It's the same problem for the Company Research option in the website
admin settings.

Both field declaration use a string attribute in the label tag.
but it is needed to use a "for" attribute. The Upgrade widgets only
put the "enterprise" span after the enterprise label, wich is found
by looking on node having a for attribute with "module_ " and its value.

This commit use an attribute "for" instead of the attribute "string"
in the label declaration.
---
 addons/sale/models/sale_config_settings.py       | 2 +-
 addons/sale/views/sale_config_settings_views.xml | 2 +-
 addons/website_sale/models/res_config.py         | 2 +-
 addons/website_sale/views/res_config_view.xml    | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/sale/models/sale_config_settings.py b/addons/sale/models/sale_config_settings.py
index d5a1c2c7e01..2c330c534f4 100644
--- a/addons/sale/models/sale_config_settings.py
+++ b/addons/sale/models/sale_config_settings.py
@@ -79,7 +79,7 @@ class SaleConfiguration(models.TransientModel):
     module_timesheet_grid_sale = fields.Boolean("Timesheets")
     module_sale_ebay = fields.Boolean("eBay")
     module_print_docsaway = fields.Boolean("Docsaway")
-    module_web_clearbit = fields.Boolean("Clearbit")
+    module_web_clearbit = fields.Boolean("Company Research")
     module_product_email_template = fields.Boolean("Specific Email")
     module_sale_coupon = fields.Boolean("Manage coupons and promotional offers")
 
diff --git a/addons/sale/views/sale_config_settings_views.xml b/addons/sale/views/sale_config_settings_views.xml
index c88aa256566..18944453b1c 100644
--- a/addons/sale/views/sale_config_settings_views.xml
+++ b/addons/sale/views/sale_config_settings_views.xml
@@ -434,7 +434,7 @@
                         <field name="module_web_clearbit" widget="upgrade_boolean"/>
                     </div>
                     <div class="o_setting_right_pane">
-                        <label string="Company Research"/>
+                        <label for="module_web_clearbit"/>
                         <div class="text-muted">
                             Look up company information (name, logo, etc.)
                         </div>
diff --git a/addons/website_sale/models/res_config.py b/addons/website_sale/models/res_config.py
index 04b8c8e952c..cfc9bdf5844 100644
--- a/addons/website_sale/models/res_config.py
+++ b/addons/website_sale/models/res_config.py
@@ -28,7 +28,7 @@ class WebsiteConfigSettings(models.TransientModel):
     module_delivery_usps = fields.Boolean("USPS integration")
 
     module_sale_ebay = fields.Boolean("eBay connector")
-    module_sale_coupon = fields.Boolean("Manage coupons and promotional offers")
+    module_sale_coupon = fields.Boolean("Discount Programs")
 
     group_website_multiimage = fields.Boolean(string='Multi-Images', implied_group='website_sale.group_website_multi_image')
     group_discount_per_so_line = fields.Boolean(string="Discounted Prices", implied_group='sale.group_discount_per_so_line')
diff --git a/addons/website_sale/views/res_config_view.xml b/addons/website_sale/views/res_config_view.xml
index a42498e63b7..42c0db04ba0 100644
--- a/addons/website_sale/views/res_config_view.xml
+++ b/addons/website_sale/views/res_config_view.xml
@@ -30,7 +30,7 @@
                             <field name="module_sale_coupon" widget="upgrade_boolean"/>
                         </div>
                         <div class="o_setting_right_pane">
-                            <label string="Discount Programs"/>
+                            <label for="module_sale_coupon"/>
                             <div class="text-muted">
                                 Manage promotion &amp; coupon programs
                             </div>