diff options
| author | Frédéric van der Essen <fva@openerp.com> | 2012-10-08 17:54:10 +0200 |
|---|---|---|
| committer | Frédéric van der Essen <fva@openerp.com> | 2012-10-08 17:54:10 +0200 |
| commit | f175541201a4e0ce5e49c4d9c9d41e2ec809c9ae (patch) | |
| tree | 8a1bfdaa92bb780a88a499d2c6c2d85f01771244 /addons/web/static/src/xml/base.xml | |
| parent | 7bf081d7e656980bfa13dc6bdc072a2f20d94fd2 (diff) | |
| parent | 2ada6891489e77bfd3cbeaa6b8f76866bb5d5845 (diff) | |
[MERGE] from trunk
bzr revid: fva@openerp.com-20121008155410-0ixzq3fbgotalbx4
Diffstat (limited to 'addons/web/static/src/xml/base.xml')
| -rw-r--r-- | addons/web/static/src/xml/base.xml | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index bf55db8d7c2..5e8e430e771 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -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"> @@ -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> |