@@ -25,8 +25,7 @@ class TestReport(unittest.TestCase): | |||||
self.assertTrue('User' in [d[0] for d in data]) | self.assertTrue('User' in [d[0] for d in data]) | ||||
# test standard report with child table | # test standard report with child table | ||||
user_activity_report = ''' | |||||
{ | |||||
user_activity_report = '''{ | |||||
"add_total_row": 0, | "add_total_row": 0, | ||||
"apply_user_permissions": 1, | "apply_user_permissions": 1, | ||||
"disabled": 0, | "disabled": 0, | ||||
@@ -42,5 +41,4 @@ user_activity_report = ''' | |||||
"ref_doctype": "User", | "ref_doctype": "User", | ||||
"report_name": "User Activity Report", | "report_name": "User Activity Report", | ||||
"report_type": "Report Builder" | "report_type": "Report Builder" | ||||
} | |||||
''' | |||||
}''' |
@@ -2,7 +2,7 @@ | |||||
"allow_copy": 0, | "allow_copy": 0, | ||||
"allow_import": 0, | "allow_import": 0, | ||||
"allow_rename": 1, | "allow_rename": 1, | ||||
"autoname": "field:report", | |||||
"autoname": "", | |||||
"beta": 0, | "beta": 0, | ||||
"creation": "2016-09-01 01:34:34.985457", | "creation": "2016-09-01 01:34:34.985457", | ||||
"custom": 0, | "custom": 0, | ||||
@@ -369,7 +369,7 @@ | |||||
"issingle": 0, | "issingle": 0, | ||||
"istable": 0, | "istable": 0, | ||||
"max_attachments": 0, | "max_attachments": 0, | ||||
"modified": "2016-09-01 05:21:16.487736", | |||||
"modified": "2016-09-01 05:36:00.898683", | |||||
"modified_by": "Administrator", | "modified_by": "Administrator", | ||||
"module": "Email", | "module": "Email", | ||||
"name": "Auto Email Report", | "name": "Auto Email Report", | ||||
@@ -67,7 +67,7 @@ class AutoEmailReport(Document): | |||||
def get_xls(self, data): | def get_xls(self, data): | ||||
return | return | ||||
def send_daily(self): | |||||
def send_daily(): | |||||
'''Check reports to be sent daily''' | '''Check reports to be sent daily''' | ||||
now = frappe.utils.now_datetime() | now = frappe.utils.now_datetime() | ||||
for report in frappe.get_all('Auto Email Report', {'enabled': 1, 'frequency': ('in', ('Daily', 'Weekly'))}): | for report in frappe.get_all('Auto Email Report', {'enabled': 1, 'frequency': ('in', ('Daily', 'Weekly'))}): | ||||
@@ -80,7 +80,7 @@ def send_daily(self): | |||||
auto_email_report.send() | auto_email_report.send() | ||||
def send_monthly(self): | |||||
def send_monthly(): | |||||
'''Check reports to be sent monthly''' | '''Check reports to be sent monthly''' | ||||
for report in frappe.get_all('Auto Email Report', {'enabled': 1, 'frequency': 'Monthly'}): | for report in frappe.get_all('Auto Email Report', {'enabled': 1, 'frequency': 'Monthly'}): | ||||
frappe.get_doc('Auto Email Report', report.name).send() | frappe.get_doc('Auto Email Report', report.name).send() |