diff options
| author | Christophe Simonis <chs@odoo.com> | 2019-06-13 16:52:40 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2019-06-13 16:52:40 +0200 |
| commit | 8a19a6a2a34d318d2c5b799a0e8e108fe04a097c (patch) | |
| tree | 62a9b67550b3eeb4897bb9ebb5801913b438828b | |
| parent | efc64edf704938f442a5ad9bc7e58f2cda3fecda (diff) | |
| parent | ec8c66991d0612f8290ec055634adc1eccf153a7 (diff) | |
[MERGE] forward port branch 11.0 up to ec8c66991d0
| -rw-r--r-- | addons/mail/static/src/js/composer.js | 1 | ||||
| -rw-r--r-- | addons/stock/data/stock_data.xml | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/addons/mail/static/src/js/composer.js b/addons/mail/static/src/js/composer.js index 833e8994b80..1316a342852 100644 --- a/addons/mail/static/src/js/composer.js +++ b/addons/mail/static/src/js/composer.js @@ -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, diff --git a/addons/stock/data/stock_data.xml b/addons/stock/data/stock_data.xml index 53e4639be74..74b7f504428 100644 --- a/addons/stock/data/stock_data.xml +++ b/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> |