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

chore: fix conflicts

Browse Source
This commit is contained in:
rohitwaghchaure
2025-02-05 16:40:20 +05:30
committed by GitHub
parent cfc50073ed
commit ab37e5754b
1 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -934,11 +934,7 @@
"index_web_pages_for_search": 1, "index_web_pages_for_search": 1,
"istable": 1, "istable": 1,
"links": [], "links": [],
<<<<<<< HEAD "modified": "2025-02-05 14:28:32.322181",
"modified": "2024-11-21 17:37:37.441498",
=======
"modified": "2025-02-05 14:27:32.322181",
>>>>>>> 417bf49a8d (fix: added correct options for incoming_rate field of delivery note item)
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Stock", "module": "Stock",
"name": "Delivery Note Item", "name": "Delivery Note Item",