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

chore: conflicts

Browse Source
This commit is contained in:
Nabin Hait
2025-03-06 18:14:09 +05:30
committed by GitHub
parent de46165768
commit 60364f6dc9
1 changed files with 1 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
erpnext/crm/doctype/prospect/prospect.json
View File

@@ -220,11 +220,7 @@
"grid_page_length": 50, "grid_page_length": 50,
"index_web_pages_for_search": 1, "index_web_pages_for_search": 1,
"links": [], "links": [],
<<<<<<< HEAD
"modified": "2022-10-13 12:29:33.674561",
=======
"modified": "2025-03-06 11:31:49.083983", "modified": "2025-03-06 11:31:49.083983",
>>>>>>> 884709deb8 (fix: Allow rename prospect doctype (#46352))
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "CRM", "module": "CRM",
"name": "Prospect", "name": "Prospect",
@@ -264,12 +260,8 @@
"share": 1 "share": 1
} }
], ],
<<<<<<< HEAD
"sort_field": "modified", "sort_field": "modified",
=======
"row_format": "Dynamic",
"sort_field": "creation", "sort_field": "creation",
>>>>>>> 884709deb8 (fix: Allow rename prospect doctype (#46352))
"sort_order": "DESC", "sort_order": "DESC",
"states": [], "states": [],
"title_field": "company_name", "title_field": "company_name",