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

chore: resolve conflict

Browse Source
This commit is contained in:
ruthra kumar
2024-10-28 13:33:24 +05:30
parent 29aa5d6468
commit 303ae8321b
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/purchase_invoice/purchase_invoice.json
View File

@@ -1633,11 +1633,7 @@
"idx": 204, "idx": 204,
"is_submittable": 1, "is_submittable": 1,
"links": [], "links": [],
<<<<<<< HEAD
"modified": "2024-09-11 12:59:19.130593",
=======
"modified": "2024-10-25 18:13:01.944477", "modified": "2024-10-25 18:13:01.944477",
>>>>>>> 912e1e3f3d (fix: hide payment terms for return and paid purchase invoices)
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Accounts", "module": "Accounts",
"name": "Purchase Invoice", "name": "Purchase Invoice",