From af297345c685839ff22cd3e64143c82e784df8bc Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@odoo.com>
Date: Mon, 2 Oct 2017 11:02:17 +0200
Subject: [PATCH] [FIX] crm: avoid clash on attribute name

The sum is already used in views for
   <field name="foo" sum="Total" />

Where "Total" is translatable and extracted in source terms export.

The progress bar kanban widget expect a field name (untranslatable).

Avoid to translate a field name by changing the attribute
---
 addons/crm/views/crm_lead_views.xml                             | 2 +-
 .../web/static/src/js/views/kanban/kanban_column_progressbar.js | 2 +-
 addons/web/static/src/js/views/kanban/kanban_view.js            | 2 +-
 addons/web/static/tests/views/kanban_tests.js                   | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/crm/views/crm_lead_views.xml b/addons/crm/views/crm_lead_views.xml
index 693019c5a96..e6cbd3301de 100644
--- a/addons/crm/views/crm_lead_views.xml
+++ b/addons/crm/views/crm_lead_views.xml
@@ -302,7 +302,7 @@
                     <field name="company_currency"/>
                     <field name="activity_state" />
                     <field name="activity_ids" />
-                    <progressbar field="activity_state" colors='{"planned": "success", "today": "warning", "overdue": "danger"}' sum="planned_revenue"/>
+                    <progressbar field="activity_state" colors='{"planned": "success", "today": "warning", "overdue": "danger"}' sum_field="planned_revenue"/>
                     <templates>
                         <field name="date_deadline"/>
                         <t t-name="kanban-box">
diff --git a/addons/web/static/src/js/views/kanban/kanban_column_progressbar.js b/addons/web/static/src/js/views/kanban/kanban_column_progressbar.js
index 25edc7fb873..7e4f2cd96a8 100644
--- a/addons/web/static/src/js/views/kanban/kanban_column_progressbar.js
+++ b/addons/web/static/src/js/views/kanban/kanban_column_progressbar.js
@@ -29,7 +29,7 @@ var KanbanColumnProgressBar = Widget.extend({
         // <progressbar/> attributes
         this.fieldName = columnState.progressBarValues.field;
         this.colors = columnState.progressBarValues.colors;
-        this.sumField = columnState.progressBarValues.sum;
+        this.sumField = columnState.progressBarValues.sum_field;
 
         // Previous progressBar state
         var state = options.progressBarStates[this.columnID];
diff --git a/addons/web/static/src/js/views/kanban/kanban_view.js b/addons/web/static/src/js/views/kanban/kanban_view.js
index 17c183a8573..730b761b870 100644
--- a/addons/web/static/src/js/views/kanban/kanban_view.js
+++ b/addons/web/static/src/js/views/kanban/kanban_view.js
@@ -44,7 +44,7 @@ var KanbanView = BasicView.extend({
             if (isProgressBar) {
                 progressBar = _.clone(n.attrs);
                 progressBar.colors = JSON.parse(progressBar.colors);
-                progressBar.sum = progressBar.sum || false;
+                progressBar.sum_field = progressBar.sum_field || false;
             }
             return !isProgressBar;
         });
diff --git a/addons/web/static/tests/views/kanban_tests.js b/addons/web/static/tests/views/kanban_tests.js
index 5eaf518ccfb..cfd9e1210ba 100644
--- a/addons/web/static/tests/views/kanban_tests.js
+++ b/addons/web/static/tests/views/kanban_tests.js
@@ -2009,7 +2009,7 @@ QUnit.module('Views', {
                 '<kanban>' +
                     '<field name="bar"/>' +
                     '<field name="int_field"/>' +
-                    '<progressbar field="foo" colors=\'{"yop": "success", "gnap": "warning", "blip": "danger"}\' sum="int_field"/>' +
+                    '<progressbar field="foo" colors=\'{"yop": "success", "gnap": "warning", "blip": "danger"}\' sum_field="int_field"/>' +
                     '<templates><t t-name="kanban-box">' +
                         '<div>' +
                             '<field name="name"/>' +