nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-20 21:49:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: Merge conflicts in macros

Browse Source 
- Use `filter-lookup-wrapper` on checkbox wrapper
- Bind data value to wrapper
This commit is contained in:
Marica
2022-03-22 15:39:36 +05:30
committed by GitHub
parent 37134b04d8
commit 0f774f2f07
1 changed files with 0 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -338,13 +338,8 @@
{% if attribute.item_attribute_values %} {% if attribute.item_attribute_values %}
<div class="filter-options"> <div class="filter-options">
{% for attr_value in attribute.item_attribute_values %} {% for attr_value in attribute.item_attribute_values %}
<<<<<<< HEAD
<div class="checkbox">
<label>
=======
<div class="filter-lookup-wrapper checkbox" data-value="{{ attr_value }}"> <div class="filter-lookup-wrapper checkbox" data-value="{{ attr_value }}">
<label data-value="{{ attr_value }}"> <label data-value="{{ attr_value }}">
>>>>>>> f6e64c2cac (fix: Product Filters Lookup)
<input type="checkbox" <input type="checkbox"
class="product-filter attribute-filter" class="product-filter attribute-filter"
id="{{ attr_value }}" id="{{ attr_value }}"