From c128618185eb59833292c2957e44f4e9d306db96 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' --- .../selling/doctype/selling_settings/selling_settings.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/erpnext/selling/doctype/selling_settings/selling_settings.json b/erpnext/selling/doctype/selling_settings/selling_settings.json index c016f851751..9c19f77a39e 100644 --- a/erpnext/selling/doctype/selling_settings/selling_settings.json +++ b/erpnext/selling/doctype/selling_settings/selling_settings.json @@ -145,7 +145,11 @@ "depends_on": "maintain_same_sales_rate", "fieldname": "maintain_same_rate_action", "fieldtype": "Select", +<<<<<<< HEAD "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", "options": "Stop\nWarn" },