diff options
| author | Vishmita <vja@tinyerp.com> | 2012-10-09 10:47:40 +0530 |
|---|---|---|
| committer | Vishmita <vja@tinyerp.com> | 2012-10-09 10:47:40 +0530 |
| commit | 916fb67398fc06bd89d898762d2d0a86b33a0333 (patch) | |
| tree | 9f7bee7c8531b72c2bc66a221f3e74ae249be1f5 /addons/web/static/src/xml/base.xml | |
| parent | a8209e48c957e43ccc3411fc07e1d114ebea5772 (diff) | |
| parent | 41daef35ed22f605d37aa528aaa802e8d6eb568b (diff) | |
[Merge]Merge trunk
bzr revid: vja@tinyerp.com-20121009051740-n7vq7ozuu5gz7fg6
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 fa6dbd3a27c..11d2f3da869 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> |