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: conflict

Browse Source
This commit is contained in:
Sagar Sharma
2023-05-26 00:26:14 +05:30
committed by GitHub
parent b3da2f7c26
commit f5b2b80707
1 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/stock/doctype/delivery_note_item/delivery_note_item.json
View File

@@ -867,11 +867,7 @@
"index_web_pages_for_search": 1, "index_web_pages_for_search": 1,
"istable": 1, "istable": 1,
"links": [], "links": [],
<<<<<<< HEAD
"modified": "2023-05-01 21:05:14.175640", "modified": "2023-05-01 21:05:14.175640",
=======
"modified": "2023-04-28 13:14:10.648655",
>>>>>>> e6fc281acf (feat: add field `Packed Qty` in `Delivery Note Item` and `Packed Item`)
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Stock", "module": "Stock",
"name": "Delivery Note Item", "name": "Delivery Note Item",