From 0ea5ccb3cc1f084128f3685b336f4135c676d995 Mon Sep 17 00:00:00 2001 From: GangaManoj Date: Wed, 1 Sep 2021 22:49:05 +0530 Subject: [PATCH] fix: Remove redundant description (cherry picked from commit f2a7fbd1269cc806fef0a17cf207b004ce944a94) # Conflicts: # erpnext/selling/doctype/selling_settings/selling_settings.json --- .../selling/doctype/selling_settings/selling_settings.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/erpnext/selling/doctype/selling_settings/selling_settings.json b/erpnext/selling/doctype/selling_settings/selling_settings.json index cd1d7dad3e0..e820ff27a35 100644 --- a/erpnext/selling/doctype/selling_settings/selling_settings.json +++ b/erpnext/selling/doctype/selling_settings/selling_settings.json @@ -222,7 +222,6 @@ ======= "default": "Stop", "depends_on": "maintain_same_sales_rate", - "description": "Configure the action to stop the transaction or just warn if the same rate is not maintained.", "fieldname": "maintain_same_rate_action", "fieldtype": "Select", "label": "Action if Same Rate is Not Maintained", @@ -281,11 +280,15 @@ "index_web_pages_for_search": 1, "issingle": 1, "links": [], +<<<<<<< HEAD <<<<<<< HEAD "modified": "2023-03-22 13:09:38.513317", ======= "modified": "2021-09-01 22:47:24.298970", >>>>>>> 06484321d1 (fix: Move related fields to the same section) +======= + "modified": "2021-09-01 22:48:30.860203", +>>>>>>> f2a7fbd126 (fix: Remove redundant description) "modified_by": "Administrator", "module": "Selling", "name": "Selling Settings",