pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[MERGE] forward port branch 11.0 up to ec8c66991d

Browse Source
This commit is contained in:
Christophe Simonis
2019-06-13 16:52:40 +02:00
parent efc64edf70 ec8c66991d
commit 8a19a6a2a3
2 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/mail/static/src/js/composer.js
+1
View File
@@ -626,6 +626,7 @@ var BasicComposer = Widget.extend({
}); });
attachments = attachments.concat(upload_attachments); attachments = attachments.concat(upload_attachments);
this.set('attachment_ids', attachments); this.set('attachment_ids', attachments);
event.target.value = "";
}, },
on_attachment_loaded: function(event) { on_attachment_loaded: function(event) {
var self = this, var self = this,
addons/stock/data/stock_data.xml
+2
View File
@@ -14,6 +14,8 @@
<!-- <!--
Resource: stock.location Resource: stock.location
--> -->
</data>
<data noupdate="1">
<record id="stock_location_locations" model="stock.location"> <record id="stock_location_locations" model="stock.location">
<field name="name">Physical Locations</field> <field name="name">Physical Locations</field>
<field name="usage">view</field> <field name="usage">view</field>