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

fix: Rename 'Action if Same Rate is Not Maintained' to 'Action if Same Rate is Not Maintained Throughout Sales Cycle'

Browse Source 
(cherry picked from commit ebdc568e85)

# Conflicts:
#	erpnext/selling/doctype/selling_settings/selling_settings.json
This commit is contained in:
GangaManoj
2021-09-02 19:32:39 +05:30
committed by Mergify
parent d3289ac4ab
commit c42250b77f
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -224,7 +224,7 @@
"depends_on": "maintain_same_sales_rate", "depends_on": "maintain_same_sales_rate",
"fieldname": "maintain_same_rate_action", "fieldname": "maintain_same_rate_action",
"fieldtype": "Select", "fieldtype": "Select",
"label": "Action if Same Rate is Not Maintained", "label": "Action if Same Rate is Not Maintained Throughout Sales Cycle",
"mandatory_depends_on": "maintain_same_sales_rate", "mandatory_depends_on": "maintain_same_sales_rate",
"options": "Stop\nWarn" "options": "Stop\nWarn"
}, },
@@ -282,6 +282,7 @@
"links": [], "links": [],
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
"modified": "2023-03-22 13:09:38.513317", "modified": "2023-03-22 13:09:38.513317",
======= =======
@@ -293,6 +294,9 @@
======= =======
"modified": "2021-09-01 22:53:53.394444", "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) >>>>>>> 799d67d785 (fix: Only display 'Role Allowed to Override Stop Action' if 'Maintain Same Rate Throughout Sales Cycle' is checked)
=======
"modified": "2021-09-01 22:55:33.803624",
>>>>>>> ebdc568e85 (fix: Rename 'Action if Same Rate is Not Maintained' to 'Action if Same Rate is Not Maintained Throughout Sales Cycle')
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Selling", "module": "Selling",
"name": "Selling Settings", "name": "Selling Settings",