diff --git a/addons/sale/__init__.py b/addons/sale/__init__.py index 2ec8f5b6b2f..09b49c379e8 100644 --- a/addons/sale/__init__.py +++ b/addons/sale/__init__.py @@ -3,6 +3,7 @@ import sale import sale_analytic +import sale_layout import sales_team import res_partner import wizard diff --git a/addons/sale/__openerp__.py b/addons/sale/__openerp__.py index 36ce45996d3..0f06671b920 100644 --- a/addons/sale/__openerp__.py +++ b/addons/sale/__openerp__.py @@ -32,6 +32,8 @@ You can choose flexible invoicing methods: * *On Delivery Order*: Invoices are generated from picking (delivery) * *Before Delivery*: A Draft invoice is created and must be paid before delivery +With this module you can personnalize the sale order and invoice report with +separators, page-breaks or subtotals. The Dashboard for the Sales Manager will include ------------------------------------------------ @@ -39,7 +41,7 @@ The Dashboard for the Sales Manager will include * Monthly Turnover (Graph) """, 'website': 'https://www.odoo.com/page/crm', - 'depends': ['sales_team','account', 'procurement', 'report'], + 'depends': ['sales_team', 'account', 'procurement', 'report'], 'data': [ 'wizard/sale_make_invoice_advance.xml', 'security/sale_security.xml', @@ -47,6 +49,7 @@ The Dashboard for the Sales Manager will include 'sale_sequence.xml', 'sale_report.xml', 'sale_data.xml', + 'sale_layout_category_data.xml', 'sale_view.xml', 'sales_team_view.xml', 'res_partner_view.xml', @@ -55,6 +58,9 @@ The Dashboard for the Sales Manager will include 'res_config_view.xml', 'views/report_saleorder.xml', 'views/sale.xml', + 'views/report_invoice_layouted.xml', + 'views/sale_layout_category_view.xml', + 'views/sale_layout_template.xml', 'sales_team_dashboard.xml', 'sale_tip_data.xml', ], diff --git a/addons/sale/res_config.py b/addons/sale/res_config.py index 4212a88b836..706c5a43b6c 100644 --- a/addons/sale/res_config.py +++ b/addons/sale/res_config.py @@ -45,10 +45,10 @@ class sale_configuration(osv.TransientModel): (0, 'Salespeople do not need to view margins when quoting'), (1, 'Display margins on quotations and sales orders') ], "Margins"), - 'module_sale_layout': fields.selection([ + 'group_sale_layout': fields.selection([ (0, 'Do not personalize sale orders and invoice reports'), - (1, 'Personnalize the sale orders and invoice report with separators, page-breaks or subtotals') - ], "Sale Reports Layout"), + (1, 'Personalize the sale orders and invoice report with separators, page-breaks or subtotals') + ], "Sale Reports Layout", implied_group='sale.group_sale_layout'), 'module_website_quote': fields.selection([ (0, 'Print quotes or send by email'), (1, 'Send online quotations based on templates (advanced)') diff --git a/addons/sale/res_config_view.xml b/addons/sale/res_config_view.xml index c00a65f2d41..c19acf8ce67 100644 --- a/addons/sale/res_config_view.xml +++ b/addons/sale/res_config_view.xml @@ -18,7 +18,7 @@ - +