Merge branch 'sla_fix' of https://github.com/hrwx/erpnext into sla_fix
diff --git a/erpnext/support/doctype/issue/issue.js b/erpnext/support/doctype/issue/issue.js
index af742ac..44b605d 100644
--- a/erpnext/support/doctype/issue/issue.js
+++ b/erpnext/support/doctype/issue/issue.js
@@ -67,7 +67,6 @@
message: __('Changing Service Level Agreement.')
});
frm.call('change_service_level_agreement_and_priority', {
- "priority": frm.doc.priority,
"service_level_agreement": frm.doc.service_level_agreement
}).then(() => {
frappe.msgprint(__("Service Level Agreement changed to {0}.", [frm.doc.service_level_agreement]));
diff --git a/erpnext/support/doctype/issue/issue.py b/erpnext/support/doctype/issue/issue.py
index b47f710..734b443 100644
--- a/erpnext/support/doctype/issue/issue.py
+++ b/erpnext/support/doctype/issue/issue.py
@@ -163,7 +163,7 @@
self.resolution_by_variance = round(time_diff_in_hours(self.resolution_by, now_datetime()))
@frappe.whitelist()
- def change_service_level_agreement_and_priority(self, priority, service_level_agreement):
+ def change_service_level_agreement_and_priority(self, priority=None, service_level_agreement=None):
self.set_response_and_resolution_time(priority=priority, service_level_agreement=service_level_agreement)
self.save(ignore_permissions=True)