From c42250b77f856affa6022e6a06a5642c9c503ae8 Mon Sep 17 00:00:00 2001 From: GangaManoj Date: Thu, 2 Sep 2021 19:32:39 +0530 Subject: [PATCH] fix: Rename 'Action if Same Rate is Not Maintained' to 'Action if Same Rate is Not Maintained Throughout Sales Cycle' (cherry picked from commit ebdc568e857d753e5778b39e2ddd3f5910a6d702) # Conflicts: # erpnext/selling/doctype/selling_settings/selling_settings.json --- .../doctype/selling_settings/selling_settings.json | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/erpnext/selling/doctype/selling_settings/selling_settings.json b/erpnext/selling/doctype/selling_settings/selling_settings.json index 732bdaa9f99..ca3d4d97fef 100644 --- a/erpnext/selling/doctype/selling_settings/selling_settings.json +++ b/erpnext/selling/doctype/selling_settings/selling_settings.json @@ -224,7 +224,7 @@ "depends_on": "maintain_same_sales_rate", "fieldname": "maintain_same_rate_action", "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", "options": "Stop\nWarn" }, @@ -282,6 +282,7 @@ "links": [], <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD <<<<<<< HEAD "modified": "2023-03-22 13:09:38.513317", ======= @@ -293,6 +294,9 @@ ======= "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": "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", "module": "Selling", "name": "Selling Settings", @@ -311,4 +315,4 @@ "sort_field": "modified", "sort_order": "DESC", "track_changes": 1 -} \ No newline at end of file +}