nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-26 16:34:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: failing tests

Browse Source
This commit is contained in:
Saqib Ansari
2021-12-02 14:48:24 +05:30
parent 6f67bbca69
commit a1cedc3ea0
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
erpnext/support/doctype/service_level_agreement/service_level_agreement.py
View File

@@ -647,9 +647,9 @@ def update_hold_time(doc, status):
def reset_expected_response_and_resolution(doc): def reset_expected_response_and_resolution(doc):
update_values = {} update_values = {}
if doc.meta.has_field("first_responded_on") and not doc.first_responded_on: if doc.meta.has_field("first_responded_on") and not doc.get('first_responded_on'):
update_values['response_by'] = None update_values['response_by'] = None
if doc.meta.has_field("resolution_by") and not doc.resolution_date: if doc.meta.has_field("resolution_by") and not doc.get('resolution_date'):
update_values['resolution_by'] = None update_values['resolution_by'] = None
doc.db_set(update_values) doc.db_set(update_values)
@@ -760,7 +760,7 @@ def update_agreement_status(doc, apply_sla_for_resolution):
if (doc.meta.has_field("agreement_status")): if (doc.meta.has_field("agreement_status")):
# if SLA is applied for resolution check for response and resolution, else only response # if SLA is applied for resolution check for response and resolution, else only response
if apply_sla_for_resolution: if apply_sla_for_resolution:
if not doc.first_responded_on: if doc.meta.has_field("first_responded_on") and not doc.first_responded_on:
doc.agreement_status = "First Response Due" doc.agreement_status = "First Response Due"
elif not doc.resolution_date: elif not doc.resolution_date:
doc.agreement_status = "Resolution Due" doc.agreement_status = "Resolution Due"
@@ -769,7 +769,7 @@ def update_agreement_status(doc, apply_sla_for_resolution):
else: else:
doc.agreement_status = "Failed" doc.agreement_status = "Failed"
else: else:
if not doc.first_responded_on: if doc.meta.has_field("first_responded_on") and not doc.first_responded_on:
doc.agreement_status = "First Response Due" doc.agreement_status = "First Response Due"
elif get_datetime(doc.first_responded_on) <= get_datetime(doc.response_by): elif get_datetime(doc.first_responded_on) <= get_datetime(doc.response_by):
doc.agreement_status = "Fulfilled" doc.agreement_status = "Fulfilled"

2
erpnext/support/doctype/service_level_agreement/test_service_level_agreement.py
View File

@@ -351,7 +351,7 @@ def create_service_level_agreement(default_service_level_agreement, holiday_list
if sla: if sla:
frappe.delete_doc("Service Level Agreement", sla, force=1) frappe.delete_doc("Service Level Agreement", sla, force=1)
return frappe.get_doc(service_level_agreement).insert(ignore_permissions=True) return frappe.get_doc(service_level_agreement).insert(ignore_permissions=True, ignore_if_duplicate=True)
def create_customer(): def create_customer():