diff --git a/addons/account/views/account_invoice_view.xml b/addons/account/views/account_invoice_view.xml
index 601a551ef89..cfb13ee4ac4 100644
--- a/addons/account/views/account_invoice_view.xml
+++ b/addons/account/views/account_invoice_view.xml
@@ -352,12 +352,12 @@
                     <button name="action_invoice_sent" type="object" string="Send by Email" attrs="{'invisible':['|',('sent','=',False), ('state', '!=', 'open')]}" groups="base.group_user"/>
                     <button name="invoice_print" string="Print Invoice" type="object" attrs="{'invisible':['|',('sent','=',False), ('state', '!=', 'open')]}" groups="base.group_user"/>
                     <button name="%(action_account_invoice_payment)d" type="action" states="open" string="Register Payment" groups="account.group_account_invoice" class="oe_highlight"/>
-                    <button name="invoice_open" states="draft" string="Validate" class="oe_highlight" groups="base.group_user"/>
-                    <button name="invoice_open" states="proforma2" string="Validate" groups="base.group_user"/>
+                    <button name="invoice_open" states="draft" string="Validate" class="oe_highlight" groups="account.group_account_user"/>
+                    <button name="invoice_open" states="proforma2" string="Validate" groups="account.group_account_user"/>
                     <button name="invoice_proforma2" states="draft" string="PRO-FORMA" groups="account.group_proforma_invoices"/>
-                    <button name="%(action_account_invoice_refund)d" type='action' string='Refund Invoice' groups="base.group_user" attrs="{'invisible': ['|',('type', '=', 'out_refund'), ('state', 'not in', ('open','proforma2','paid'))]}"/>
+                    <button name="%(action_account_invoice_refund)d" type='action' string='Refund Invoice' groups="account.group_account_user" attrs="{'invisible': ['|',('type', '=', 'out_refund'), ('state', 'not in', ('open','proforma2','paid'))]}"/>
                     <button name="invoice_cancel" states="draft,proforma2,open" string="Cancel Invoice" groups="base.group_no_one"/>
-                    <button name="action_cancel_draft" states="cancel" string="Reset to Draft" type="object" groups="base.group_user"/>
+                    <button name="action_cancel_draft" states="cancel" string="Reset to Draft" type="object" groups="account.group_account_user"/>
                     <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,open,paid"/>
                 </header>
                 <div class="alert alert-info" role="alert" style="margin-bottom:0px;" attrs="{'invisible': [('has_outstanding','=',False)]}">
diff --git a/addons/account/views/product_view.xml b/addons/account/views/product_view.xml
index 8027954db05..5dc56426ed3 100644
--- a/addons/account/views/product_view.xml
+++ b/addons/account/views/product_view.xml
@@ -8,7 +8,7 @@
             <field name="inherit_id" ref="product.product_template_form_view"/>
             <field name="arch" type="xml">
                 <page name="sales" position="after">
-                    <page string="Accounting" groups="account.group_account_invoice">
+                    <page string="Invoicing" name="invoicing" groups="account.group_account_invoice">
                         <group name="properties">
                             <group>
                                 <field name="property_account_income_id"
@@ -35,7 +35,7 @@
             <field name="inherit_id" ref="product.product_category_form_view"/>
             <field name="arch" type="xml">
                 <group name="first" position="after">
-                    <group name="account_property">
+                    <group name="account_property" groups="account.group_account_manager">
                         <group string="Account Properties">
                             <field name="property_account_income_categ_id" domain="[('internal_type','=','other'),('deprecated', '=', False)]"/>
                             <field name="property_account_expense_categ_id" domain="[('internal_type','=','other'),('deprecated', '=', False)]"/>
diff --git a/addons/crm/views/res_config_views.xml b/addons/crm/views/res_config_views.xml
index dc244230e0a..f4939b40566 100644
--- a/addons/crm/views/res_config_views.xml
+++ b/addons/crm/views/res_config_views.xml
@@ -50,7 +50,8 @@
             id="sales_team.menu_sale_config"
             name="Configuration"
             parent="sales_team.menu_base_partner"
-            sequence="100"/>
+            sequence="100"
+            groups="sales_team.group_sale_manager"/>
 
         <menuitem
             id="sales_team.menu_sale_general_settings"
