nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-27 17:04:47 +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
This commit is contained in:
GangaManoj
2021-09-02 19:32:39 +05:30
parent d67460bf22
commit c128618185
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -145,7 +145,11 @@
"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",
<<<<<<< HEAD
"label": "Action If Same Rate is Not Maintained", "label": "Action If Same Rate is Not Maintained",
=======
"label": "Action if Same Rate is Not Maintained Throughout Sales Cycle",
>>>>>>> ebdc568e85 (fix: Rename 'Action if Same Rate is Not Maintained' to '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"
}, },