vassili/seitime-frappe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4

Merge branch 'develop' of https://github.com/frappe/frappe into prepared-report-fix

Browse source
This commit is contained in:
deepeshgarg007 2019-04-16 15:35:07 +05:30
commit d04fa4c553
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
frappe/core/doctype/comment/test_comment.py
View file

@ -35,7 +35,7 @@ class TestComment(unittest.TestCase):
frappe.db.sql("delete from `tabComment` where reference_doctype = 'Blog Post'")
from frappe.templates.includes.comments.comments import add_comment
add_comment('hello', 'test@test.com', 'Good Tester',
add_comment('Good comment with 10 chars', 'test@test.com', 'Good Tester',
'Blog Post', test_blog.name, test_blog.route)
self.assertEqual(frappe.get_all('Comment', fields = ['*'], filters = dict(

4
frappe/desk/doctype/dashboard_chart/dashboard_chart.py
View file

@ -145,7 +145,9 @@ def get_next_expected_date(date, timegrain):
def get_period_ending(date, timegrain):
date = getdate(date)
if timegrain=='Weekly':
if timegrain=='Daily':
pass
elif timegrain=='Weekly':
date = get_week_ending(date)
elif timegrain=='Monthly':
date = get_month_ending(date)