diff --git a/addons/sale/res_config.py b/addons/sale/res_config.py index b2f2c51e552..2489e377f9a 100644 --- a/addons/sale/res_config.py +++ b/addons/sale/res_config.py @@ -34,12 +34,6 @@ class sale_configuration(osv.TransientModel): (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 sale orders and invoices') - ], "Incoterms", - implied_group='sale.group_display_incoterm', - help="The printed reports will display the incoterms for the sale 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') diff --git a/addons/sale/res_config_view.xml b/addons/sale/res_config_view.xml index 3ff132e5986..96cb7bb5bd4 100644 --- a/addons/sale/res_config_view.xml +++ b/addons/sale/res_config_view.xml @@ -15,7 +15,6 @@ - diff --git a/addons/sale_stock/res_config.py b/addons/sale_stock/res_config.py index 6cba692be88..415ac351290 100644 --- a/addons/sale_stock/res_config.py +++ b/addons/sale_stock/res_config.py @@ -27,6 +27,12 @@ class SaleConfiguration(models.TransientModel): (1, 'Choose specific routes on sales order lines (advanced)') ], "Order Routing", implied_group='sale_stock.group_route_so_lines') + group_display_incoterm = fields.Selection([ + (0, 'No incoterm on reports'), + (1, 'Show incoterms on sale orders and invoices') + ], "Incoterms", + implied_group='sale.group_display_incoterm', + help="The printed reports will display the incoterms for the sale orders and the related invoices") @api.multi def get_default_sale_config(self): diff --git a/addons/sale_stock/res_config_view.xml b/addons/sale_stock/res_config_view.xml index 1babd1df644..b48ae414145 100644 --- a/addons/sale_stock/res_config_view.xml +++ b/addons/sale_stock/res_config_view.xml @@ -15,6 +15,9 @@ + + +