From c157b5b57e07494ae48ffdc2ec332159d6a5cbca Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Tue, 5 Aug 2014 16:38:19 +0530 Subject: [PATCH] [print] Hide columns with zero value --- frappe/templates/pages/print.py | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/frappe/templates/pages/print.py b/frappe/templates/pages/print.py index 628bdf24e8..7842857c99 100644 --- a/frappe/templates/pages/print.py +++ b/frappe/templates/pages/print.py @@ -221,11 +221,19 @@ def get_visible_columns(data, table_meta): return columns def column_has_value(data, fieldname): + """Check if at least one cell in column has non-zero and non-blank value""" has_value = False + for row in data: - if row.get(fieldname) is not None: - has_value = True - break + value = row.get(fieldname) + if value: + if isinstance(value, basestring): + if strip_html(value).strip(): + has_value = True + break + else: + has_value = True + break return has_value