[MERGE] forward port branch saas-14 up to 6a247212f8

addons/mail/static/src/js/composer.js

@@ -607,6 +607,7 @@ var BasicComposer = Widget.extend({
         });
         attachments = attachments.concat(upload_attachments);
         this.set('attachment_ids', attachments);
+        event.target.value = "";
     },
     on_attachment_loaded: function(event) {
         var self = this,

addons/stock/data/stock_data.xml

@@ -14,6 +14,8 @@
                 <!--
     Resource: stock.location
     -->
+    </data>
+    <data noupdate="1">
         <record id="stock_location_locations" model="stock.location">
             <field name="name">Physical Locations</field>
             <field name="usage">view</field>