nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-24 23:49:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: Remove redundant description

Browse Source 
(cherry picked from commit f2a7fbd126)

# Conflicts:
#	erpnext/selling/doctype/selling_settings/selling_settings.json
This commit is contained in:
GangaManoj
2021-09-01 22:49:05 +05:30
committed by Mergify
parent f816f7aa6b
commit 0ea5ccb3cc
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -222,7 +222,6 @@
======= =======
"default": "Stop", "default": "Stop",
"depends_on": "maintain_same_sales_rate", "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", "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",
@@ -281,11 +280,15 @@
"index_web_pages_for_search": 1, "index_web_pages_for_search": 1,
"issingle": 1, "issingle": 1,
"links": [], "links": [],
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
"modified": "2023-03-22 13:09:38.513317", "modified": "2023-03-22 13:09:38.513317",
======= =======
"modified": "2021-09-01 22:47:24.298970", "modified": "2021-09-01 22:47:24.298970",
>>>>>>> 06484321d1 (fix: Move related fields to the same section) >>>>>>> 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", "modified_by": "Administrator",
"module": "Selling", "module": "Selling",
"name": "Selling Settings", "name": "Selling Settings",