From 22d8b3037aea93f0f5ee720f53e489e6e5fbad90 Mon Sep 17 00:00:00 2001 From: Himanshu Warekar Date: Sun, 19 May 2019 11:56:37 +0530 Subject: [PATCH] tests: fix issue tests --- erpnext/support/doctype/issue/issue.py | 2 -- .../service_level_agreement/service_level_agreement.py | 6 +++--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/erpnext/support/doctype/issue/issue.py b/erpnext/support/doctype/issue/issue.py index 91333b6370f..4c64a5ababf 100644 --- a/erpnext/support/doctype/issue/issue.py +++ b/erpnext/support/doctype/issue/issue.py @@ -253,11 +253,9 @@ def set_service_level_agreement_variance(issue=None): doc = frappe.get_doc("Issue", issue.name) if not doc.first_responded_on: variance = round(time_diff_in_hours(doc.response_by, now_datetime()), 2) - print(variance) frappe.db.set_value("Issue", doc.name, "response_by_variance", variance) if not doc.resolution_date: variance = round(time_diff_in_hours(doc.resolution_by, now_datetime()), 2) - print(variance) frappe.db.set_value("Issue", doc.name, "resolution_by_variance", variance) def get_list_context(context=None): diff --git a/erpnext/support/doctype/service_level_agreement/service_level_agreement.py b/erpnext/support/doctype/service_level_agreement/service_level_agreement.py index 876aaf5bb21..064ac68caa5 100644 --- a/erpnext/support/doctype/service_level_agreement/service_level_agreement.py +++ b/erpnext/support/doctype/service_level_agreement/service_level_agreement.py @@ -14,13 +14,13 @@ class ServiceLevelAgreement(Document): if frappe.db.exists("Service Level Agreement", {"default_service_level_agreement": "1", "name": ["!=", self.name]}): frappe.throw(_("A Default Service Level Agreement already exists.")) else: - if not (self.start_date and self.end_date and self.ignore_start_and_end_date): + if not (self.start_date and self.end_date) and self.ignore_start_and_end_date: frappe.throw(_("Enter Start and End Date for the Agreement.")) - if self.start_date >= self.end_date and not self.ignore_start_and_end_date: + if self.start_date >= self.end_date and self.ignore_start_and_end_date: frappe.throw(_("Start Date of Agreement can't be greater than or equal to End Date.")) - if self.end_date < frappe.utils.nowdate() and not self.ignore_start_and_end_date: + if self.end_date < frappe.utils.getdate() and self.ignore_start_and_end_date: frappe.throw(_("End Date of Agreement can't be less than today.")) def check_agreement_status():