diff options
| author | Christophe Simonis <chs@odoo.com> | 2019-06-13 15:32:55 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2019-06-13 15:32:55 +0200 |
| commit | 641ca4f7f438a85e5921502e55f2d6f8305a85ec (patch) | |
| tree | 8c70f760cbf6fb8e0ca80796fde8aef352a98781 /addons | |
| parent | e14fd457b9c081dbd420ca3186c4d5c87aacf3f2 (diff) | |
| parent | 6a247212f8c53b1fb85ea08ffefc52c88d1024c0 (diff) | |
[MERGE] forward port branch saas-14 up to 6a247212f8c
Diffstat (limited to 'addons')
| -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 8f070b680a7..bb174a31014 100644 --- a/addons/mail/static/src/js/composer.js +++ b/addons/mail/static/src/js/composer.js @@ -607,6 +607,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 1e0f5785c20..6490809da21 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> |