diff --git a/addons/crm/views/crm_lead_views.xml b/addons/crm/views/crm_lead_views.xml index 693019c5a960a9b7d903b96569d59c90e8d5fd20..e6cbd3301deb3dcc46b52cdbdda07b173c91a7c3 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 25edc7fb873efdeab013442b5b634bcfe78999ef..7e4f2cd96a818ddec81e249b7aaf67764132f90f 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 17c183a85730334b69546f76cc7ace207b7fc4f8..730b761b870ea034ba9a317c8885c7d1e6ce0734 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 5eaf518ccfb9b6e8813ac2091939a560ec60fb1e..cfd9e1210ba9e82e2134f029ab77f9d7c010c1a2 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"/>' +