From 7fdde16048f4ad5af937be4c8a943a098d659e80 Mon Sep 17 00:00:00 2001
From: s-aga-r <sagarsharma.s312@gmail.com>
Date: Fri, 5 Jan 2024 15:35:14 +0530
Subject: [PATCH 1/2] fix: add read permission to Buying Settings

(cherry picked from commit e05bf9d32a00aac55021faaacbfa914ee9f7275a)

# Conflicts:
#	erpnext/buying/doctype/buying_settings/buying_settings.json
---
 .../buying_settings/buying_settings.json      | 39 +++++++++++++++++++
 1 file changed, 39 insertions(+)

diff --git a/erpnext/buying/doctype/buying_settings/buying_settings.json b/erpnext/buying/doctype/buying_settings/buying_settings.json
index 0af93bfc9029..51a13871c746 100644
--- a/erpnext/buying/doctype/buying_settings/buying_settings.json
+++ b/erpnext/buying/doctype/buying_settings/buying_settings.json
@@ -188,7 +188,11 @@
  "index_web_pages_for_search": 1,
  "issingle": 1,
  "links": [],
+<<<<<<< HEAD
  "modified": "2023-11-24 10:55:51.287327",
+=======
+ "modified": "2024-01-05 15:26:02.320942",
+>>>>>>> e05bf9d32a (fix: add read permission to Buying Settings)
  "modified_by": "Administrator",
  "module": "Buying",
  "name": "Buying Settings",
@@ -212,6 +216,41 @@
    "role": "Purchase Manager",
    "share": 1,
    "write": 1
+  },
+  {
+   "email": 1,
+   "print": 1,
+   "read": 1,
+   "role": "Accounts User",
+   "share": 1
+  },
+  {
+   "email": 1,
+   "print": 1,
+   "read": 1,
+   "role": "Accounts Manager",
+   "share": 1
+  },
+  {
+   "email": 1,
+   "print": 1,
+   "read": 1,
+   "role": "Stock Manager",
+   "share": 1
+  },
+  {
+   "email": 1,
+   "print": 1,
+   "read": 1,
+   "role": "Stock User",
+   "share": 1
+  },
+  {
+   "email": 1,
+   "print": 1,
+   "read": 1,
+   "role": "Purchase User",
+   "share": 1
   }
  ],
  "sort_field": "modified",

From e156e757ee7ba1f0ae8035e8e08af0f32fcf2485 Mon Sep 17 00:00:00 2001
From: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
Date: Tue, 9 Jan 2024 13:35:36 +0100
Subject: [PATCH 2/2] chore: resolve merge conflicts

---
 erpnext/buying/doctype/buying_settings/buying_settings.json | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/erpnext/buying/doctype/buying_settings/buying_settings.json b/erpnext/buying/doctype/buying_settings/buying_settings.json
index 51a13871c746..5be70288c56c 100644
--- a/erpnext/buying/doctype/buying_settings/buying_settings.json
+++ b/erpnext/buying/doctype/buying_settings/buying_settings.json
@@ -188,11 +188,7 @@
  "index_web_pages_for_search": 1,
  "issingle": 1,
  "links": [],
-<<<<<<< HEAD
- "modified": "2023-11-24 10:55:51.287327",
-=======
  "modified": "2024-01-05 15:26:02.320942",
->>>>>>> e05bf9d32a (fix: add read permission to Buying Settings)
  "modified_by": "Administrator",
  "module": "Buying",
  "name": "Buying Settings",
@@ -257,4 +253,4 @@
  "sort_order": "DESC",
  "states": [],
  "track_changes": 1
-}
\ No newline at end of file
+}