[MERGE] forward port of branch saas-3 up to 22f2728
authorDenis Ledoux <dle@odoo.com>
Thu, 6 Nov 2014 14:03:43 +0000 (15:03 +0100)
committerDenis Ledoux <dle@odoo.com>
Thu, 6 Nov 2014 14:03:43 +0000 (15:03 +0100)
1  2 
addons/account_asset/account_asset.py
addons/web/static/src/js/view_form.js

Simple merge
@@@ -5780,10 -5458,10 +5780,11 @@@ instance.web.form.FieldMany2ManyBinaryM
          $(window).on(this.fileupload_id, _.bind(this.on_file_loaded, this));
      },
      start: function() {
-         this._super(this);
+         this._super();
+         instance.web.form.ReinitializeFieldMixin.start.call(this);
          this.$el.on('change', 'input.oe_form_binary_file', this.on_file_change );
      },
 +    // WARNING: duplicated in 4 other M2M widgets
      set_value: function(value_) {
          value_ = value_ || [];
          if (value_.length >= 1 && value_[0] instanceof Array) {