test/crm
1
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chore: resolved conflict

Browse Source
This commit is contained in:
Shariq Ansari 2025-07-10 17:26:27 +05:30 committed by GitHub
parent b369211965
commit b95565a70c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 0 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
crm/fcrm/doctype/crm_deal/crm_deal.json
View File

@ -428,19 +428,7 @@
"grid_page_length": 50, "grid_page_length": 50,
"index_web_pages_for_search": 1, "index_web_pages_for_search": 1,
"links": [], "links": [],
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
"modified": "2025-07-05 12:25:05.927806",
=======
"modified": "2025-07-06 15:16:37.673699",
>>>>>>> 6450b69a (fix: capture closed on datetime when deal marked as Won)
=======
"modified": "2025-07-09 14:26:53.986118",
>>>>>>> 0be73791 (fix: store currency exchange in deal & organization)
=======
"modified": "2025-07-09 17:58:55.956639", "modified": "2025-07-09 17:58:55.956639",
>>>>>>> d7ba5a5f (fix: store current day exchange rate when currency is updated in deal & organization)
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "FCRM", "module": "FCRM",
"name": "CRM Deal", "name": "CRM Deal",