diff options
| author | Vishmita <vja@tinyerp.com> | 2012-10-11 15:58:37 +0530 |
|---|---|---|
| committer | Vishmita <vja@tinyerp.com> | 2012-10-11 15:58:37 +0530 |
| commit | ffe8dd604a833ae8c3f6b8d1fd6ccdfa02b256bb (patch) | |
| tree | 44d7961b09e4678c0ba8f3c4bc1ece4469213b6c /addons/web/static/src/xml | |
| parent | 3e15613cf7783df5175f52d0ba4945ba54890f98 (diff) | |
| parent | 70afbd796e441cce26171af03c26a08f88c3ab52 (diff) | |
[MERGE]Merge Trunk
bzr revid: vja@tinyerp.com-20121011102837-k0y1kvf901rp3l8u
Diffstat (limited to 'addons/web/static/src/xml')
| -rw-r--r-- | addons/web/static/src/xml/base.xml | 21 |
1 files changed, 18 insertions, 3 deletions
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index bf55db8d7c2..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"> @@ -916,7 +916,7 @@ </t> <t t-name="FieldChar"> <span t-att-class="'oe_form_field '+widget.widget_class" t-att-style="widget.node.attrs.style"> - <t t-if="!widget.get('effective_readonly')"> + <t t-if="!widget.get('effective_readonly')"> <input t-att-type="widget.password ? 'password' : 'text'" t-att-id="widget.id_for_label" t-att-tabindex="widget.node.attrs.tabindex" @@ -925,6 +925,9 @@ t-att-maxlength="widget.field.size" /><img class="oe_field_translate oe_input_icon" t-if="widget.field.translate" t-att-src='_s + "/web/static/src/img/icons/terp-translate.png"' width="16" height="16" border="0"/> </t> + <t t-if="widget.get('effective_readonly')"> + <span class="oe_form_char_content"></span> + </t> </span> </t> <t t-name="FieldEmail"> @@ -1534,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> @@ -1717,4 +1720,16 @@ <button class="oe_form_m2o_sc_button oe_button">Add All Info...</button> <button class="oe_form_m2o_cancel_button oe_button">Cancel</button> </t> +<t t-name="FieldMonetary" t-extend="FieldChar"> + <t t-jquery="t:first" t-operation="before"> + <t t-if="widget.get('currency_info') and widget.get('currency_info').position === 'before'"> + <t t-esc="widget.get('currency_info').symbol"/> + </t> + </t> + <t t-jquery="t:last" t-operation="after"> + <t t-if="widget.get('currency_info') and widget.get('currency_info').position === 'after'"> + <t t-esc="widget.get('currency_info').symbol"/> + </t> + </t> +</t> </templates> |