[MERGE] forward port of branch 8.0 up to 83bd9ee

2 files changed, 6 insertions, 7 deletions

diff --git a/addons/web/static/src/js/formats.js b/addons/web/static/src/js/formats.js
index 0ec366d44ce..3dbacc98527 100644
--- a/addons/web/static/src/js/formats.js
+++ b/addons/web/static/src/js/formats.js
@@ -304,13 +304,13 @@ instance.web.auto_date_to_str = function(value, type) {
  * performs a half up rounding with arbitrary precision, correcting for float loss of precision
  * See the corresponding float_round() in server/tools/float_utils.py for more info
  * @param {Number} the value to be rounded
- * @param {Number} a non zero precision parameter. eg: 0.01 rounds to two digits.
+ * @param {Number} a precision parameter. eg: 0.01 rounds to two digits.
  */
 instance.web.round_precision = function(value, precision){
-    if(!value){
+    if (!value) {
         return 0;
-    }else if(!precision){
-        throw new Error('round_precision(...):  Cannot round value: '+value+' with a precision of zero (or undefined)');
+    } else if (!precision || precision < 0) {
+        precision = 1;
     }
     var normalized_value = value / precision;
     var epsilon_magnitude = Math.log(Math.abs(normalized_value))/Math.log(2);
diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index 48e2c99703b..20cba67c5a1 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -5732,7 +5732,7 @@ instance.web.form.FieldBinaryImage = instance.web.form.FieldBinary.extend({
  * Options on attribute ; "blockui" {Boolean} block the UI or not
  * during the file is uploading
  */
-instance.web.form.FieldMany2ManyBinaryMultiFiles = instance.web.form.AbstractField.extend({
+instance.web.form.FieldMany2ManyBinaryMultiFiles = instance.web.form.AbstractField.extend(instance.web.form.ReinitializeFieldMixin, {
     template: "FieldBinaryFileUploader",
     init: function(field_manager, node) {
         this._super(field_manager, node);
@@ -5747,8 +5747,7 @@ instance.web.form.FieldMany2ManyBinaryMultiFiles = instance.web.form.AbstractFie
         this.fileupload_id = _.uniqueId('oe_fileupload_temp');
         $(window).on(this.fileupload_id, _.bind(this.on_file_loaded, this));
     },
-    start: function() {
-        this._super(this);
+    initialize_content: function() {
         this.$el.on('change', 'input.oe_form_binary_file', this.on_file_change );
     },
     // WARNING: duplicated in 4 other M2M widgets