odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[FIX] web,crm: list view, don't fallback on group_operator declared in python 

Partial revert of odoo/odoo@633780a
This commit is contained in:
Jeremy Kersten 2016-10-12 18:03:43 +02:00
parent 16430be566
commit d3609f7f19
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/crm/crm_lead_view.xml
View File

@ -518,7 +518,7 @@
<field name="source_id" invisible="1"/>
<field name="stage_id"/>
<field name="planned_revenue" sum="Expected Revenues"/>
<field name="probability" />
<field name="probability" avg="Avg. of Probability"/>
<field name="section_id" groups="base.group_multi_salesteams"/>
<field name="user_id"/>
<field name="referred" invisible="1"/>

2
addons/web/static/src/js/view_list.js
View File

@ -2210,7 +2210,7 @@ instance.web.list.Column = instance.web.Class.extend({
}
var aggregation_func = (this.sum && 'sum') || (this.avg && 'avg') ||
(this.max && 'max') || (this.min && 'min') || this.group_operator;
(this.max && 'max') || (this.min && 'min');
if (!aggregation_func) {
return {};