diff options
| author | Christophe Simonis <chs@odoo.com> | 2016-07-15 16:34:41 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2016-07-15 16:34:41 +0200 |
| commit | 5858dda75fd7e73642b74b000352e0762e59324a (patch) | |
| tree | 4219a554abd553ad6af01c619577ab0ba6d3828c /addons/web/static/src/xml/base.xml | |
| parent | 60e446351c3824a2946e02b4f2fe169b1a1fd430 (diff) | |
| parent | a62b8cfaeb8a426a876b7e86133f98851fa7287e (diff) | |
[MERGE] forward port branch saas-11 up to a62b8cf
Diffstat (limited to 'addons/web/static/src/xml/base.xml')
| -rw-r--r-- | addons/web/static/src/xml/base.xml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index 831b4ab4932..79f344bd0df 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -560,7 +560,7 @@ <a href="#"><t t-esc="measure[1].string"/></a> </li> <li class="divider"></li> - <li data-field="__count__"><a href="#">Quantity</a></li> + <li data-field="__count__"><a href="#">Count</a></li> </ul> </div> <div class="btn-group btn-group-sm"> @@ -589,7 +589,7 @@ <a href="#"><t t-esc="measure[1].string"/></a> </li> <li class="divider"></li> - <li data-field="__count__"><a href="#">Quantity</a></li> + <li data-field="__count__"><a href="#">Count</a></li> </ul> </div> <div class="btn-group btn-group-sm"> @@ -748,7 +748,7 @@ </t> <t t-name="FieldMany2ManyTag"> <t t-foreach="elements" t-as="el"> - <span t-attf-class="badge dropdown o_tag_color_#{el.color}" t-att-data-color="el.color" t-att-data-index="el_index" t-att-data-id="el.id"> + <span t-attf-class="badge dropdown o_tag_color_#{el.color || 10}" t-att-data-color="el.color || 10" t-att-data-index="el_index" t-att-data-id="el.id"> <span class="o_badge_text" t-attf-title="#{el['display_name']}"><t t-raw="el['display_name']"/></span> <span t-if="!readonly" class="fa fa-times o_delete"/> </span> |