From d5dcb4ea1edc4e39c2bf4e69120bb9fe261182dc Mon Sep 17 00:00:00 2001
From: Yannick Tivisse <yti@odoo.com>
Date: Thu, 5 Jan 2017 13:59:21 +0100
Subject: [PATCH] [IMP] sale: improve sales config settings

---
 addons/sale/models/sale_config_settings.py    |  2 +-
 .../sale/views/sale_config_settings_views.xml | 30 +++++++++----------
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/addons/sale/models/sale_config_settings.py b/addons/sale/models/sale_config_settings.py
index 86f3fc88d63..f4582f43c69 100644
--- a/addons/sale/models/sale_config_settings.py
+++ b/addons/sale/models/sale_config_settings.py
@@ -65,7 +65,7 @@ class SaleConfiguration(models.TransientModel):
         domain="[('type', '=', 'service')]",
         help='Default product used for payment advances')
     auto_done_setting = fields.Boolean("Lock Confirmed Orders")
-    module_sale_contract = fields.Boolean("Manage subscriptions and recurring invoicing")
+    module_sale_contract = 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 217234dbced..3f3158ed6e9 100644
--- a/addons/sale/views/sale_config_settings_views.xml
+++ b/addons/sale/views/sale_config_settings_views.xml
@@ -165,21 +165,6 @@
                             </div>
                         </div>
                     </div>
-                    <div class="col-xs-12 col-md-6 o_setting_box">
-                        <div class="o_setting_left_pane">
-                        </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"/>
-                                <field name="group_show_price_total" invisible="1"/>
-                            </div>
-                        </div>
-                    </div>
                     <div class="col-xs-12 col-md-6 o_setting_box">
                         <div class="o_setting_left_pane">
                             <field name="group_sale_delivery_address"/>
@@ -246,6 +231,21 @@
                             </div>
                         </div>
                     </div>
+                    <div class="col-xs-12 col-md-6 o_setting_box">
+                        <div class="o_setting_left_pane">
+                        </div>
+                        <div class="o_setting_right_pane">
+                            <label for="sale_show_tax"/>
+                            <div class="text-muted">
+                                Line subtotals in sales orders
+                            </div>
+                            <div class="mt16">
+                                <field name="sale_show_tax" class="o_light_label" widget="radio"/>
+                                <field name="group_show_price_subtotal" invisible="1"/>
+                                <field name="group_show_price_total" invisible="1"/>
+                            </div>
+                        </div>
+                    </div>
                 </div>
                 <h2>Invoicing</h2>
                 <div class="row mt16 o_settings_container">