[MERGE] Forward-port 9.0 up to 9a3e9291ffa1509f4afa0f35f9d8d71b6e0932d1

5 files changed, 24 insertions, 11 deletions

diff --git a/addons/web/static/src/js/framework/data.js b/addons/web/static/src/js/framework/data.js
index 6aee8f06391..8dd34cd4b93 100644
--- a/addons/web/static/src/js/framework/data.js
+++ b/addons/web/static/src/js/framework/data.js
@@ -812,7 +812,7 @@ var BufferedDataSet = DataSetStatic.extend({
         _.each(ids, function (id) {
             self.get_cache(id).to_delete = true;
         });
-        this.set_ids(_.without(this.ids, _.pluck(_.filter(this.cache, function (c) {return c.to_delete;}), 'id')));
+        this.set_ids(_.difference(this.ids, _.pluck(_.filter(this.cache, function (c) {return c.to_delete;}), 'id')));
         this.trigger("dataset_changed", ids, callback, error_callback);
         return $.async_when({result: true}).done(callback);
     },
diff --git a/addons/web/static/src/js/views/form_widgets.js b/addons/web/static/src/js/views/form_widgets.js
index 53e49c4d905..c27c5982cbb 100644
--- a/addons/web/static/src/js/views/form_widgets.js
+++ b/addons/web/static/src/js/views/form_widgets.js
@@ -780,7 +780,7 @@ var FieldBarChart = common.AbstractField.extend({
                 .margin({top: 0, right: 0, bottom: 0, left: 0})
                 .tooltips(false)
                 .showValues(false)
-                .transitionDuration(350)
+                .transition(350)
                 .showXAxis(false)
                 .showYAxis(false);
    
diff --git a/addons/web/static/src/js/views/graph_widget.js b/addons/web/static/src/js/views/graph_widget.js
index aaeb8404f94..989db33c289 100644
--- a/addons/web/static/src/js/views/graph_widget.js
+++ b/addons/web/static/src/js/views/graph_widget.js
@@ -158,7 +158,7 @@ return Widget.extend({
         var chart = nv.models.multiBarChart();
         chart.options({
           delay: 250,
-          transitionDuration: 10,
+          transition: 10,
           showLegend: true,
           showXAxis: true,
           showYAxis: true,
@@ -212,7 +212,7 @@ return Widget.extend({
         var chart = nv.models.pieChart();
         chart.options({
           delay: 250,
-          transitionDuration: 100,
+          transition: 100,
           color: d3.scale.category10().range(),
         });
 
diff --git a/addons/web/static/src/js/widgets/progress_bar.js b/addons/web/static/src/js/widgets/progress_bar.js
index abe1009b1fa..6ccd1e74f28 100644
--- a/addons/web/static/src/js/widgets/progress_bar.js
+++ b/addons/web/static/src/js/widgets/progress_bar.js
@@ -72,6 +72,9 @@ var ProgressBar = Widget.extend({
 
     on_change_input: function(e) {
         var $input = $(e.target);
+        if(e.type === 'change' && !$input.is(':focus')) {
+            return;
+        }
         if(isNaN($input.val())) {
             this.do_warn(_t("Wrong value entered!"), _t("Only Integer Value should be valid."));
         } else {
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index 67f14dba8dd..82197ef6efe 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -216,8 +216,13 @@
         <t t-raw="0"/>
     </div>
     <div class="btn-group btn-group-sm oe-pager-buttons" style="display: inline-block">
-        <a class="fa fa-chevron-left btn btn-default oe-pager-button" accesskey="O" type="button" data-pager-action="previous"></a>
-        <a class="fa fa-chevron-right btn btn-default oe-pager-button" accesskey="P" type="button" data-pager-action="next"></a>
+        <!-- accesskeys not wanted in X2Many widgets -->
+        <t t-if="!widget.x2m">
+            <t t-set="att_prev" t-value="{'accesskey': 'O'}" />
+            <t t-set="att_next" t-value="{'accesskey': 'P'}" />
+        </t>
+        <a class="fa fa-chevron-left btn btn-default oe-pager-button" t-att="att_prev" type="button" data-pager-action="previous"></a>
+        <a class="fa fa-chevron-right btn btn-default oe-pager-button" t-att="att_next" type="button" data-pager-action="next"></a>
     </div>
 </span>
 
@@ -361,7 +366,7 @@
 <t t-name="ListView.buttons">
     <t t-if="!widget.no_leaf and widget.options.action_buttons !== false and widget.options.addable and widget.is_action_enabled('create')">
     <div class="oe_list_buttons">
-        <button type="button" class="btn btn-sm btn-primary o_list_button_add">
+        <button type="button" class="btn btn-sm btn-primary o_list_button_add" accesskey="C">
             <t t-esc="widget.options.addable"/>
         </button>
     </div>
@@ -402,10 +407,10 @@
 </tr>
 <t t-extend="ListView.buttons">
     <t t-jquery="button.o_list_button_add" t-operation="after">
-        <button type="button" class="btn btn-primary btn-sm o_list_button_save">
+        <button type="button" class="btn btn-primary btn-sm o_list_button_save" accesskey="S">
             Save
         </button>
-        <button type="button" class="btn btn-default btn-sm o_list_button_discard">
+        <button type="button" class="btn btn-default btn-sm o_list_button_discard" accesskey="D">
             Discard
         </button>
     </t>
@@ -1425,8 +1430,13 @@
 <div t-name="Pager">
     <span class="o_pager_value"></span> / <span class="o_pager_limit"></span>
     <span class="btn-group btn-group-sm">
-        <button type="button" class="fa fa-chevron-left btn btn-icon o_pager_previous" accesskey="O"/>
-        <button type="button" class="fa fa-chevron-right btn btn-icon o_pager_next" accesskey="P"/>
+        <!-- accesskeys not wanted in X2Many widgets -->
+        <t t-if="!widget.getParent().x2m">
+            <t t-set="att_prev" t-value="{'accesskey': 'O'}" />
+            <t t-set="att_next" t-value="{'accesskey': 'P'}" />
+        </t>
+        <button type="button" class="fa fa-chevron-left btn btn-icon o_pager_previous" t-att="att_prev"/>
+        <button type="button" class="fa fa-chevron-right btn btn-icon o_pager_next" t-att="att_next"/>
     </span>
 </div>