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

chore: resolve conflicts

Browse Source
This commit is contained in:
Deepesh Garg
2023-09-27 11:19:39 +05:30
parent 92eabe3cf5
commit 8d813e3256
1 changed files with 0 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
erpnext/accounts/doctype/payment_request/payment_request.json
View File

@@ -317,16 +317,9 @@
}, },
{ {
"fieldname": "payment_url", "fieldname": "payment_url",
<<<<<<< HEAD
"fieldtype": "Small Text", "fieldtype": "Small Text",
"hidden": 1, "hidden": 1,
"label": "payment_url", "label": "payment_url",
=======
"fieldtype": "Data",
"hidden": 1,
"length": 500,
"options": "URL",
>>>>>>> 8c5fcb8257 (fix: PCV posting issues (#37029))
"read_only": 1 "read_only": 1
}, },
{ {
@@ -401,11 +394,7 @@
"index_web_pages_for_search": 1, "index_web_pages_for_search": 1,
"is_submittable": 1, "is_submittable": 1,
"links": [], "links": [],
<<<<<<< HEAD
"modified": "2022-12-21 16:56:40.115737", "modified": "2022-12-21 16:56:40.115737",
=======
"modified": "2023-09-27 09:51:42.277638",
>>>>>>> 8c5fcb8257 (fix: PCV posting issues (#37029))
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Accounts", "module": "Accounts",
"name": "Payment Request", "name": "Payment Request",