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

chore: resolve conflict

Browse Source
This commit is contained in:
ruthra kumar
2025-03-24 11:53:14 +05:30
parent c3221c4e93
commit 4a7d401dc5
1 changed files with 0 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
erpnext/accounts/doctype/payment_schedule/payment_schedule.json
View File

@@ -177,23 +177,15 @@
"index_web_pages_for_search": 1, "index_web_pages_for_search": 1,
"istable": 1, "istable": 1,
"links": [], "links": [],
<<<<<<< HEAD
"modified": "2022-09-16 13:57:06.382859",
=======
"modified": "2025-03-11 11:06:51.792982", "modified": "2025-03-11 11:06:51.792982",
>>>>>>> 6c2f9a563e (fix: add base_outstanding and base_paid_amount in payment schedule table)
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Accounts", "module": "Accounts",
"name": "Payment Schedule", "name": "Payment Schedule",
"owner": "Administrator", "owner": "Administrator",
"permissions": [], "permissions": [],
"quick_entry": 1, "quick_entry": 1,
<<<<<<< HEAD
"sort_field": "modified",
=======
"row_format": "Dynamic", "row_format": "Dynamic",
"sort_field": "creation", "sort_field": "creation",
>>>>>>> 6c2f9a563e (fix: add base_outstanding and base_paid_amount in payment schedule table)
"sort_order": "DESC", "sort_order": "DESC",
"states": [], "states": [],
"track_changes": 1 "track_changes": 1