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

fix: conflicts

Browse Source
This commit is contained in:
iamkhanraheel
2025-11-17 13:37:25 +05:30
parent 9c2525a8f4
commit 054e7adeac
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/accounts/doctype/advance_payment_ledger_entry/advance_payment_ledger_entry.json
View File

@@ -100,11 +100,7 @@
"in_create": 1, "in_create": 1,
"index_web_pages_for_search": 1, "index_web_pages_for_search": 1,
"links": [], "links": [],
<<<<<<< HEAD
"modified": "2025-10-13 15:11:58.300836",
=======
"modified": "2025-11-13 12:45:03.014555", "modified": "2025-11-13 12:45:03.014555",
>>>>>>> 287cb621cd (feat: add exchange rate & base field in advance payment ledger, set exchange rate in journal entry on every refresh)
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Accounts", "module": "Accounts",
"name": "Advance Payment Ledger Entry", "name": "Advance Payment Ledger Entry",