[MERGE] forward port branch 10.0 up to 818d34630d

2019-06-13 15:25:43 +02:00
parent 348f3d8bbc 818d34630d
commit 6a247212f8
2 changed files with 3 additions and 0 deletions
@@ -608,6 +608,7 @@ var BasicComposer = Widget.extend({
                'mimetype': '',
            });
            this.set('attachment_ids', attachments);
+            event.target.value = "";
        }
    },
    on_attachment_loaded: function(event, result) {
@@ -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>