pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[IMP] website_sale: Fetch confirmed orders grouped by product templates

Browse Source 
Purpose
=======

Sales graph should be based on confirmation_date of sales orders, not the date_order.

Date should be aggregated by product templates, not variants
This commit is contained in:
Dhawal Limbuwala
2017-12-05 13:13:22 +01:00
committed by Yannick Tivisse
parent 3821eb218e
commit 930b682b1d
2 changed files with 15 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/website_sale/controllers/backend.py
+12 -13
View File
@@ -40,18 +40,17 @@ class WebsiteSaleBackend(WebsiteBackend):
# Product-based computation
report_product_lines = request.env['sale.report'].read_group(
domain=[
('product_id.website_published', '=', True),
('team_id.team_type', '=', 'website'),
('state', 'in', ['sale', 'done']),
('date', '>=', date_from),
('date', '<=', date_to)],
fields=['product_id', 'product_uom_qty', 'price_subtotal'],
groupby='product_id', orderby='product_uom_qty desc', limit=5)
('confirmation_date', '>=', date_from),
('confirmation_date', '<=', fields.Datetime.now())],
fields=['product_tmpl_id', 'product_uom_qty', 'price_subtotal'],
groupby='product_tmpl_id', orderby='product_uom_qty desc', limit=5)
for product_line in report_product_lines:
product_id = request.env['product.product'].browse(product_line['product_id'][0])
product_tmpl_id = request.env['product.template'].browse(product_line['product_tmpl_id'][0])
sales_values['best_sellers'].append({
'id': product_id.id,
'name': product_id.name,
'id': product_tmpl_id.id,
'name': product_tmpl_id.name,
'qty': product_line['product_uom_qty'],
'sales': product_line['price_subtotal'],
})
@@ -113,8 +112,8 @@ class WebsiteSaleBackend(WebsiteBackend):
sales_domain = [
('team_id.team_type', '=', 'website'),
('state', 'in', ['sale', 'done']),
('date', '>=', date_from),
('date', '<=', date_to)
('confirmation_date', '>=', date_from),
('confirmation_date', '<=', fields.Datetime.now())
]
sales_values['graph'] += [{
'values': self._compute_sale_graph(date_date_from, date_date_to, sales_domain),
@@ -133,10 +132,10 @@ class WebsiteSaleBackend(WebsiteBackend):
daily_sales = request.env['sale.report'].read_group(
domain=sales_domain,
fields=['date', 'price_subtotal'],
groupby='date:day')
fields=['confirmation_date', 'price_subtotal'],
groupby='confirmation_date:day')
daily_sales_dict = {p['date:day']: p['price_subtotal'] for p in daily_sales}
daily_sales_dict = {p['confirmation_date:day']: p['price_subtotal'] for p in daily_sales}
sales_graph = [{
'0': fields.Date.to_string(d) if not previous else fields.Date.to_string(d + timedelta(days=days_between)),
addons/website_sale/static/src/js/website_sale_backend.js
+3 -3
View File
@@ -18,11 +18,11 @@ WebsiteBackend.include({
on_product_template: function (ev) {
ev.preventDefault();
var product_id = $(ev.currentTarget).data('productId');
var product_tmpl_id = $(ev.currentTarget).data('productId');
this.do_action({
type: 'ir.actions.act_window',
res_model: 'product.product',
res_id: product_id,
res_model: 'product.template',
res_id: product_tmpl_id,
views: [[false, 'form']],
target: 'current',
}, {