nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-25 16:04:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: Merge conflict inconsistency due to https://github.com/frappe/erpnext/pull/27931

Browse Source
This commit is contained in:
marination
2022-02-01 12:15:48 +05:30
parent 2933cf243a
commit 9eeddc28b0
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
erpnext/templates/includes/macros.html
View File

@@ -342,12 +342,12 @@
<label data-value="{{ attr_value }}"> <label data-value="{{ attr_value }}">
<input type="checkbox" <input type="checkbox"
class="product-filter attribute-filter" class="product-filter attribute-filter"
id="{{attr_value.name}}" id="{{ attr_value }}"
data-attribute-name="{{ attribute.name }}" data-attribute-name="{{ attribute.name }}"
data-attribute-value="{{ attr_value.attribute_value }}" data-attribute-value="{{ attr_value }}"
style="width: 14px !important" style="width: 14px !important"
{% if attr_value.checked %} checked {% endif %}> {% if attr_value.checked %} checked {% endif %}>
<span class="label-area">{{ attr_value.attribute_value }}</span> <span class="label-area">{{ attr_value }}</span>
</label> </label>
</div> </div>
{% endfor %} {% endfor %}