diff options
| author | Christophe Simonis <chs@openerp.com> | 2012-10-11 11:32:52 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@openerp.com> | 2012-10-11 11:32:52 +0200 |
| commit | 0e4df7d28bfcf6d6d3f853812f84b5fcd121dd29 (patch) | |
| tree | b39fb4de494e4e92b4697c8d4956d6d9e053608d /addons/web/static/src/xml/base.xml | |
| parent | fe495942e7e70e032ee2d9cc0e6c16b3b55d5bdd (diff) | |
| parent | 70afbd796e441cce26171af03c26a08f88c3ab52 (diff) | |
merge upstream
bzr revid: chs@openerp.com-20121011093252-ke83ln88kw9em5y6
Diffstat (limited to 'addons/web/static/src/xml/base.xml')
| -rw-r--r-- | addons/web/static/src/xml/base.xml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index 5e8e430e771..a09897862f6 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -548,7 +548,7 @@ <a class="oe_sidebar_action_a" t-att-title="item.title" t-att-data-section="section.name" t-att-data-index="item_index" t-att-href="item.url" target="_blank"> <t t-raw="item.label"/> </a> - <a t-if="section.name == 'files'" class="oe_sidebar_delete_item" t-att-data-id="item.id" title="Delete this attachment">x</a> + <a t-if="section.name == 'files' and !item.callback" class="oe_sidebar_delete_item" t-att-data-id="item.id" title="Delete this attachment">x</a> </li> <li t-if="section.name == 'files'" class="oe_sidebar_add_attachment"> <t t-call="HiddenInputFile"> @@ -1537,7 +1537,7 @@ <td colspan="3"> <label for="import_compat">Export Type:</label> <select id="import_compat" name="import_compat"> - <option value="yes">Import Compatible Export</option> + <option value="yes">Import-Compatible Export</option> <option value="">Export all Data</option> </select> |