From 1b316359cb2a4a721d51ff505f43202f342b3bad Mon Sep 17 00:00:00 2001
From: Yannick Tivisse <yti@odoo.com>
Date: Wed, 4 Jan 2017 10:14:52 +0100
Subject: [PATCH] [FIX] Sales: Apply small fine tunings on new settings form

---
 addons/crm/views/res_config_views.xml         |  2 +-
 addons/sale/models/sale_config_settings.py    |  4 ++--
 .../sale/views/sale_config_settings_views.xml | 24 ++++++++++++-------
 3 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/addons/crm/views/res_config_views.xml b/addons/crm/views/res_config_views.xml
index 4c56d12900e..f0f072a177a 100644
--- a/addons/crm/views/res_config_views.xml
+++ b/addons/crm/views/res_config_views.xml
@@ -39,7 +39,7 @@
                                 <div attrs="{'invisible': [('alias_domain', 'not in', ['localhost', '', False])]}">
                                     <button type="action"
                                         name="base_setup.action_general_configuration"
-                                        string="Setup your domain alias" class="oe_link"/>
+                                        string="Setup your domain alias" icon="fa-arrow-right" class="oe_link"/>
                                 </div>
                             </div>
                         </div>
diff --git a/addons/sale/models/sale_config_settings.py b/addons/sale/models/sale_config_settings.py
index c001d1fb9c6..86f3fc88d63 100644
--- a/addons/sale/models/sale_config_settings.py
+++ b/addons/sale/models/sale_config_settings.py
@@ -49,8 +49,8 @@ class SaleConfiguration(models.TransientModel):
         implied_group='sale.group_show_price_total',
         group='base.group_portal,base.group_user,base.group_public')
     sale_show_tax = fields.Selection([
-        ('subtotal', 'Show line subtotals without taxes (B2B)'),
-        ('total', 'Show line subtotals with taxes included (B2C)')], "Tax Display",
+        ('subtotal', 'Tax-Included Prices'),
+        ('total', 'Tax-Excluded Prices')], "Tax Display",
         default='subtotal',
         required=True)
     default_invoice_policy = fields.Selection([
diff --git a/addons/sale/views/sale_config_settings_views.xml b/addons/sale/views/sale_config_settings_views.xml
index e35110977e0..217234dbced 100644
--- a/addons/sale/views/sale_config_settings_views.xml
+++ b/addons/sale/views/sale_config_settings_views.xml
@@ -170,6 +170,9 @@
                         </div>
                         <div class="o_setting_right_pane">
                             <label for="sale_show_tax"/>
+                            <div class="text-muted">
+                                Line subtotals in sales orders
+                            </div>
                             <div class="text-muted">
                                 <field name="sale_show_tax" widget="radio"/>
                                 <field name="group_show_price_subtotal" invisible="1"/>
@@ -232,15 +235,6 @@
                             </div>
                         </div>
                     </div>
-                    <div class="col-xs-12 col-md-6 o_setting_box">
-                        <div class="o_setting_left_pane"/>
-                        <div class="o_setting_right_pane">
-                            <label string="Default product for payment advances"/>
-                            <div class="text-muted">
-                                <field name="deposit_product_id_setting"/>
-                            </div>
-                        </div>
-                    </div>
                     <div class="col-xs-12 col-md-6 o_setting_box">
                         <div class="o_setting_left_pane">
                             <field name="auto_done_setting"/>
@@ -268,6 +262,18 @@
                             </div>
                         </div>
                     </div>
+                    <div class="col-xs-12 col-md-6 o_setting_box" groups="base.group_no_one">
+                        <div class="o_setting_left_pane"/>
+                        <div class="o_setting_right_pane">
+                            <label string="Down Payments"/>
+                            <div class="text-muted">
+                                Product used for down payments
+                            </div>
+                            <div class="text-muted">
+                                <field name="deposit_product_id_setting"/>
+                            </div>
+                        </div>
+                    </div>
                 </div>
                 <h2>Timesheets</h2>
                 <div class="row mt16 o_settings_container">