nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-04-29 03:28:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: fix conflicts

Browse Source
This commit is contained in:
rohitwaghchaure
2026-03-02 14:38:28 +05:30
committed by GitHub
parent 8b3c5baa9e
commit b4a5bbc7e2
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/buying/doctype/purchase_order/purchase_order.json
View File

@@ -1327,11 +1327,7 @@
"idx": 105, "idx": 105,
"is_submittable": 1, "is_submittable": 1,
"links": [], "links": [],
<<<<<<< HEAD
"modified": "2026-02-23 14:22:33.323946",
=======
"modified": "2026-03-02 00:40:47.119584", "modified": "2026-03-02 00:40:47.119584",
>>>>>>> 9538a9870c (fix(accounts): add transaction time field)
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Buying", "module": "Buying",
"name": "Purchase Order", "name": "Purchase Order",