CalvinBackup/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-03-02 18:14:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: resolved conflicts

Browse Source
This commit is contained in:
Khushi Rawat
2025-06-20 14:23:02 +05:30
committed by GitHub
parent c07d5b6dec
commit 881dcf817f
1 changed files with 0 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
erpnext/crm/doctype/contract/contract.json
View File

@@ -330,11 +330,8 @@
"show_name_in_global_search": 1, "show_name_in_global_search": 1,
"sort_field": "modified", "sort_field": "modified",
"sort_order": "DESC", "sort_order": "DESC",
<<<<<<< HEAD
=======
"states": [], "states": [],
"title_field": "party_name", "title_field": "party_name",
>>>>>>> bf56c73c6c (feat: add naming series for Contract Doctype)
"track_changes": 1, "track_changes": 1,
"track_seen": 1 "track_seen": 1
} }