diff --git a/addons/product/views/product_views.xml b/addons/product/views/product_views.xml
index 4e721ae54fa..bfd6b2a42d9 100644
--- a/addons/product/views/product_views.xml
+++ b/addons/product/views/product_views.xml
@@ -74,12 +74,6 @@
                                 </field>
                             </div>
                             <group name="sale">
-                                <group name="sale_condition" string="Sale Conditions">
-                                    <label for="warranty"/>
-                                    <div>
-                                        <field name="warranty" class="oe_inline"/> months
-                                    </div>
-                                </group>
                                 <group name="email_template_and_project"
                                     attrs="{'invisible':[('type', '!=', 'service')]}"/>
                             </group>
@@ -89,9 +83,6 @@
                                 <separator string="Description for Quotations" colspan="4"/>
                                 <field name="description_sale" colspan="4" nolabel="1"
                                     placeholder="This note will be displayed on the quotations."/>
-                                <separator string="Description for Vendors" colspan="4"/>
-                                <field name="description_purchase" nolabel="1"
-                                    placeholder="This note will be displayed on requests for quotation." colspan="4"/>
                             </group>
                          </page>
                     </notebook>
diff --git a/addons/purchase/views/purchase_views.xml b/addons/purchase/views/purchase_views.xml
index c54495fa730..346339ac306 100644
--- a/addons/purchase/views/purchase_views.xml
+++ b/addons/purchase/views/purchase_views.xml
@@ -561,6 +561,11 @@
                                 attrs="{'required':[('purchase_line_warn','!=','no-message')],'readonly':[('purchase_line_warn','=','no-message')]}"/>
                     </group>
                 </group>
+                <field name="description_sale" position="after">
+                    <separator string="Description for Vendors" colspan="4"/>
+                    <field name="description_purchase" nolabel="1"
+                        placeholder="This note will be displayed on requests for quotation." colspan="4"/>
+                </field>
             </field>
         </record>
 
diff --git a/addons/sale/models/sale.py b/addons/sale/models/sale.py
index a124946ee47..bd3a8de2223 100644
--- a/addons/sale/models/sale.py
+++ b/addons/sale/models/sale.py
@@ -106,7 +106,7 @@ class SaleOrder(models.Model):
     state = fields.Selection([
         ('draft', 'Quotation'),
         ('sent', 'Quotation Sent'),
-        ('sale', 'Sale Order'),
+        ('sale', 'Sales Order'),
         ('done', 'Locked'),
         ('cancel', 'Cancelled'),
         ], string='Status', readonly=True, copy=False, index=True, track_visibility='onchange', default='draft')
diff --git a/addons/sale/models/sales_team.py b/addons/sale/models/sales_team.py
index d63083c2707..9ceb8ef702e 100644
--- a/addons/sale/models/sales_team.py
+++ b/addons/sale/models/sales_team.py
@@ -54,3 +54,8 @@ class CrmTeam(models.Model):
     @api.multi
     def update_invoiced_target(self, value):
         return self.write({'invoiced_target': round(float(value or 0))})
+
+    @api.onchange('use_quotations')
+    def _onchange_use_quotation(self):
+        if self.use_quotations:
+            self.use_invoices = True
diff --git a/addons/sale/views/sale_config_settings_views.xml b/addons/sale/views/sale_config_settings_views.xml
index 4e509e1f745..c79dc23e07b 100644
--- a/addons/sale/views/sale_config_settings_views.xml
+++ b/addons/sale/views/sale_config_settings_views.xml
@@ -12,7 +12,7 @@
                         <field name="default_invoice_policy" widget="radio"/>
                         <field name="deposit_product_id_setting" class="oe_inline"/>
                     </group>
-                    <group string="Quotations &amp; Sales" id="sale">
+                    <group string="Quotations &amp; Sales" id="sale" name="quotations_sales">
                         <field name="group_sale_delivery_address" widget="radio"/>
                         <field name="group_discount_per_so_line" widget="radio"/>
                         <field name="module_product_visible_discount" widget="radio" attrs="{'invisible': [('group_discount_per_so_line', '=', False)]}"/>
@@ -61,7 +61,7 @@
         </record>
 
         <menuitem id="sales_team.menu_sale_config" name="Configuration" parent="sales_team.menu_base_partner"
