nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-25 16:04:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: conflicts

Browse Source
This commit is contained in:
s-aga-r
2022-11-17 14:19:01 +05:30
parent 30b5d1c400
commit 9191c54b90
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

@@ -1170,11 +1170,7 @@
"idx": 105, "idx": 105,
"is_submittable": 1, "is_submittable": 1,
"links": [], "links": [],
<<<<<<< HEAD
"modified": "2022-09-16 17:45:04.954055",
=======
"modified": "2022-11-17 12:34:36.033363", "modified": "2022-11-17 12:34:36.033363",
>>>>>>> 5efbc2cbf8 (fix: make `is_internal_supplier` read-only)
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Buying", "module": "Buying",
"name": "Purchase Order", "name": "Purchase Order",