From c1187bed26f227764c3de5b8b87792109580bf35 Mon Sep 17 00:00:00 2001 From: Ankush Menat Date: Fri, 21 Apr 2023 18:05:29 +0530 Subject: [PATCH 1/2] fix: SLA permissions (#34981) (cherry picked from commit ac871797b28d87a09c5ca26e618fdf01b087f9de) # Conflicts: # erpnext/support/doctype/service_level_agreement/service_level_agreement.json --- .../service_level_agreement.json | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/erpnext/support/doctype/service_level_agreement/service_level_agreement.json b/erpnext/support/doctype/service_level_agreement/service_level_agreement.json index 1678f04def8..c48d114a821 100644 --- a/erpnext/support/doctype/service_level_agreement/service_level_agreement.json +++ b/erpnext/support/doctype/service_level_agreement/service_level_agreement.json @@ -198,7 +198,11 @@ } ], "links": [], +<<<<<<< HEAD "modified": "2021-07-27 11:16:45.596579", +======= + "modified": "2023-04-21 17:16:56.192560", +>>>>>>> ac871797b2 (fix: SLA permissions (#34981)) "modified_by": "Administrator", "module": "Support", "name": "Service Level Agreement", @@ -217,19 +221,12 @@ "write": 1 }, { - "create": 1, - "delete": 1, - "email": 1, - "export": 1, - "print": 1, "read": 1, - "report": 1, - "role": "All", - "share": 1, - "write": 1 + "role": "All" } ], "sort_field": "modified", "sort_order": "DESC", + "states": [], "track_changes": 1 } From cfa1a2b05085369536ed68074175efb9d142c40a Mon Sep 17 00:00:00 2001 From: s-aga-r Date: Sat, 22 Apr 2023 10:08:26 +0530 Subject: [PATCH 2/2] chore: conflicts --- .../service_level_agreement/service_level_agreement.json | 4 ---- 1 file changed, 4 deletions(-) diff --git a/erpnext/support/doctype/service_level_agreement/service_level_agreement.json b/erpnext/support/doctype/service_level_agreement/service_level_agreement.json index c48d114a821..551d9eb68e4 100644 --- a/erpnext/support/doctype/service_level_agreement/service_level_agreement.json +++ b/erpnext/support/doctype/service_level_agreement/service_level_agreement.json @@ -198,11 +198,7 @@ } ], "links": [], -<<<<<<< HEAD - "modified": "2021-07-27 11:16:45.596579", -======= "modified": "2023-04-21 17:16:56.192560", ->>>>>>> ac871797b2 (fix: SLA permissions (#34981)) "modified_by": "Administrator", "module": "Support", "name": "Service Level Agreement",