-            sequence="100"/>
+            sequence="100" groups="sales_team.group_sale_manager"/>
         <menuitem id="sales_team.menu_sale_general_settings" name="Settings" parent="sales_team.menu_sale_config"
             sequence="0" action="sales_team.action_sale_config" groups="base.group_system"/>
 
diff --git a/addons/sale/views/sale_views.xml b/addons/sale/views/sale_views.xml
index b1eca864190..76610f00011 100644
--- a/addons/sale/views/sale_views.xml
+++ b/addons/sale/views/sale_views.xml
@@ -28,7 +28,7 @@
         <menuitem id="next_id_16" name="Units of Measure" parent="sale.prod_config_main" sequence="30" groups="product.group_uom"/>
         <menuitem action="product.product_uom_form_action" id="menu_product_uom_form_action" parent="sale.prod_config_main" sequence="6" groups="product.group_uom"/>
         <menuitem action="product.product_uom_categ_form_action" id="menu_product_uom_categ_form_action" parent="sale.prod_config_main" sequence="7" groups="base.group_no_one"/>
-        <menuitem id="sales_team.menu_sale_config_sales" name="Configuration" parent="sales_team.menu_base_partner" sequence="100"/>
+        <menuitem id="sales_team.menu_sale_config_sales" name="Configuration" parent="sales_team.menu_base_partner" sequence="100" groups="account.group_account_user"/>
         <menuitem id="menu_product_pricelist_main" name="Pricelists" parent="sales_team.menu_sale_config" groups="product.group_sale_pricelist" sequence="3"/>
         <menuitem action="product.product_pricelist_action2" id="menu_product_pricelist_action2" parent="menu_product_pricelist_main" sequence="1" groups="product.group_sale_pricelist"/>
 
@@ -620,13 +620,13 @@
             <field name="model">product.template</field>
             <field name="inherit_id" ref="product.product_template_form_view"/>
             <field name="arch" type="xml">
-                <group name="sale" position="inside">
-                    <separator string="Invoicing Policy" colspan="4"/>
+                <page name="invoicing" position="inside">
+                    <separator string="Invoicing Policy"/>
                     <group>
                         <field name="invoice_policy" widget="radio"/>
                         <field name="track_service" widget="radio" invisible="True"/>
                     </group>
-                </group>
+                </page>
             </field>
         </record>
 
diff --git a/addons/sale/views/sales_team_views.xml b/addons/sale/views/sales_team_views.xml
index ff64ed99fb7..cd6e48eea75 100644
--- a/addons/sale/views/sales_team_views.xml
+++ b/addons/sale/views/sales_team_views.xml
@@ -79,11 +79,11 @@
             </xpath>
 
             <xpath expr="//div[contains(@class, 'o_kanban_primary_right')]" position="after">
-                <div t-if="record.invoiced_target.raw_value" class="col-xs-12 o_kanban_primary_bottom">
+                <div t-if="record.invoiced_target.raw_value" class="col-xs-12 o_kanban_primary_bottom" groups="sales_team.group_sale_manager">
                     <field name="invoiced" widget="progress" title="Invoicing" options="{'current_value': 'invoiced', 'max_value': 'invoiced_target', 'editable': true, 'edit_max_value': true, 'on_change': 'update_invoiced_target'}"/>
                 </div>
-                <div t-if="!record.invoiced_target.raw_value" class="col-xs-12 o_kanban_primary_bottom text-center">
-                    <a href="#" class="sales_team_target_definition o_inline_link">Click to define a team target</a>
+                <div t-if="!record.invoiced_target.raw_value" class="col-xs-12 o_kanban_primary_bottom text-center" groups="sales_team.group_sale_manager">
+                    <a href="#" class="sales_team_target_definition o_inline_link">Click to define a team target</a> 
                 </div>
             </xpath>
 
@@ -122,7 +122,7 @@
                         </a>
                     </div>
                 </t>
-                <div t-if="record.use_invoices.raw_value">
+                <div t-if="record.use_invoices.raw_value" groups="account.group_account_invoice">
                     <a name="%(action_account_invoice_report_salesteam)d" type="action">
                         Invoices
                     </a>
