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

chore: resolve conflicts with backport

Browse Source
This commit is contained in:
Smit Vora
2024-09-09 07:00:32 +05:30
parent 84b0fa38d5
commit 3915018400
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/process_payment_reconciliation/process_payment_reconciliation.json
View File

@@ -158,11 +158,7 @@
"index_web_pages_for_search": 1, "index_web_pages_for_search": 1,
"is_submittable": 1, "is_submittable": 1,
"links": [], "links": [],
<<<<<<< HEAD
"modified": "2023-08-11 10:56:51.699137",
=======
"modified": "2024-08-27 14:48:56.715320", "modified": "2024-08-27 14:48:56.715320",
>>>>>>> 143209f91a (fix: `default_advance_account` field in Process Payment Reconciliation)
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Accounts", "module": "Accounts",
"name": "Process Payment Reconciliation", "name": "Process Payment Reconciliation",