diff --git a/addons/crm/models/res_config.py b/addons/crm/models/res_config.py
index de19101eb4a67c3a409c65e8cae86d3a4987964b..295dbaca25a5d03b6b0cfc3133d948607dce75b8 100644
--- a/addons/crm/models/res_config.py
+++ b/addons/crm/models/res_config.py
@@ -5,20 +5,15 @@ from odoo import api, fields, models
class CRMSettings(models.TransientModel):
-
- _name = 'sale.config.settings'
- _inherit = ['sale.config.settings']
+ _inherit = 'sale.config.settings'
generate_sales_team_alias = fields.Boolean("Automatically generate an email alias at the sales team creation",
help="Odoo will generate an email alias based on the sales team name")
alias_prefix = fields.Char('Default Alias Name for Leads')
alias_domain = fields.Char('Alias Domain', default=lambda self: self.env["ir.config_parameter"].get_param("mail.catchall.domain"))
- group_use_lead = fields.Selection([
- (0, "Each mail sent to the alias creates a new opportunity"),
- (1, "Use leads if you need a qualification step before creating an opportunity or a customer")
- ], string="Leads", implied_group='crm.group_use_lead')
- module_crm_voip = fields.Boolean("VoIP integration", help="Integration with Asterisk")
- module_website_sign = fields.Boolean("Odoo Sign")
+ default_generate_lead_from_alias = fields.Boolean(default_model='sale.config.settings')
+ group_use_lead = fields.Boolean(string="Leads", implied_group='crm.group_use_lead')
+ module_crm_voip = fields.Boolean("Asterisk (VoIP)")
def _find_default_lead_alias_id(self):
alias = self.env.ref('crm.mail_alias_lead_info', False)
diff --git a/addons/crm/views/res_config_views.xml b/addons/crm/views/res_config_views.xml
index c78f5be281b770a3a05bca0e3b3a1bd996776957..4c56d12900e690fea0ce9c1ab70bf28714acebf4 100644
--- a/addons/crm/views/res_config_views.xml
+++ b/addons/crm/views/res_config_views.xml
@@ -1,49 +1,74 @@
<?xml version="1.0" encoding="utf-8"?>
<odoo>
- <record id="view_sale_config_settings" model="ir.ui.view">
- <field name="name">crm settings</field>
- <field name="model">sale.config.settings</field>
- <field name="inherit_id" ref="sales_team.view_sale_config_settings"/>
- <field name="arch" type="xml">
- <div id="main" position="inside">
- <group string="CRM" name="config_alias">
- <label for="id" string="Leads Email Alias"/>
- <div>
- <div attrs="{'invisible': [('alias_domain', 'in', ['localhost', '', False])]}">
- <p class="text-muted">
- Each sales team has an email alias that
- could be setup on the sales team form. You
- can setup a generic email alias to create
- incoming leads.
- </p>
- <field name="alias_prefix" class="oe_inline"/>
- <span>@</span>
- <field name="alias_domain" class="oe_inline" readonly="1"/>
+
+ <record id="sale_config_settings_view_form_inherit_crm" model="ir.ui.view">
+ <field name="name">sale.config.settings.inherit.crm</field>
+ <field name="model">sale.config.settings</field>
+ <field name="inherit_id" ref="sales_team.sale_config_settings_view_form"/>
+ <field name="arch" type="xml">
+ <xpath expr="//h2[@id='integration_h2']" position="before">
+ <h2>CRM</h2>
+ <div class="row mt16 o_settings_container">
+ <div class="col-xs-12 col-md-6 o_setting_box" id="crm_lead">
+ <div class="o_setting_left_pane">
+ <field name="group_use_lead"/>
+ </div>
+ <div class="o_setting_right_pane">
+ <label for="group_use_lead"/>
+ <div class="text-muted">
+ Add a qualification step before creating an opportunity
</div>
- <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"/>
+ </div>
+ </div>
+ <div class="col-xs-12 col-md-6 o_setting_box" id="crm_lead" attrs="{'invisible': [('group_use_lead','=',False)]}" title="Emails received to that address generate new leads not assigned to any sales channel yet. This can be made when converting them into opportunities. Incoming emails can be automatically assigned to specific sales channels. To do so, set an email alias on the sales channel.">
+ <div class="o_setting_left_pane">
+ <field name="default_generate_lead_from_alias"/>
+ </div>
+ <div class="o_setting_right_pane">
+ <label string="Emails"/>
+ <div class="text-muted">
+ Generate leads from incoming emails
+ </div>
+ <div class="content-group" attrs="{'invisible': [('default_generate_lead_from_alias','=',False)]}">
+ <div class="mt16">
+ <label string="Alias" class="o_light_label"/>
+ <field name="alias_prefix" class="oe_inline"/>
+ <span>@</span>
+ <field name="alias_domain" readonly="1" class="oe_inline"/>
+ </div>
+ <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"/>
+ </div>
</div>
</div>
- <field name="group_use_lead" widget="radio"/>
- <label for="module_crm_voip" string="Voip integration"/>
- <div>
- <field name="module_crm_voip" widget="upgrade_boolean" class="oe_inline"/>
- <label for="module_crm_voip" invisible="1"/>
- <a href="https://www.odoo.com/slides/slide/voip-one-click-button-to-automate-calls-272" target="_blank"> More Info </a>
+ </div>
+ </div>
+ </xpath>
+ <xpath expr="//h2[@id='integration_h2']" position="attributes">
+ <attribute name="invisible">0</attribute>
+ </xpath>
+ <xpath expr="//div[@id='integration']" position="inside">
+ <div class="col-xs-12 col-md-6 o_setting_box">
+ <div class="o_setting_left_pane">
+ <field name="module_crm_voip" widget="upgrade_boolean"/>
+ </div>
+ <div class="o_setting_right_pane">
+ <label for="module_crm_voip"/>
+ <div class="text-muted">
+ Schedule & make calls from CRM app
</div>
- </group>
- <group string="Odoo Sign" name="config_sign">
- <label for="module_website_sign" string="Odoo Sign"/>
- <div>
- <field name="module_website_sign" widget="upgrade_boolean" class="oe_inline"/>
- <label for="module_website_sign" invisible="1"/>
- <a href="https://www.odoo.com/page/sign" target="_blank"> More Info </a>
+ <div class="content-group">
+ <div class="text-warning mt16" id="crm_voip" attrs="{'invisible': [('module_crm_voip','=',False)]}">
+ Save this page and come back here to set up the feature.
+ </div>
</div>
- </group>
+ </div>
</div>
- </field>
- </record>
+ </xpath>
+ <xpath expr="//div[@id='module_crm']" position="replace"/>
+ </field>
+ </record>
</odoo>
diff --git a/addons/delivery/__manifest__.py b/addons/delivery/__manifest__.py
index e91e09fef5f437c4d091af9d90efe42157046805..06eccbb537b24fa44f975db0fb77cb53e85139ef 100644
--- a/addons/delivery/__manifest__.py
+++ b/addons/delivery/__manifest__.py
@@ -22,7 +22,8 @@ invoices from picking, the system is able to add and compute the shipping line.
'views/product_packaging_view.xml',
'data/delivery_data.xml',
'views/report_shipping.xml',
- 'views/report_deliveryslip.xml'
+ 'views/report_deliveryslip.xml',
+ 'views/sale_config_settings_views.xml',
],
'demo': ['data/delivery_demo.xml'],
diff --git a/addons/delivery/views/sale_config_settings_views.xml b/addons/delivery/views/sale_config_settings_views.xml
new file mode 100644
index 0000000000000000000000000000000000000000..7f6d13635ef406c1b6ee569938e03d3955813d43
--- /dev/null
+++ b/addons/delivery/views/sale_config_settings_views.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+ <record id="sale_config_settings_view_form_inherit_delivery" model="ir.ui.view">
+ <field name="name">sale.config.settings.inherit.delivery</field>
+ <field name="model">sale.config.settings</field>
+ <field name="inherit_id" ref="sale.sale_config_settings_view_form_inherit_sale"/>
+ <field name="arch" type="xml">
+ <xpath expr="//div[@id='delivery_carrier']" position="replace">
+ <div class="mt16" attrs="{'invisible': [('module_delivery','=',False)]}">
+ <button name="%(delivery.action_delivery_carrier_form)d" icon="fa-arrow-right" type="action" string="Delivery Methods" class="btn-link"/>
+ </div>
+ </xpath>
+ </field>
+ </record>
+
+</odoo>
diff --git a/addons/product/security/product_security.xml b/addons/product/security/product_security.xml
index 9aba121200c383fc811b96e99fc90e1d5c4a7233..bc39a2ec9f8febebeb0312b0e6557c93a150abdc 100644
--- a/addons/product/security/product_security.xml
+++ b/addons/product/security/product_security.xml
@@ -27,11 +27,6 @@
<field name="category_id" ref="base.module_category_hidden"/>
</record>
- <record id="group_mrp_properties" model="res.groups">
- <field name="name">Manage Properties of Product</field>
- <field name="category_id" ref="base.module_category_hidden"/>
- </record>
-
<record id="group_product_variant" model="res.groups">
<field name="name">Manage Product Variants</field>
<field name="category_id" ref="base.module_category_hidden"/>
diff --git a/addons/sale/__manifest__.py b/addons/sale/__manifest__.py
index b0fbf5cdaed38cd00411129081ae5657a85397fe..f44873daa8e2b19f235d40177fc7d9971742fa30 100644
--- a/addons/sale/__manifest__.py
+++ b/addons/sale/__manifest__.py
@@ -57,9 +57,9 @@ The Dashboard for the Sales Manager will include
'views/sale_views.xml',
'views/sales_team_views.xml',
'views/res_partner_views.xml',
- 'views/sale_config_settings_views.xml',
'views/sale_templates.xml',
'views/sale_layout_category_view.xml',
+ 'views/sale_config_settings_views.xml',
],
'demo': [
'data/sale_demo.xml',
diff --git a/addons/sale/models/sale_config_settings.py b/addons/sale/models/sale_config_settings.py
index aac20d633b2c952996ca9e37b3b3881ed5ab8302..c001d1fb9c69ee1095a64748004995b8d0c3f361 100644
--- a/addons/sale/models/sale_config_settings.py
+++ b/addons/sale/models/sale_config_settings.py
@@ -1,25 +1,15 @@
# -*- coding: utf-8 -*-
# Part of Odoo. See LICENSE file for full copyright and licensing details.
-import logging
-
from odoo import api, fields, models
-_logger = logging.getLogger(__name__)
-
class SaleConfiguration(models.TransientModel):
_inherit = 'sale.config.settings'
- company_id = fields.Many2one('res.company', string='Company', required=True,
- default=lambda self: self.env.user.company_id)
- sale_note = fields.Text(related='company_id.sale_note', string="Default Terms and Conditions *")
- group_product_variant = fields.Selection([
- (0, "No variants on products"),
- (1, 'Products can have several attributes, defining variants (Example: size, color,...)')
- ], "Product Variants",
- help="""Work with product variant allows you to define some variant of the same products
- , an ease the product management in the ecommerce for example""",
+ sale_note = fields.Text(related='company_id.sale_note', string="Terms & Conditions")
+ default_use_sale_note = fields.Boolean(default_model='sale.config.settings')
+ group_product_variant = fields.Boolean("Attributes & Variants",
implied_group='product.group_product_variant')
group_sale_pricelist = fields.Boolean("Use pricelists to adapt your price per customers",
implied_group='product.group_sale_pricelist',
@@ -29,52 +19,27 @@ class SaleConfiguration(models.TransientModel):
implied_group='product.group_pricelist_item')
group_product_pricelist = fields.Boolean("Show pricelists On Products",
implied_group='product.group_product_pricelist')
- group_uom = fields.Selection([
- (0, 'Products have only one unit of measure (easier)'),
- (1, 'Some products may be sold/purchased in different units of measure (advanced)')
- ], "Units of Measure",
- implied_group='product.group_uom',
- help="""Allows you to select and maintain different units of measure for products.""")
- group_discount_per_so_line = fields.Selection([
- (0, 'No discount on sales order lines, global discount only'),
- (1, 'Allow discounts on sales order lines')
- ], "Discount",
- implied_group='sale.group_discount_per_so_line')
- group_display_incoterm = fields.Selection([
- (0, 'No incoterm on reports'),
- (1, 'Show incoterms on sales orders and invoices')
- ], "Incoterms",
- implied_group='sale.group_display_incoterm',
- help="The printed reports will display the incoterms for the sales orders and the related invoices")
- module_sale_margin = fields.Selection([
- (0, 'Salespeople do not need to view margins when quoting'),
- (1, 'Display margins on quotations and sales orders')
- ], "Margins")
- group_sale_layout = fields.Selection([
- (0, 'Do not personalize sales orders and invoice reports'),
- (1, 'Personalize the sales orders and invoice report with categories, subtotals and page-breaks')
- ], "Sales Reports Layout", implied_group='sale.group_sale_layout')
- group_warning_sale = fields.Selection([
- (0, 'All the products and the customers can be used in sales orders'),
- (1, 'An informative or blocking warning can be set on a product or a customer')
- ], "Warning", implied_group='sale.group_warning_sale')
- module_website_quote = fields.Selection([
- (0, 'Print quotes or send by email'),
- (1, 'Send quotations your customer can approve & pay online (advanced)')
- ], "Online Quotations")
- group_sale_delivery_address = fields.Selection([
- (0, "Invoicing and shipping addresses are always the same (Example: services companies)"),
- (1, 'Display 3 fields on sales orders: customer, invoice address, delivery address')
- ], "Addresses", implied_group='sale.group_delivery_invoice_address')
+ group_uom = fields.Boolean("Units of Measure",
+ implied_group='product.group_uom')
+ group_discount_per_so_line = fields.Boolean("Discounts", implied_group='sale.group_discount_per_so_line')
+ group_stock_packaging = fields.Boolean("Packaging", implied_group='product.group_stock_packaging',
+ help="""Ability to select a package type in sales orders and
+ to force a quantity that is a multiple of the number of units per package.""")
+ module_sale_margin = fields.Boolean("Margins")
+ group_sale_layout = fields.Boolean("Sales Reports Layout", implied_group='sale.group_sale_layout')
+ group_warning_sale = fields.Boolean("Warnings", implied_group='sale.group_warning_sale')
+ module_website_quote = fields.Boolean("Online Quotations & Templates")
+ group_sale_delivery_address = fields.Boolean("Customer Addresses", implied_group='sale.group_delivery_invoice_address')
+ multi_sales_price = fields.Boolean("Multiple sales price per product", default_model='sale.config.settings')
+ multi_sales_price_method = fields.Selection([
+ ('percentage', 'Multiple prices per product (e.g. customer segments, currencies)'),
+ ('formula', 'Price computed from formulas (discounts, margins, roundings)')
+ ], string="Pricelists")
sale_pricelist_setting = fields.Selection([
- ('fixed', 'A single sale price per product'),
- ('percentage', 'Specific prices per customer segment, currency, etc.'),
- ('formula', 'Advanced pricing based on formulas (discounts, margins, rounding)')
- ], required=True,
- default='fixed',
- help='Fix Price: all price manage from products sale price.\n'
- 'Different prices per Customer: you can assign price on buying of minimum quantity in products sale tab.\n'
- 'Advanced pricing based on formula: You can have all the rights on pricelist')
+ ('fixed', 'A single sales price per product'),
+ ('percentage', 'Multiple prices per product (e.g. customer segments, currencies)'),
+ ('formula', 'Price computed from formulas (discounts, margins, roundings)')
+ ], string="Pricelists")
group_show_price_subtotal = fields.Boolean(
"Show subtotal",
implied_group='sale.group_show_price_subtotal',
@@ -89,9 +54,9 @@ class SaleConfiguration(models.TransientModel):
default='subtotal',
required=True)
default_invoice_policy = fields.Selection([
- ('order', 'Invoice ordered quantities'),
- ('delivery', 'Invoice delivered quantities')
- ], 'Default Invoicing',
+ ('order', 'Ordered quantities'),
+ ('delivery', 'Delivered quantities or service hours')
+ ], 'Invoicing Policy',
default='order',
default_model='product.template')
deposit_product_id_setting = fields.Many2one(
@@ -99,30 +64,38 @@ class SaleConfiguration(models.TransientModel):
'Deposit Product',
domain="[('type', '=', 'service')]",
help='Default product used for payment advances')
- auto_done_setting = fields.Selection([
- (0, "Allow to edit sales order from the 'Sales Order' menu (not from the Quotation menu)"),
- (1, "Never allow to modify a confirmed sales order")
- ], "Sales Order Modification")
+ auto_done_setting = fields.Boolean("Lock Confirmed Orders")
module_sale_contract = fields.Boolean("Manage subscriptions and recurring invoicing")
module_website_sale_digital = fields.Boolean("Sell digital products - provide downloadable content on your customer portal")
- @api.multi
- def set_sale_defaults(self):
- return self.env['ir.values'].sudo().set_default(
- 'sale.config.settings', 'sale_pricelist_setting', self.sale_pricelist_setting)
+ group_multi_currency = fields.Boolean("Multi-Currencies", implied_group='base.group_multi_currency')
+ module_sale_stock = fields.Boolean("Inventory")
+ module_delivery = fields.Boolean("Shipping Costs")
+ module_delivery_dhl = fields.Boolean("DHL")
+ module_delivery_fedex = fields.Boolean("FedEx")
+ module_delivery_ups = fields.Boolean("UPS")
+ module_delivery_usps = fields.Boolean("USPS")
- @api.multi
- def set_deposit_product_id_defaults(self):
- return self.env['ir.values'].sudo().set_default(
- 'sale.config.settings', 'deposit_product_id_setting', self.deposit_product_id_setting.id)
+ 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_product_email_template = fields.Boolean("Specific Email")
+ module_sale_coupon = fields.Boolean("Manage coupons and promotional offers")
- @api.multi
- def set_auto_done_defaults(self):
- return self.env['ir.values'].sudo().set_default(
- 'sale.config.settings', 'auto_done_setting', self.auto_done_setting)
+ @api.model
+ def get_default_sale_pricelist_setting(self, fields):
+ sale_pricelist_setting = self.env['ir.values'].get_default('sales.config.settings', 'sale_pricelist_setting')
+ multi_sales_price = sale_pricelist_setting in ['percentage', 'formula']
+ return {
+ 'sale_pricelist_setting': sale_pricelist_setting,
+ 'multi_sales_price': multi_sales_price,
+ 'multi_sales_price_method': multi_sales_price and sale_pricelist_setting or False
+ }
- @api.onchange('sale_pricelist_setting')
+ @api.onchange('multi_sales_price', 'multi_sales_price_method')
def _onchange_sale_price(self):
+ self.sale_pricelist_setting = self.multi_sales_price and self.multi_sales_price_method or 'fixed'
if self.sale_pricelist_setting == 'percentage':
self.update({
'group_product_pricelist': True,
@@ -142,10 +115,17 @@ class SaleConfiguration(models.TransientModel):
'group_pricelist_item': False,
})
- @api.multi
+ def set_default_sale_pricelist_setting(self):
+ return self.env['ir.values'].sudo().set_default('sales.config.settings', 'sale_pricelist_setting', self.sale_pricelist_setting)
+
+ def set_deposit_product_id_defaults(self):
+ return self.env['ir.values'].sudo().set_default('sale.config.settings', 'deposit_product_id_setting', self.deposit_product_id_setting.id)
+
+ def set_auto_done_defaults(self):
+ return self.env['ir.values'].sudo().set_default('sale.config.settings', 'auto_done_setting', self.auto_done_setting)
+
def set_sale_tax_defaults(self):
- return self.env['ir.values'].sudo().set_default(
- 'sale.config.settings', 'sale_show_tax', self.sale_show_tax)
+ return self.env['ir.values'].sudo().set_default('sale.config.settings', 'sale_show_tax', self.sale_show_tax)
@api.onchange('sale_show_tax')
def _onchange_sale_tax(self):
diff --git a/addons/sale/security/sale_security.xml b/addons/sale/security/sale_security.xml
index 06e6a853754252bf5d4551be204ad903fd741bf2..c5c1bd487ba135a64d65d1a0a86da89c6450c8e6 100644
--- a/addons/sale/security/sale_security.xml
+++ b/addons/sale/security/sale_security.xml
@@ -36,21 +36,11 @@
<field name="implied_ids" eval="[(4, ref('sale.group_show_price_subtotal'))]"/>
</record>
- <record id="group_mrp_properties" model="res.groups">
- <field name="name">Properties on lines</field>
- <field name="category_id" ref="base.module_category_hidden"/>
- </record>
-
<record id="group_discount_per_so_line" model="res.groups">
<field name="name">Discount on lines</field>
<field name="category_id" ref="base.module_category_hidden"/>
</record>
- <record id="group_display_incoterm" model="res.groups">
- <field name="name">Display incoterms on Sales Order and related invoices</field>
- <field name="category_id" ref="base.module_category_hidden"/>
- </record>
-
<record id="group_warning_sale" model="res.groups">
<field name="name">A warning can be set on a product or a customer (Sale)</field>
<field name="category_id" ref="base.module_category_hidden"/>
diff --git a/addons/sale/views/sale_config_settings_views.xml b/addons/sale/views/sale_config_settings_views.xml
index 24a3d22df2319395329624298bbf8d7cbf49ed95..e35110977e0eb79daa949cc48ea943311c912177 100644
--- a/addons/sale/views/sale_config_settings_views.xml
+++ b/addons/sale/views/sale_config_settings_views.xml
@@ -1,63 +1,458 @@
<?xml version="1.0" encoding="utf-8"?>
<odoo>
- <record id="view_sales_config" model="ir.ui.view">
- <field name="name">sale settings</field>
- <field name="model">sale.config.settings</field>
- <field name="inherit_id" ref="sales_team.view_sale_config_settings"/>
- <field name="arch" type="xml">
- <div id="main" position="inside">
- <group string="Products">
- <field name="group_product_variant" widget="radio"/>
- <field name="group_uom" widget="radio"/>
- <field name="default_invoice_policy" widget="radio"/>
- <field name="deposit_product_id_setting" class="oe_inline"/>
- <label string="Digital Products"/>
- <div>
- <field name="module_website_sale_digital" class="oe_inline" />
- <label for="module_website_sale_digital"/>
- </div>
- </group>
- <group string="Pricing">
- <label for="sale_pricelist_setting" string="Sale Price"/>
- <div>
- <field name="sale_pricelist_setting" class="oe_inline" widget="radio"/>
- <field name="group_sale_pricelist" class="oe_inline" invisible="1"/>
- <field name="group_pricelist_item" class="oe_inline" invisible="1"/>
- <field name="group_product_pricelist" class="oe_inline" invisible="1"/>
- </div>
- </group>
- <group string="Quotations & Sales" id="sale" name="quotations_sales">
- <field name="company_id" invisible="1"/>
- <field name="sale_note"/>
- <field name="group_sale_delivery_address" widget="radio"/>
- <field name="group_discount_per_so_line" widget="radio"/>
- <field name="module_sale_margin" widget="radio"/>
- <field name="group_sale_layout" widget="radio"/>
- <field name="auto_done_setting" widget="radio"/>
- <field name="group_warning_sale" widget="radio"/>
- <label for="sale_show_tax"/>
- <div>
- <field name="sale_show_tax" class="oe_inline" widget="radio"/>
- <field name="group_show_price_subtotal" class="oe_inline" invisible="1"/>
- <field name="group_show_price_total" class="oe_inline" invisible="1"/>
- </div>
- <label for="id" string="Subscriptions"/>
- <div>
- <field name="module_sale_contract" class="oe_inline" widget="upgrade_boolean"/>
- <label for="module_sale_contract"/>
- <a href="https://www.odoo.com/page/subscriptions" target="_blank"> More Info</a>
- </div>
- </group>
- <group string="Customers" name="customers">
- <field name="module_website_quote" widget="radio"/>
- </group>
- </div>
- <form name="sale_config_form" position="inside">
- <div>
- <span>(*) This configuration is related to the company you're logged into.</span>
- </div>
- </form>
- </field>
- </record>
+
+ <record id="sale_config_settings_view_form_inherit_sale" model="ir.ui.view">
+ <field name="name">sale.config.settings.inherit.sale</field>
+ <field name="model">sale.config.settings</field>
+ <field name="inherit_id" ref="sales_team.sale_config_settings_view_form"/>
+ <field name="arch" type="xml">
+ <xpath expr="//h2[@id='integration_h2']" position="before">
+ <field name="company_id" invisible="1"/>
+ <h2>Pricing</h2>
+ <div class="row mt16 o_settings_container">
+ <div class="col-xs-12 col-md-6 o_setting_box">
+ <div class="o_setting_left_pane">
+ <field name="group_discount_per_so_line"/>
+ </div>
+ <div class="o_setting_right_pane">
+ <label for="group_discount_per_so_line"/>
+ <div class="text-muted">
+ Allow manual discounts on order lines
+ </div>
+ </div>
+ </div>
+ <div class="col-xs-12 col-md-6 o_setting_box" title="Boost your sales with two kinds of discount programs: promotions and coupon codes. Specific conditions can be set (products, customers, minimum purchase amount, period). Rewards can be discounts (% or amount) or free products.">
+ <div class="o_setting_left_pane">
+ <field name="module_sale_coupon" widget="upgrade_boolean"/>
+ </div>
+ <div class="o_setting_right_pane">
+ <label string="Discount Programs"/>
+ <div class="text-muted">
+ Manage promotion & coupon programs
+ </div>
+ <div class="content-group">
+ <div class="text-warning mt16" id="sale_coupon" attrs="{'invisible': [('module_sale_coupon','=',False)]}">
+ Save this page and come back here to set up the feature.
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="col-xs-12 col-md-6 o_setting_box" title="There are two ways to manage pricelists: 1) Multiple prices per product: must be set in the Sales tab of the product detail form. 2) Price computed from formulas: must be set in the pricelist form.">
+ <div class="o_setting_left_pane">
+ <field name="multi_sales_price"/>
+ </div>
+ <div class="o_setting_right_pane">
+ <label for="multi_sales_price_method"/>
+ <div class="text-muted">
+ Set multiple prices per product, automated discounts, etc.
+ </div>
+ <div class="content-group" attrs="{'invisible': [('multi_sales_price' ,'=', False)]}">
+ <div class="mt16">
+ <field name="group_product_pricelist" invisible="1"/>
+ <field name="group_sale_pricelist" invisible="1"/>
+ <field name="group_pricelist_item" invisible="1"/>
+ <field name="multi_sales_price_method" widget="radio" class="o_light_label"/>
+ <field name="sale_pricelist_setting" invisible="1" widget="radio"/>
+ </div>
+ <button name="%(product.product_pricelist_action2)d" icon="fa-arrow-right" type="action" string="Pricelists"
+ attrs="{'invisible': [('sale_pricelist_setting', '=', False)]}" class="btn-link"/>
+ </div>
+ </div>
+ </div>
+ <div class="col-xs-12 col-md-6 o_setting_box" title="This adds the choice of a currency on pricelists.">
+ <div class="o_setting_left_pane">
+ <field name="group_multi_currency"/>
+ </div>
+ <div class="o_setting_right_pane">
+ <label for="group_multi_currency"/>
+ <div class="text-muted">
+ Sell in foreign currencies
+ </div>
+ <div class="content-group" attrs="{'invisible': [('group_multi_currency','=',False)]}">
+ <div class="mt16">
+ <button name="%(base.action_currency_form)d" icon="fa-arrow-right" type="action" string="Currencies" class="btn-link"/>
+ </div>
+ <div>
+ <button name="%(account.action_account_config)d" icon="fa-arrow-right" type="action" string="Apply Automatic Rates Update" class="btn-link"/>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="col-xs-12 col-md-6 o_setting_box" title="The margin is computed as the sum of product sales prices minus the cost set in their detail form.">
+ <div class="o_setting_left_pane">
+ <field name="module_sale_margin"/>
+ </div>
+ <div class="o_setting_right_pane">
+ <label for="module_sale_margin"/>
+ <div class="text-muted">
+ Show margins on orders
+ </div>
+ </div>
+ </div>
+ </div>
+ <h2>Products</h2>
+ <div class="row mt16 o_settings_container">
+ <div class="col-xs-12 col-md-6 o_setting_box">
+ <div class="o_setting_left_pane">
+ <field name="group_product_variant"/>
+ </div>
+ <div class="o_setting_right_pane">
+ <label for="group_product_variant"/>
+ <div class="text-muted">
+ Set product attributes (e.g. color, size) to sell variants
+ </div>
+ <div class="content-group" attrs="{'invisible': [('group_product_variant','=',False)]}">
+ <div class="mt16">
+ <button name="%(product.attribute_action)d" icon="fa-arrow-right" type="action" string="Attributes" class="btn-link"/>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="col-xs-12 col-md-6 o_setting_box">
+ <div class="o_setting_left_pane">
+ <field name="group_uom"/>
+ </div>
+ <div class="o_setting_right_pane">
+ <label for="group_uom"/>
+ <div class="text-muted">
+ Sell and purchase products in different units of measure
+ </div>
+ <div class="content-group" attrs="{'invisible': [('group_uom','=',False)]}">
+ <div class="mt16">
+ <button name="%(product.product_uom_form_action)d" icon="fa-arrow-right" type="action" string="Units of Measure" class="btn-link"/>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="col-xs-12 col-md-6 o_setting_box" title="Sending an email is useful if you need to share specific information or content about a product (instructions, rules, links, media, etc.). Create and set the email template from the product detail form (in Sales tab).">
+ <div class="o_setting_left_pane">
+ <field name="module_product_email_template"/>
+ </div>
+ <div class="o_setting_right_pane">
+ <label for="module_product_email_template"/>
+ <div class="text-muted">
+ Send a product-specific email once the invoice is paid
+ </div>
+ </div>
+ </div>
+ <div class="col-xs-12 col-md-6 o_setting_box" title="Ability to select a package type in sales orders and to force a quantity that is a multiple of the number of units per package.">
+ <div class="o_setting_left_pane">
+ <field name="group_stock_packaging"/>
+ </div>
+ <div class="o_setting_right_pane">
+ <label for="group_stock_packaging"/>
+ <div class="text-muted">
+ Sell products by multiple of unit # per package
+ </div>
+ </div>
+ </div>
+ </div>
+ <h2>Quotations & Orders</h2>
+ <div class="row mt16 o_settings_container">
+ <div class="col-xs-12 col-md-6 o_setting_box">
+ <div class="o_setting_left_pane">
+ <field name="module_website_quote"/>
+ </div>
+ <div class="o_setting_right_pane">
+ <label for="module_website_quote"/>
+ <div class="text-muted">
+ Let your customers sign & pay online
+ </div>
+ <div class="content-group">
+ <div class="text-warning mt16" id="website_quote" attrs="{'invisible': [('module_website_quote','=',False)]}">
+ Save this page and come back here to set up the feature.
+ </div>
+ </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">
+ <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"/>
+ </div>
+ <div class="o_setting_right_pane">
+ <label for="group_sale_delivery_address"/>
+ <div class="text-muted">
+ Set specific billing and shipping addresses
+ </div>
+ </div>
+ </div>
+ <div class="col-xs-12 col-md-6 o_setting_box">
+ <div class="o_setting_left_pane">
+ <field name="default_use_sale_note"/>
+ </div>
+ <div class="o_setting_right_pane">
+ <label for="sale_note"/>
+ <span class="fa fa-lg fa-building-o" title="Values set here are company-specific." groups="base.group_multi_company"/>
+ <div class="text-muted">
+ Show standard terms & conditions on orders
+ </div>
+ <div class="content-group" attrs="{'invisible': [('default_use_sale_note','=',False)]}">
+ <div class="mt16">
+ <field name="sale_note"/>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="col-xs-12 col-md-6 o_setting_box">
+ <div class="o_setting_left_pane">
+ <field name="group_warning_sale"/>
+ </div>
+ <div class="o_setting_right_pane">
+ <label for="group_warning_sale"/>
+ <div class="text-muted">
+ Get warnings in orders for products or customers
+ </div>
+ </div>
+ </div>
+ <div class="col-xs-12 col-md-6 o_setting_box">
+ <div class="o_setting_left_pane">
+ <field name="group_sale_layout"/>
+ </div>
+ <div class="o_setting_right_pane">
+ <label string="Order Line Sections"/>
+ <div class="text-muted">
+ Sort products in sections with subtotals and page-breaks
+ </div>
+ <div class="content-group" attrs="{'invisible': [('group_sale_layout','=',False)]}">
+ <div class="mt16">
+ <button name="%(sale.report_configuration_action)d" icon="fa-arrow-right" type="action" string="Order Line Sections" class="btn-link"/>
+ </div>
+ </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"/>
+ </div>
+ <div class="o_setting_right_pane">
+ <label for="auto_done_setting"/>
+ <div class="text-muted">
+ No longer edit orders once confirmed
+ </div>
+ </div>
+ </div>
+ </div>
+ <h2>Invoicing</h2>
+ <div class="row mt16 o_settings_container">
+ <div class="col-xs-12 col-md-6 o_setting_box" title="This default value is applied to any new product created. This can be changed in the product detail form.">
+ <div class="o_setting_right_pane">
+ <label for="default_invoice_policy"/>
+ <div class="text-muted">
+ Quantities to invoice from sales orders
+ </div>
+ <div class="content-group">
+ <div class="mt16">
+ <field name="default_invoice_policy" class="o_light_label" widget="radio"/>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ <h2>Timesheets</h2>
+ <div class="row mt16 o_settings_container">
+ <div class="col-xs-12 col-md-6 o_setting_box" title="Create new projects & tasks for sold services, record time spent and get delivered quantities updated in sales orders accordingly." id="timesheet_grid_sale">
+ <div class="o_setting_left_pane">
+ <field name="module_timesheet_grid_sale" widget="upgrade_boolean"/>
+ </div>
+ <div class="o_setting_right_pane">
+ <label for="module_timesheet_grid_sale"/>
+ <div class="text-muted">
+ Record time spent on services and invoice it
+ </div>
+ <div class="content-group" id="msg_module_timesheet_grid_sale">
+ <div class="text-warning mt16" attrs="{'invisible': [('module_timesheet_grid_sale','=',False)]}">
+ Save this page and come back here to set up the feature.
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ <h2 class="mt32">Shipping</h2>
+ <div class="row mt16 o_settings_container">
+ <div class="col-xs-12 col-md-6 o_setting_box" id="shipping" title="Send delivery orders to your warehouse and get delivered quantities updated in sales orders accordingly.">
+ <div class="o_setting_left_pane">
+ <field name="module_sale_stock"/>
+ </div>
+ <div class="o_setting_right_pane">
+ <label string="Delivery Orders"/>
+ <div class="text-muted">
+ Manage picking and deliveries
+ </div>
+ </div>
+ </div>
+ <div class="col-xs-12 col-md-6 o_setting_box" id="delivery">
+ <div class="o_setting_left_pane">
+ <field name="module_delivery"/>
+ </div>
+ <div class="o_setting_right_pane">
+ <label for="module_delivery"/>
+ <div class="text-muted">
+ Compute shipping costs
+ </div>
+ <div class="content-group">
+ <div class="text-warning mt16" id="delivery_carrier" attrs="{'invisible': [('module_delivery','=',False)]}">
+ Save this page and come back here to set up the feature.
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ <h2>Shipping Connectors</h2>
+ <div class="row mt16 o_settings_container" title="Shipping connectors allow to compute accurate shipping costs, print shipping labels and request carrier picking at your warehouse to ship to the customer. Apply shipping connector from delivery methods.">
+ <div class="col-xs-12 col-md-6 o_setting_box" id="ups">
+ <div class="o_setting_left_pane">
+ <field name="module_delivery_ups" widget="upgrade_boolean"/>
+ </div>
+ <div class="o_setting_right_pane">
+ <label for="module_delivery_ups"/>
+ <div class="text-muted">
+ Ship with UPS
+ </div>
+ <div class="content-group">
+ <div class="text-warning mt16" id="delivery_ups" attrs="{'invisible': [('module_delivery_ups','=',False)]}">
+ Save this page and come back here to set up the feature.
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="col-xs-12 col-md-6 o_setting_box">
+ <div class="o_setting_left_pane">
+ <field name="module_delivery_dhl" widget="upgrade_boolean"/>
+ </div>
+ <div class="o_setting_right_pane">
+ <label for="module_delivery_dhl"/>
+ <div class="text-muted">
+ Ship with DHL
+ </div>
+ <div class="content-group">
+ <div class="text-warning mt16" id="delivery_dhl" attrs="{'invisible': [('module_delivery_dhl','=',False)]}">
+ Save this page and come back here to set up the feature.
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="col-xs-12 col-md-6 o_setting_box">
+ <div class="o_setting_left_pane">
+ <field name="module_delivery_fedex" widget="upgrade_boolean"/>
+ </div>
+ <div class="o_setting_right_pane">
+ <label for="module_delivery_fedex"/>
+ <div class="text-muted">
+ Ship with FedEx
+ </div>
+ <div class="content-group">
+ <div class="text-warning mt16" id="delivery_fedex" attrs="{'invisible': [('module_delivery_fedex','=',False)]}">
+ Save this page and come back here to set up the feature.
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="col-xs-12 col-md-6 o_setting_box">
+ <div class="o_setting_left_pane">
+ <field name="module_delivery_usps" widget="upgrade_boolean"/>
+ </div>
+ <div class="o_setting_right_pane">
+ <label for="module_delivery_usps"/>
+ <div class="text-muted">
+ Ship with USPS
+ </div>
+ <div class="content-group">
+ <div class="text-warning mt16" id="delivery_usps" attrs="{'invisible': [('module_delivery_usps','=',False)]}">
+ Save this page and come back here to set up the feature.
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </xpath>
+ <xpath expr="//h2[@id='integration_h2']" position="attributes">
+ <attribute name="invisible">0</attribute>
+ </xpath>
+ <xpath expr="//div[@id='integration']" position="inside">
+ <div class="col-xs-12 col-md-6 o_setting_box">
+ <div class="o_setting_left_pane">
+ <field name="module_sale_ebay" widget="upgrade_boolean"/>
+ </div>
+ <div class="o_setting_right_pane">
+ <label for="module_sale_ebay"/>
+ <div class="text-muted">
+ Sell your products on eBay
+ </div>
+ <div class="content-group" id="sale_ebay">
+ <div class="text-warning mt16" attrs="{'invisible': [('module_sale_ebay','=',False)]}">
+ Save this page and come back here to set up the feature.
+ </div>
+ </div>
+ </div>
+ </div>
+ </xpath>
+ <xpath expr="//div[@id='integration']" position="inside">
+ <div class="col-xs-12 col-md-6 o_setting_box">
+ <div class="o_setting_left_pane">
+ <field name="module_print_docsaway" widget="upgrade_boolean"/>
+ </div>
+ <div class="o_setting_right_pane">
+ <label for="module_print_docsaway"/>
+ <div class="text-muted">
+ Mail your quotations & invoices in one-click using <a href="https://www.docsaway.com/" target="_blank">Docsaway</a>
+ </div>
+ <div class="content-group">
+ <div class="text-warning mt16" id="print_docsaway" attrs="{'invisible': [('module_print_docsaway','=',False)]}">
+ Save this page and come back here to set up the feature.
+ </div>
+ </div>
+ </div>
+ </div>
+ </xpath>
+ <xpath expr="//div[@id='integration']" position="inside">
+ <div class="col-xs-12 col-md-6 o_setting_box" title="When populating your address book, Odoo relies on Clearbit’s API to provide you with a list of matching contacts or companies.When selecting one item, the partner name, logo and website get automatically set.">
+ <div class="o_setting_left_pane">
+ <field name="module_web_clearbit" widget="upgrade_boolean"/>
+ </div>
+ <div class="o_setting_right_pane">
+ <label string="Company Research"/>
+ <div class="text-muted">
+ Look up company information (name, logo, etc.)
+ </div>
+ </div>
+ </div>
+ </xpath>
+ <xpath expr="//div[@id='sale_contract']" position="after">
+ <div class="col-xs-12 col-md-6 o_setting_box">
+ <div class="o_setting_left_pane">
+ <field name="module_account_accountant"/>
+ </div>
+ <div class="o_setting_right_pane">
+ <label for="module_account_accountant"/>
+ <div class="text-muted">
+ Add all accounting features: journal entries, legal statements, etc.
+ </div>
+ </div>
+ </div>
+ </xpath>
+ <xpath expr="//div[@id='module_sale']" position="replace"/>
+ </field>
+ </record>
</odoo>
diff --git a/addons/sale/views/sale_views.xml b/addons/sale/views/sale_views.xml
index 1b8e12a00167f82fbbb478177290679749f58f01..3bd5a6437b7ae6bd7b96b81b2cee62226e352a9e 100644
--- a/addons/sale/views/sale_views.xml
+++ b/addons/sale/views/sale_views.xml
@@ -368,7 +368,7 @@
<field name="name">sale.order.form.editable.list</field>
<field name="model">sale.order</field>
<field name="inherit_id" ref="sale.view_order_form"/>
- <field name="groups_id" eval="[(4, ref('product.group_stock_packaging')), (4, ref('sale.group_mrp_properties'))]"/>
+ <field name="groups_id" eval="[(4, ref('product.group_stock_packaging'))]"/>
<field name="arch" type="xml">
<xpath expr="//field[@name='order_line']/tree" position="attributes">
<attribute name="editable"/>
diff --git a/addons/sale_stock/models/sale_config_settings.py b/addons/sale_stock/models/sale_config_settings.py
index 5f7f7a8510bf4beb17ee4fd1df0d8708b27fbc33..a7977b9051044fd2d9b58b201a2da61264b1e970 100644
--- a/addons/sale_stock/models/sale_config_settings.py
+++ b/addons/sale_stock/models/sale_config_settings.py
@@ -1,46 +1,14 @@
# -*- coding: utf-8 -*-
# Part of Odoo. See LICENSE file for full copyright and licensing details.
-from odoo import api, fields, models
+from odoo import fields, models
class SaleConfiguration(models.TransientModel):
_inherit = 'sale.config.settings'
- security_lead = fields.Float(related='company_id.security_lead', string="Sales Safety Days *")
- module_delivery = fields.Selection([
- (0, 'No shipping costs on sales orders'),
- (1, 'Allow adding shipping costs')
- ], "Shipping")
- default_picking_policy = fields.Selection([
- (0, 'Ship products when some are available, and allow back orders'),
- (1, 'Ship all products at once, without back orders')
- ], "Default Shipping Policy")
- group_mrp_properties = fields.Selection([
- (0, "Don't use manufacturing properties (recommended as its easier)"),
- (1, 'Allow setting manufacturing order properties per order line (advanced)')
- ], "Properties on SO Lines",
- implied_group='sale.group_mrp_properties',
- help="Allows you to tag sales order lines with properties.")
- group_route_so_lines = fields.Selection([
- (0, 'No order specific routes like MTO or drop shipping'),
- (1, 'Choose specific routes on sales order lines (advanced)')
- ], "Order Routing",
+ security_lead = fields.Float(related='company_id.security_lead', string="Security Lead Time")
+ group_route_so_lines = fields.Boolean("Order-Specific Routes",
implied_group='sale_stock.group_route_so_lines')
- module_sale_order_dates = fields.Selection([
- (0, 'Procurements and deliveries dates are based on the sales order dates'),
- (1, 'Allow to modify the sales order dates to postpone deliveries and procurements')
- ], "Date")
-
- @api.model
- def get_default_sale_config(self, fields):
- default_picking_policy = self.env['ir.values'].get_default('sale.order', 'picking_policy')
- return {
- 'default_picking_policy': 1 if default_picking_policy == 'one' else 0,
- }
-
- @api.multi
- def set_sale_defaults(self):
- default_picking_policy = 'one' if self.default_picking_policy else 'direct'
- self.env['ir.values'].sudo().set_default('sale.order', 'picking_policy', default_picking_policy)
- return super(SaleConfiguration, self).set_sale_defaults()
+ module_sale_order_dates = fields.Boolean("Delivery Date")
+ group_display_incoterm = fields.Boolean("Incoterms", implied_group='sale_stock.group_display_incoterm')
diff --git a/addons/sale_stock/report/sale_order_report_templates.xml b/addons/sale_stock/report/sale_order_report_templates.xml
index 7a7f5fe6d68b941ad63fec1a2bc74ccee3e79041..8a8880fca4f07ab15ed7edada5c2aa6b433d4396 100644
--- a/addons/sale_stock/report/sale_order_report_templates.xml
+++ b/addons/sale_stock/report/sale_order_report_templates.xml
@@ -2,7 +2,7 @@
<odoo>
<template id="report_saleorder_document_inherit_sale_stock" inherit_id="sale.report_saleorder_document">
<xpath expr="//div[@name='payment_term']" position="after">
- <div class="col-xs-3" t-if="doc.incoterm" groups="sale.group_display_incoterm">
+ <div class="col-xs-3" t-if="doc.incoterm" groups="sale_stock.group_display_incoterm">
<strong>Incoterms:</strong>
<p t-field="doc.incoterm.code"/>
</div>
diff --git a/addons/sale_stock/security/sale_stock_security.xml b/addons/sale_stock/security/sale_stock_security.xml
index 52244a0917cfc109adbf3de6b8104a564414b966..630a6512b2d2ed31773325cc09facaafad51a088 100644
--- a/addons/sale_stock/security/sale_stock_security.xml
+++ b/addons/sale_stock/security/sale_stock_security.xml
@@ -5,5 +5,10 @@
<field name="name">Enable Route on Sales Order Line</field>
<field name="category_id" ref="base.module_category_hidden"/>
</record>
+
+ <record id="group_display_incoterm" model="res.groups">
+ <field name="name">Display incoterms on Sales Order and related invoices</field>
+ <field name="category_id" ref="base.module_category_hidden"/>
+ </record>
</data>
</odoo>
diff --git a/addons/sale_stock/views/account_invoice_views.xml b/addons/sale_stock/views/account_invoice_views.xml
index 7da8a3b9ed7bd749d8f544827db0677cea05f027..b04ec1bf75913bdef2fb193e42bc4eb590200ac1 100644
--- a/addons/sale_stock/views/account_invoice_views.xml
+++ b/addons/sale_stock/views/account_invoice_views.xml
@@ -7,7 +7,7 @@
<field name="arch" type="xml">
<data>
<xpath expr="//page[@name='other_info']//field[@name='origin']" position="after">
- <field name="incoterms_id" widget="selection" groups="sale.group_display_incoterm"/>
+ <field name="incoterms_id" widget="selection" groups="sale_stock.group_display_incoterm"/>
</xpath>
</data>
</field>
@@ -15,7 +15,7 @@
<template id="report_invoice_document_inherit_sale_stock" inherit_id="account.report_invoice_document">
<xpath expr="//div[@name='reference']" position="after">
- <div class="col-xs-2" t-if="o.incoterms_id" groups="sale.group_display_incoterm">
+ <div class="col-xs-2" t-if="o.incoterms_id" groups="sale_stock.group_display_incoterm">
<strong>Incoterms:</strong>
<p t-field="o.incoterms_id.code"/>
</div>
diff --git a/addons/sale_stock/views/sale_config_settings_views.xml b/addons/sale_stock/views/sale_config_settings_views.xml
index efb287fefd6a1e7c02b643dfcf3609efc2a1e04f..ae8115f9ac6443db9f7426f28db159781d152718 100644
--- a/addons/sale_stock/views/sale_config_settings_views.xml
+++ b/addons/sale_stock/views/sale_config_settings_views.xml
@@ -1,32 +1,57 @@
<?xml version="1.0" encoding="utf-8"?>
<odoo>
- <record id="view_sales_config_inherit_sale_stock" model="ir.ui.view">
- <field name="name">sale settings</field>
+
+ <record id="sale_config_settings_view_form_inherit_sale_stock" model="ir.ui.view">
+ <field name="name">sale.config.settings.inherit.sale_stock</field>
<field name="model">sale.config.settings</field>
- <field name="inherit_id" ref="sale.view_sales_config"/>
+ <field name="inherit_id" ref="sale.sale_config_settings_view_form_inherit_sale"/>
<field name="arch" type="xml">
- <group name="customers" position="inside">
- <field name="security_lead"/>
- </group>
- <xpath expr="//div[@id='main']" position="inside">
- <group string="Shipping">
- <field name="module_delivery" widget="radio"/>
- <field name="default_picking_policy" widget="radio"/>
- </group>
- </xpath>
- <xpath expr="//group[@id='sale']" position="inside">
- <field name="group_route_so_lines" widget="radio"/>
- <field name="group_mrp_properties" widget="radio" groups="base.group_no_one"/>
- </xpath>
- <field name="group_sale_delivery_address" position="after">
- <field name="group_display_incoterm" widget="radio"/>
- </field>
- <group name="quotations_sales" position="inside">
- <label for="module_sale_order_dates"/>
- <div>
- <field name="module_sale_order_dates" class="oe_inline" widget="radio"/>
+ <xpath expr="//div[@id='delivery']" position="after">
+ <div class="col-xs-12 col-md-6 o_setting_box" title="By default Odoo computes the expected delivery date this way: order date + highest customer lead time of products. With this option, you can set a specific delivery date on orders rather than setting lead times on products.">
+ <div class="o_setting_left_pane">
+ <field name="module_sale_order_dates"/>
+ </div>
+ <div class="o_setting_right_pane">
+ <label for="module_sale_order_dates"/>
+ <div class="text-muted">
+ Set a delivery date on orders
+ </div>
+ </div>
+ </div>
+ <div class="col-xs-12 col-md-6 o_setting_box">
+ <div class="o_setting_left_pane">
+ <field name="group_display_incoterm"/>
+ </div>
+ <div class="o_setting_right_pane">
+ <label for="group_display_incoterm"/>
+ <div class="text-muted">
+ Display incoterms on orders & invoices
+ </div>
+ <div class="content-group" attrs="{'invisible': [('group_display_incoterm','=',False)]}">
+ <div class="mt16">
+ <button name="%(stock.action_incoterms_tree)d" icon="fa-arrow-right" type="action" string="Incoterms" class="btn-link"/>
+ </div>
+ </div>
+ </div>
</div>
- </group>
+ <div class="col-xs-12 col-md-6 o_setting_box" title="This allows to apply a special route on sales order lines (e.g. dropshipping, make-to-order) in case of unusual order scenario. To be available in sales orders, routes must have 'Sales Order Line' option checked in their setup form.">
+ <div class="o_setting_left_pane">
+ <field name="group_route_so_lines"/>
+ </div>
+ <div class="o_setting_right_pane">
+ <label for="group_route_so_lines"/>
+ <div class="text-muted">
+ Apply special routes from orders (e.g. dropshipping, MTO)
+ </div>
+ <div class="content-group" attrs="{'invisible': [('group_route_so_lines','=',False)]}">
+ <div class="mt16">
+ <button name="%(stock.action_routes_form)d" icon="fa-arrow-right" type="action" string="Routes for Sales Order Lines" class="btn-link" context="{'default_sale_selectable': 1}"/>
+ </div>
+ </div>
+ </div>
+ </div>
+ </xpath>
</field>
</record>
+
</odoo>
diff --git a/addons/sale_stock/views/sale_order_views.xml b/addons/sale_stock/views/sale_order_views.xml
index 1f5a1c24e2c2fb8d538a01d75435e7d0d4ffcada..e686523e646bf9b7f94ca42a9c08648f2060639d 100644
--- a/addons/sale_stock/views/sale_order_views.xml
+++ b/addons/sale_stock/views/sale_order_views.xml
@@ -19,7 +19,7 @@
<xpath expr="//group[@name='sales_person']" position="before">
<group string="Shipping Information" name="sale_shipping">
<field name="warehouse_id" options="{'no_create': True}" groups="stock.group_stock_multi_locations"/>
- <field name="incoterm" widget="selection" groups="base.group_user"/>
+ <field name="incoterm" widget="selection" groups="sale_stock.group_display_incoterm"/>
<field name="picking_policy" required="True"/>
</group>
</xpath>
diff --git a/addons/sales_team/models/res_config.py b/addons/sales_team/models/res_config.py
index 8b21d390597f7ea060e57d2636481c0052eb2bb4..dffa4888516c5e069ee14f97a843c26eb8825fe7 100644
--- a/addons/sales_team/models/res_config.py
+++ b/addons/sales_team/models/res_config.py
@@ -1,9 +1,18 @@
# -*- coding: utf-8 -*-
# Part of Odoo. See LICENSE file for full copyright and licensing details.
-from odoo import models
-# Empty class but required since it's overridden by sale & crm
-class SaleConfigSettings(models.TransientModel):
+from odoo import fields, models
+
+class SaleConfigSettings(models.TransientModel):
_name = 'sale.config.settings'
_inherit = 'res.config.settings'
+
+ company_id = fields.Many2one('res.company', string='Company', required=True,
+ default=lambda self: self.env.user.company_id)
+ module_crm = fields.Boolean("CRM")
+ module_sale = fields.Boolean("Sales")
+ module_website_sign = fields.Boolean("eSign")
+ module_helpdesk = fields.Boolean("Helpdesk")
+ module_sale_contract = fields.Boolean("Subscriptions")
+ module_account_accountant = fields.Boolean("Accounting")
diff --git a/addons/sales_team/views/res_config_view.xml b/addons/sales_team/views/res_config_view.xml
index 73475d196c4a9e07a4f2e68355c797c00e01c8f8..628f217904c28704e3f56d3eb6264fbbae259fb2 100644
--- a/addons/sales_team/views/res_config_view.xml
+++ b/addons/sales_team/views/res_config_view.xml
@@ -1,16 +1,77 @@
<?xml version="1.0" encoding="utf-8"?>
<odoo>
<!-- Sale config wizard -->
- <record id="view_sale_config_settings" model="ir.ui.view">
- <field name="name">sale settings</field>
+ <record id="sale_config_settings_view_form" model="ir.ui.view">
+ <field name="name">sale.config.settings.form</field>
<field name="model">sale.config.settings</field>
<field name="arch" type="xml">
<form string="Configure Sales" class="oe_form_configuration" name="sale_config_form">
<header>
- <button string="Apply" type="object" name="execute" class="oe_highlight"/>
+ <button string="Save" type="object" name="execute" class="oe_highlight"/>
<button string="Cancel" type="object" name="cancel" class="oe_link"/>
</header>
- <div id="main"/>
+ <sheet>
+ <h2 id="integration_h2" invisible="1">Integrations</h2>
+ <div class="row mt16 o_settings_container" id="integration"/>
+ <h2 id="recommended_apps">Recommended Apps</h2>
+ <div class="row mt16 o_settings_container">
+ <div class="col-xs-12 col-md-6 o_setting_box" id="module_crm">
+ <div class="o_setting_left_pane">
+ <field name="module_crm"/>
+ </div>
+ <div class="o_setting_right_pane">
+ <label for="module_crm"/>
+ <div class="text-muted">
+ Manage leads, opportunities, meetings and activities
+ </div>
+ </div>
+ </div>
+ <div class="col-xs-12 col-md-6 o_setting_box" id="module_sale">
+ <div class="o_setting_left_pane">
+ <field name="module_sale"/>
+ </div>
+ <div class="o_setting_right_pane">
+ <label for="module_sale"/>
+ <div class="text-muted">
+ Send quotations and manage invoicing
+ </div>
+ </div>
+ </div>
+ <div class="col-xs-12 col-md-6 o_setting_box">
+ <div class="o_setting_left_pane">
+ <field name="module_helpdesk" widget="upgrade_boolean"/>
+ </div>
+ <div class="o_setting_right_pane">
+ <label for="module_helpdesk"/>
+ <div class="text-muted">
+ Track after-sales tickets
+ </div>
+ </div>
+ </div>
+ <div class="col-xs-12 col-md-6 o_setting_box">
+ <div class="o_setting_left_pane">
+ <field name="module_website_sign" widget="upgrade_boolean"/>
+ </div>
+ <div class="o_setting_right_pane">
+ <label for="module_website_sign"/>
+ <div class="text-muted">
+ Send, sign and approve documents online
+ </div>
+ </div>
+ </div>
+ <div class="col-xs-12 col-md-6 o_setting_box" id="sale_contract">
+ <div class="o_setting_left_pane">
+ <field name="module_sale_contract" widget="upgrade_boolean"/>
+ </div>
+ <div class="o_setting_right_pane">
+ <label for="module_sale_contract"/>
+ <div class="text-muted">
+ Sell recurring services with automated billing
+ </div>
+ </div>
+ </div>
+ </div>
+ </sheet>
</form>
</field>
</record>
@@ -19,7 +80,7 @@
<field name="name">Configure Sales</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">sale.config.settings</field>
- <field name="view_id" ref="view_sale_config_settings"/>
+ <field name="view_id" ref="sale_config_settings_view_form"/>
<field name="view_mode">form</field>
<field name="target">inline</field>
</record>
diff --git a/addons/website_quote/__manifest__.py b/addons/website_quote/__manifest__.py
index 7c18b07f0c7de1bb9eb19a700f5bddc08623ffb7..5ecc2344dee2d48ef494baa3085eb053495e2a11 100644
--- a/addons/website_quote/__manifest__.py
+++ b/addons/website_quote/__manifest__.py
@@ -20,6 +20,7 @@ Odoo Sale Quote Roller
'views/sale_order_views.xml',
'views/sale_quote_views.xml',
'views/website_quote_templates.xml',
+ 'views/sale_config_settings_views.xml',
'security/ir.model.access.csv',
],
'demo': [
diff --git a/addons/website_quote/views/sale_config_settings_views.xml b/addons/website_quote/views/sale_config_settings_views.xml
new file mode 100644
index 0000000000000000000000000000000000000000..8b455433f478b71ccd2b71bac74be4ebd0242d15
--- /dev/null
+++ b/addons/website_quote/views/sale_config_settings_views.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+ <record id="sale_config_settings_view_form_inherit_website_quote" model="ir.ui.view">
+ <field name="name">sale.config.settings.inherit.website.quote</field>
+ <field name="model">sale.config.settings</field>
+ <field name="inherit_id" ref="sale.sale_config_settings_view_form_inherit_sale"/>
+ <field name="arch" type="xml">
+ <xpath expr="//div[@id='website_quote']" position="replace">
+ <div class="mt16" attrs="{'invisible': [('module_website_quote','=',False)]}">
+ <button name="%(website_quote.action_sale_quotation_template)d" icon="fa-arrow-right" type="action" string="Quotation Templates" class="btn-link"/>
+ </div>
+ <div attrs="{'invisible': [('module_website_quote','=',False)]}">
+ <button name='%(payment.action_payment_acquirer)d' icon="fa-arrow-right" type="action" string="Payment Methods" class="btn-link"/>
+ </div>
+ </xpath>
+ </field>
+ </record>
+
+</odoo>