[MERGE] forward port branch 11.0 up to ec8c66991d
This commit is contained in:
@@ -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,
|
||||
|
||||
@@ -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>
|
||||
|
||||
Reference in New Issue
Block a user