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

chore: resolve conflict

Browse Source
This commit is contained in:
ruthra kumar
2024-07-19 10:36:42 +05:30
parent aee2cc2e03
commit a9146efc17
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/payment_request/payment_request.json
View File

@@ -396,11 +396,7 @@
"index_web_pages_for_search": 1, "index_web_pages_for_search": 1,
"is_submittable": 1, "is_submittable": 1,
"links": [], "links": [],
<<<<<<< HEAD
"modified": "2023-09-27 09:51:42.277638",
=======
"modified": "2024-06-20 13:54:55.245774", "modified": "2024-06-20 13:54:55.245774",
>>>>>>> b823aa66bf (fix: Don't allow negative amount on Payment Request #41905)
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Accounts", "module": "Accounts",
"name": "Payment Request", "name": "Payment Request",