[MERGE] forward port branch 11.0 up to ec8c66991d

This commit is contained in:
Christophe Simonis
2019-06-13 16:52:40 +02:00
2 changed files with 3 additions and 0 deletions
+1
View File
@@ -626,6 +626,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,
+2
View File
@@ -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>