Skip to content

Commit

Permalink
fix: don't use default filters for auto-email report (#20876)
Browse files Browse the repository at this point in the history
(cherry picked from commit 9f35d0e)
  • Loading branch information
vorasmit authored and mergify[bot] committed May 10, 2023
1 parent 8b0c1f8 commit 7d7500f
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 4 deletions.
22 changes: 18 additions & 4 deletions frappe/core/doctype/report/report.py
Original file line number Diff line number Diff line change
Expand Up @@ -174,10 +174,18 @@ def execute_script(self, filters):
return self.get_columns(), loc["result"]

def get_data(
self, filters=None, limit=None, user=None, as_dict=False, ignore_prepared_report=False
self,
filters=None,
limit=None,
user=None,
as_dict=False,
ignore_prepared_report=False,
are_default_filters=True,
):
if self.report_type in ("Query Report", "Script Report", "Custom Report"):
columns, result = self.run_query_report(filters, user, ignore_prepared_report)
columns, result = self.run_query_report(
filters, user, ignore_prepared_report, are_default_filters
)
else:
columns, result = self.run_standard_report(filters, limit, user)

Expand All @@ -186,10 +194,16 @@ def get_data(

return columns, result

def run_query_report(self, filters=None, user=None, ignore_prepared_report=False):
def run_query_report(
self, filters=None, user=None, ignore_prepared_report=False, are_default_filters=True
):
columns, result = [], []
data = frappe.desk.query_report.run(
self.name, filters=filters, user=user, ignore_prepared_report=ignore_prepared_report
self.name,
filters=filters,
user=user,
ignore_prepared_report=ignore_prepared_report,
are_default_filters=are_default_filters,
)

for d in data.get("columns"):
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,7 @@ def get_report_content(self):
filters=self.filters,
as_dict=True,
ignore_prepared_report=True,
are_default_filters=False,
)

# add serial numbers
Expand Down

0 comments on commit 7d7500f

Please sign in to comment.