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

chore: resolve conflicts

Browse Source
This commit is contained in:
Gursheen Kaur Anand
2024-02-27 15:57:43 +05:30
committed by GitHub
parent a84fc0fe40
commit 42b7be60ef
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

@@ -1610,11 +1610,7 @@
"idx": 204,
"is_submittable": 1,
"links": [],
<<<<<<< HEAD
"modified": "2023-11-03 15:47:30.319200",
=======
"modified": "2024-02-25 11:20:28.366808",
>>>>>>> 9f6535472d (feat: update billed amount in PO and PR)
"modified_by": "Administrator",
"module": "Accounts",
"name": "Purchase Invoice",