mirror of
https://github.com/frappe/erpnext.git
synced 2026-08-16 16:08:39 +00:00
fix: address product bundle review comments
(cherry picked from commit d48a1e0d16)
This commit is contained in:
@@ -479,18 +479,23 @@ def hide_empty_optional_columns(columns, data):
|
|||||||
|
|
||||||
fields_with_values = set()
|
fields_with_values = set()
|
||||||
for row in data:
|
for row in data:
|
||||||
for fieldname in optional_fields:
|
for column in columns:
|
||||||
if field_has_value(row, fieldname):
|
fieldname = column["fieldname"]
|
||||||
fields_with_values.add(fieldname)
|
if fieldname in optional_fields and field_has_value(row, column):
|
||||||
|
fields_with_values.add(column["fieldname"])
|
||||||
|
|
||||||
return [column for column in columns if column["fieldname"] not in optional_fields - fields_with_values]
|
return [column for column in columns if column["fieldname"] not in optional_fields - fields_with_values]
|
||||||
|
|
||||||
|
|
||||||
def field_has_value(row, fieldname):
|
def field_has_value(row, column):
|
||||||
|
fieldname = column["fieldname"]
|
||||||
if fieldname not in row:
|
if fieldname not in row:
|
||||||
return False
|
return False
|
||||||
|
|
||||||
value = row.get(fieldname)
|
value = row.get(fieldname)
|
||||||
|
if column.get("fieldtype") == "Check":
|
||||||
|
return bool(value)
|
||||||
|
|
||||||
return value is not None and value != ""
|
return value is not None and value != ""
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user