Skip to content

Commit

Permalink
Merge branch 'frappe:version-15' into version-15
Browse files Browse the repository at this point in the history
  • Loading branch information
metalmon authored Nov 7, 2024
2 parents 2b6bfbb + 71ca7a6 commit 55b92e2
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion frappe/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
)
from .utils.lazy_loader import lazy_import

__version__ = "15.47.0"
__version__ = "15.47.1"
__title__ = "Frappe Framework"

controllers = {}
Expand Down
2 changes: 1 addition & 1 deletion frappe/public/js/frappe/views/reports/query_report.js
Original file line number Diff line number Diff line change
Expand Up @@ -1482,7 +1482,7 @@ frappe.views.QueryReport = class QueryReport extends frappe.views.BaseList {
const docfield = frappe.query_report.get_filter(fieldname).df;
const value = applied_filters[fieldname];

if (frappe.utils.is_empty(value) || docfield.hidden_due_to_dependency) {
if (docfield.hidden_due_to_dependency) {
return null;
}

Expand Down

0 comments on commit 55b92e2

Please sign in to comment.