From e61430b471295e7cb397a356703483b97fc10228 Mon Sep 17 00:00:00 2001 From: Rohit Waghchaure Date: Mon, 3 Dec 2018 18:54:26 +0530 Subject: [PATCH] Removed unnecessary code --- erpnext/projects/doctype/project/project.js | 25 --------------------- erpnext/projects/doctype/project/project.py | 17 -------------- 2 files changed, 42 deletions(-) diff --git a/erpnext/projects/doctype/project/project.js b/erpnext/projects/doctype/project/project.js index 40b065ddff..faa445af94 100644 --- a/erpnext/projects/doctype/project/project.js +++ b/erpnext/projects/doctype/project/project.js @@ -120,28 +120,3 @@ frappe.ui.form.on("Project Task", { frm.trigger('tasks_refresh'); }, }); - -frappe.ui.form.on("Project", "validate", function (frm) { - if (frm.doc.collect_progress == 1) { - frappe.call({ - method: "erpnext.projects.doctype.project.project.times_check", - args: { - "from1": frm.doc.from, - "to": frm.doc.to, - "first_email": frm.doc.first_email, - "second_email": frm.doc.second_email, - "daily_time_to_send": frm.doc.daily_time_to_send, - "weekly_time_to_send": frm.doc.weekly_time_to_send - - }, - callback: function (r) { - frm.set_value("from", r.message.from1); - frm.set_value("to", r.message.to); - frm.set_value("first_email", r.message.first_email); - frm.set_value("second_email", r.message.second_email); - frm.set_value("daily_time_to_send", r.message.daily_time_to_send); - frm.set_value("weekly_time_to_send", r.message.weekly_time_to_send); - } - }); - } -}); \ No newline at end of file diff --git a/erpnext/projects/doctype/project/project.py b/erpnext/projects/doctype/project/project.py index ff698704f0..942593a948 100644 --- a/erpnext/projects/doctype/project/project.py +++ b/erpnext/projects/doctype/project/project.py @@ -427,23 +427,6 @@ def weekly(): project = frappe.db.sql("""SELECT `tabProject User`.user FROM `tabProject User` INNER JOIN `tabProject` ON `tabProject`.project_name = `tabProject User`.parent WHERE (`tabProject`.frequency = "Weekly") AND (`tabProject`.day_to_send = %s) AND (`tabProject`.weekly_time_to_send BETWEEN DATE_ADD(curtime(), INTERVAL -15 MINUTE) AND DATE_ADD(curtime(), INTERVAL 15 MINUTE)) AND `tabProject`.collect_progress = 1""", today) create_project_update(project) -@frappe.whitelist() -def times_check(from1, to, first_email, second_email, daily_time_to_send, weekly_time_to_send): - from1 = datetime.datetime.strptime(from1, "%H:%M:%S.%f") - from1 = from1.strftime("%H:00:00") - to = datetime.datetime.strptime(to, "%H:%M:%S.%f") - to = to.strftime("%H:00:00") - first_email = datetime.datetime.strptime(first_email, "%H:%M:%S.%f") - first_email = first_email.strftime("%H:00:00") - second_email = datetime.datetime.strptime(second_email, "%H:%M:%S.%f") - second_email = second_email.strftime("%H:00:00") - daily_time_to_send = datetime.datetime.strptime(daily_time_to_send, "%H:%M:%S.%f") - daily_time_to_send = daily_time_to_send.strftime("%H:00:00") - weekly_time_to_send = datetime.datetime.strptime(weekly_time_to_send, "%H:%M:%S.%f") - weekly_time_to_send = weekly_time_to_send.strftime("%H:00:00") - return {"from1": from1, "to": to, "first_email": first_email, "second_email": second_email,"daily_time_to_send": daily_time_to_send, "weekly_time_to_send": weekly_time_to_send} - - #Call this function in order to generate the Project Update for a specific project def create_project_update(project): data = []