nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-02-17 00:25:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: resolve conflicts

Browse Source
This commit is contained in:
ruthra kumar
2025-05-26 17:48:11 +05:30
parent d5d1a51b92
commit c09b258d57
2 changed files with 0 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -256,11 +256,7 @@
"grid_page_length": 50,
"is_submittable": 1,
"links": [],
<<<<<<< HEAD
"modified": "2020-12-07 11:15:58.385521",
=======
"modified": "2025-05-23 13:54:03.346537",
>>>>>>> 016924361a (refactor: full name field in contract)
"modified_by": "Administrator",
"module": "CRM",
"name": "Contract",

4
erpnext/patches.txt
View File

@@ -405,8 +405,4 @@ erpnext.patches.v15_0.rename_group_by_to_categorize_by
execute:frappe.db.set_single_value("Accounts Settings", "receivable_payable_fetch_method", "Buffered Cursor")
erpnext.patches.v14_0.set_update_price_list_based_on
erpnext.patches.v15_0.rename_group_by_to_categorize_by_in_custom_reports
<<<<<<< HEAD
=======
erpnext.patches.v15_0.remove_agriculture_roles
erpnext.patches.v14_0.update_full_name_in_contract
>>>>>>> 8e2221178b (refactor: patch old contract with full party name)