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

fix: failing tests in issue doctype (#26998)

Browse Source
This commit is contained in:
Saqib 2021-08-18 14:53:32 +05:30 committed by GitHub
parent fbc163cea6
commit cab49254fc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/support/doctype/issue/test_issue.py
View File

@ -13,6 +13,10 @@ from datetime import timedelta
class TestSetUp(unittest.TestCase): class TestSetUp(unittest.TestCase):
def setUp(self): def setUp(self):
frappe.db.sql("delete from `tabService Level Agreement`") frappe.db.sql("delete from `tabService Level Agreement`")
frappe.db.sql("delete from `tabService Level Priority`")
frappe.db.sql("delete from `tabSLA Fulfilled On Status`")
frappe.db.sql("delete from `tabPause SLA On Status`")
frappe.db.sql("delete from `tabService Day`")
frappe.db.set_value("Support Settings", None, "track_service_level_agreement", 1) frappe.db.set_value("Support Settings", None, "track_service_level_agreement", 1)
create_service_level_agreements_for_issues() create_service_level_agreements_for_issues()

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

@ -235,10 +235,9 @@ def get_active_service_level_agreement_for(doc):
] ]
customer = doc.get('customer') customer = doc.get('customer')
if customer: or_filters.append(
or_filters.append( ["Service Level Agreement", "entity", "in", [customer, get_customer_group(customer), get_customer_territory(customer)]]
["Service Level Agreement", "entity", "in", [customer, get_customer_group(customer), get_customer_territory(customer)]] )
)
default_sla_filter = filters + [["Service Level Agreement", "default_service_level_agreement", "=", 1]] default_sla_filter = filters + [["Service Level Agreement", "default_service_level_agreement", "=", 1]]
default_sla = frappe.get_all("Service Level Agreement", filters=default_sla_filter, default_sla = frappe.get_all("Service Level Agreement", filters=default_sla_filter,