nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-03-18 06:22:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: permissions for marking Quotation as lost

Browse Source 
(cherry picked from commit 4d5241486f)

# Conflicts:
#	erpnext/crm/doctype/competitor/competitor.json
#	erpnext/setup/doctype/quotation_lost_reason/quotation_lost_reason.json
This commit is contained in:
barredterra
2024-12-10 14:28:22 +01:00
committed by Mergify
parent 4869847bc7
commit e6390bfba1
2 changed files with 38 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
erpnext/crm/doctype/competitor/competitor.json
View File

@@ -38,7 +38,11 @@
"table_fieldname": "competitors" "table_fieldname": "competitors"
} }
], ],
<<<<<<< HEAD
"modified": "2023-11-23 19:33:54.284279", "modified": "2023-11-23 19:33:54.284279",
=======
"modified": "2024-12-10 08:26:38.496003",
>>>>>>> 4d5241486f (fix: permissions for marking Quotation as lost)
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "CRM", "module": "CRM",
"name": "Competitor", "name": "Competitor",
@@ -53,20 +57,25 @@
"print": 1, "print": 1,
"read": 1, "read": 1,
"report": 1, "report": 1,
"role": "System Manager", "role": "Sales Master Manager",
"share": 1, "share": 1,
"write": 1 "write": 1
}, },
{ {
"create": 1,
"email": 1,
"export": 1,
"print": 1,
"read": 1, "read": 1,
"report": 1, "role": "Sales User"
"role": "Sales User", },
"share": 1, {
"write": 1 "read": 1,
"role": "Sales Manager"
},
{
"read": 1,
"role": "Maintenance Manager"
},
{
"read": 1,
"role": "Maintenance User"
} }
], ],
"quick_entry": 1, "quick_entry": 1,

20
erpnext/setup/doctype/quotation_lost_reason/quotation_lost_reason.json
View File

@@ -32,7 +32,11 @@
"table_fieldname": "lost_reasons" "table_fieldname": "lost_reasons"
} }
], ],
<<<<<<< HEAD
"modified": "2023-11-23 19:31:02.743353", "modified": "2023-11-23 19:31:02.743353",
=======
"modified": "2024-12-10 08:21:38.280627",
>>>>>>> 4d5241486f (fix: permissions for marking Quotation as lost)
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Setup", "module": "Setup",
"name": "Quotation Lost Reason", "name": "Quotation Lost Reason",
@@ -49,6 +53,22 @@
"role": "Sales Master Manager", "role": "Sales Master Manager",
"share": 1, "share": 1,
"write": 1 "write": 1
},
{
"read": 1,
"role": "Sales User"
},
{
"read": 1,
"role": "Sales Manager"
},
{
"read": 1,
"role": "Maintenance User"
},
{
"read": 1,
"role": "Maintenance Manager"
} }
], ],
"quick_entry": 1, "quick_entry": 1,