Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #17542 from rohitwaghchaure/project_update_statue_emails_sending_frequestly_develop

Browse Source 
fix: project update status emails sent frequently
This commit is contained in:
Saurabh 2019-05-10 13:24:50 +05:30 committed by GitHub
commit a15908f6a3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
erpnext/projects/doctype/project/project.py
View File

@ -485,16 +485,17 @@ def daily_reminder():
projects = get_projects_for_collect_progress("Daily", fields) projects = get_projects_for_collect_progress("Daily", fields)
for project in projects: for project in projects:
if not check_project_update_exists(project.name, project.get("daily_time_to_send")): if allow_to_make_project_update(project.name, project.get("daily_time_to_send"), "Daily"):
send_project_update_email_to_users(project.name) send_project_update_email_to_users(project.name)
def twice_daily_reminder(): def twice_daily_reminder():
fields = ["first_email", "second_email"] fields = ["first_email", "second_email"]
projects = get_projects_for_collect_progress("Twice Daily", fields) projects = get_projects_for_collect_progress("Twice Daily", fields)
fields.remove("name")
for project in projects: for project in projects:
for d in fields: for d in fields:
if not check_project_update_exists(project.name, project.get(d)): if allow_to_make_project_update(project.name, project.get(d), "Twicely"):
send_project_update_email_to_users(project.name) send_project_update_email_to_users(project.name)
def weekly_reminder(): def weekly_reminder():
@ -506,14 +507,19 @@ def weekly_reminder():
if current_day != project.day_to_send: if current_day != project.day_to_send:
continue continue
if not check_project_update_exists(project.name, project.get("weekly_time_to_send")): if allow_to_make_project_update(project.name, project.get("weekly_time_to_send"), "Weekly"):
send_project_update_email_to_users(project.name) send_project_update_email_to_users(project.name)
def check_project_update_exists(project, time): def allow_to_make_project_update(project, time, frequency):
data = frappe.db.sql(""" SELECT name from `tabProject Update` data = frappe.db.sql(""" SELECT name from `tabProject Update`
WHERE project = %s and date = %s and time >= %s """, (project, today(), time)) WHERE project = %s and date = %s """, (project, today()))
return True if data and data[0][0] else False # len(data) > 1 condition is checked for twicely frequency
if data and (frequency in ['Daily', 'Weekly'] or len(data) > 1):
return False
if get_time(nowtime()) >= get_time(time):
return True
def get_projects_for_collect_progress(frequency, fields): def get_projects_for_collect_progress(frequency, fields):
fields.extend(["name"]) fields.extend(["name"])