diff --git a/addons/sale/wizard/sale_make_invoice_advance_views.xml b/addons/sale/wizard/sale_make_invoice_advance_views.xml
index 3a9b25d0701..2258d8913bf 100644
--- a/addons/sale/wizard/sale_make_invoice_advance_views.xml
+++ b/addons/sale/wizard/sale_make_invoice_advance_views.xml
@@ -24,7 +24,7 @@
                                 attrs="{'invisible': [('advance_payment_method', '!=', 'percentage')]}" class="oe_inline"/>
                         </div>
                         <field name="deposit_account_id" class="oe_inline"
-                            attrs="{'invisible': ['|', ('advance_payment_method', 'not in', ('fixed', 'percentage')), ('product_id', '!=', False)]}"/>
+                            attrs="{'invisible': ['|', ('advance_payment_method', 'not in', ('fixed', 'percentage')), ('product_id', '!=', False)]}" groups="account.group_account_manager"/>
                         <field name="deposit_taxes_id" class="oe_inline" widget="many2many_tags"
                             domain="[('type_tax_use','=','sale')]"
                             attrs="{'invisible': ['|', ('advance_payment_method', 'not in', ('fixed', 'percentage')), ('product_id', '!=', False)]}"/>
diff --git a/addons/sales_team/security/sales_team_security.xml b/addons/sales_team/security/sales_team_security.xml
index ce8756e5f36..a75ed255e9e 100644
--- a/addons/sales_team/security/sales_team_security.xml
+++ b/addons/sales_team/security/sales_team_security.xml
@@ -45,7 +45,7 @@
 
         <record model="ir.ui.menu" id="sales_team.menu_sale_config">
             <field name="name">Configuration</field>
-            <field eval="[(6,0,[ref('base.group_system'), ref('base.group_partner_manager')])]" name="groups_id"/>
+            <field eval="[(6,0,[ref('base.group_system')])]" name="groups_id"/>
         </record>
 
         <record model="ir.ui.menu" id="menu_config_address_book">
diff --git a/addons/sales_team/views/sales_team_dashboard.xml b/addons/sales_team/views/sales_team_dashboard.xml
index d94efdb385a..5e6399e277f 100644
--- a/addons/sales_team/views/sales_team_dashboard.xml
+++ b/addons/sales_team/views/sales_team_dashboard.xml
@@ -46,7 +46,7 @@
                                     </div>
                                 </div>
 
-                                <div t-if="widget.editable" class="o_kanban_card_manage_settings row">
+                                <div t-if="widget.editable" class="o_kanban_card_manage_settings row" groups="sales_team.group_sale_manager">
                                     <div class="col-xs-8">
                                         <ul class="oe_kanban_colorpicker" data-field="color"/>
                                     </div>
diff --git a/addons/stock/views/product_views.xml b/addons/stock/views/product_views.xml
index 9052f290ea2..42c5b6d93a0 100644
--- a/addons/stock/views/product_views.xml
+++ b/addons/stock/views/product_views.xml
@@ -152,7 +152,7 @@
                         </group>
                     </page>
                 </page>
-                <field name="description_purchase" position="after">
+                <field name="description_sale" position="after">
                     <separator string="Description for Pickings" colspan="4"/>
                     <field name="description_picking" placeholder="Description for Pickings (Rack, Row and Case Information)" nolabel="1" colspan="4"/>
                 </field>
@@ -358,6 +358,14 @@
                             class="oe_stat_button" icon="fa-cogs"
                             groups="stock.group_adv_location"/>
                     </div>
+                    <group name="email_template_and_project" position="before">
+                        <group name="sale_condition" string="Sale Conditions">
+                            <label for="warranty" groups="stock.group_stock_production_lot"/>
+                            <div groups="stock.group_stock_production_lot">
+                                <field name="warranty" class="oe_inline"/> months
+                            </div>
+                        </group>
+                    </group>
                     <group name="sale_condition" position="inside">
                         <label for="sale_delay"/>
                         <div>
diff --git a/addons/stock_account/views/product_views.xml b/addons/stock_account/views/product_views.xml
index fe1ad3d92fc..fa258bfd4ea 100644
--- a/addons/stock_account/views/product_views.xml
+++ b/addons/stock_account/views/product_views.xml
@@ -15,7 +15,7 @@
                         <field name="property_stock_journal"/>
                     </group>
                 </group>
-                <group name="account_property" position="after">
+                <group name="account_property" position="before">
                     <group>
                         <group string="Inventory Valuation">
                             <field name="property_cost_method" groups="stock_account.group_inventory_valuation"/>