nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-13 02:01:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: Only display 'Role Allowed to Override Stop Action' if 'Maintain Same Rate Throughout Sales Cycle' is checked

Browse Source 
(cherry picked from commit 799d67d785)

# Conflicts:
#	erpnext/selling/doctype/selling_settings/selling_settings.json
This commit is contained in:
GangaManoj
2021-09-01 22:55:10 +05:30
committed by Mergify
parent 0ea5ccb3cc
commit d3289ac4ab
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
erpnext/selling/doctype/selling_settings/selling_settings.json
View File

@@ -229,7 +229,7 @@
"options": "Stop\nWarn" "options": "Stop\nWarn"
}, },
{ {
"depends_on": "eval: doc.maintain_same_rate_action == 'Stop'", "depends_on": "eval: doc.maintain_same_sales_rate && doc.maintain_same_rate_action == 'Stop'",
"fieldname": "role_to_override_stop_action", "fieldname": "role_to_override_stop_action",
"fieldtype": "Link", "fieldtype": "Link",
"label": "Role Allowed to Override Stop Action", "label": "Role Allowed to Override Stop Action",
@@ -281,6 +281,7 @@
"issingle": 1, "issingle": 1,
"links": [], "links": [],
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
"modified": "2023-03-22 13:09:38.513317", "modified": "2023-03-22 13:09:38.513317",
======= =======
@@ -289,6 +290,9 @@
======= =======
"modified": "2021-09-01 22:48:30.860203", "modified": "2021-09-01 22:48:30.860203",
>>>>>>> f2a7fbd126 (fix: Remove redundant description) >>>>>>> f2a7fbd126 (fix: Remove redundant description)
=======
"modified": "2021-09-01 22:53:53.394444",
>>>>>>> 799d67d785 (fix: Only display 'Role Allowed to Override Stop Action' if 'Maintain Same Rate Throughout Sales Cycle' is checked)
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Selling", "module": "Selling",
"name": "Selling Settings", "name": "Selling Settings",