diff --git a/addons/crm/views/crm_views.xml b/addons/crm/views/crm_views.xml index 60589cb742e..fa448e9cb8a 100644 --- a/addons/crm/views/crm_views.xml +++ b/addons/crm/views/crm_views.xml @@ -60,7 +60,7 @@ diff --git a/addons/sale/report/report_all_channels_sales_views.xml b/addons/sale/report/report_all_channels_sales_views.xml index d2ec23db180..793b568528e 100644 --- a/addons/sale/report/report_all_channels_sales_views.xml +++ b/addons/sale/report/report_all_channels_sales_views.xml @@ -4,7 +4,7 @@ report.all.channels.sales.pivot report.all.channels.sales - + @@ -15,7 +15,7 @@ report.all.channels.sales.search report.all.channels.sales - + @@ -26,7 +26,7 @@ - All Channels Sales Orders + Sales by Channel report.all.channels.sales pivot diff --git a/addons/sale/report/sale_report.py b/addons/sale/report/sale_report.py index e3be9566cde..e1992dcca8e 100644 --- a/addons/sale/report/sale_report.py +++ b/addons/sale/report/sale_report.py @@ -34,7 +34,7 @@ class SaleReport(models.Model): pricelist_id = fields.Many2one('product.pricelist', 'Pricelist', readonly=True) analytic_account_id = fields.Many2one('account.analytic.account', 'Analytic Account', readonly=True) team_id = fields.Many2one('crm.team', 'Sales Channel', readonly=True, oldname='section_id') - country_id = fields.Many2one('res.country', 'Partner Country', readonly=True) + country_id = fields.Many2one('res.country', 'Customer Country', readonly=True) commercial_partner_id = fields.Many2one('res.partner', 'Commercial Entity', readonly=True) state = fields.Selection([ ('draft', 'Draft Quotation'), diff --git a/addons/sale/report/sale_report_views.xml b/addons/sale/report/sale_report_views.xml index 3b7017acfe2..c74e8c5eca4 100644 --- a/addons/sale/report/sale_report_views.xml +++ b/addons/sale/report/sale_report_views.xml @@ -24,33 +24,6 @@ - - - Sales Funnel - sale.report - ['&', ('date','<=', time.strftime('%%Y-12-31')), '&', ('date','>=',time.strftime('%%Y-01-01')), ('state','not in',('cancel',))] - - {'group_by': ['state'], 'measures': ['price_subtotal']} - - - By Salespersons - sale.report - - {'group_by': ['date:month', 'user_id']} - - - By Salesteam - sale.report - - {'group_by': ['date:month', 'team_id']} - - - By Product - sale.report - - {'group_by': ['date:month', 'product_id']} - - sale.report.search sale.report @@ -71,13 +44,14 @@ - + + - + diff --git a/addons/sale/views/sale_views.xml b/addons/sale/views/sale_views.xml index 1f6700bd170..e8f9a70b3cf 100644 --- a/addons/sale/views/sale_views.xml +++ b/addons/sale/views/sale_views.xml @@ -50,16 +50,16 @@ sequence="1"/> + sequence="3"/> + sequence="2"/> diff --git a/addons/sales_team/views/crm_team_views.xml b/addons/sales_team/views/crm_team_views.xml index dc2ae1fc338..5bab6f7b5df 100644 --- a/addons/sales_team/views/crm_team_views.xml +++ b/addons/sales_team/views/crm_team_views.xml @@ -22,7 +22,7 @@ - Sales Channels + Sales Channel Dashboard crm.team form kanban,form