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

fix: conflicts

Browse Source
This commit is contained in:
Khushi Rawat
2026-04-06 16:19:53 +05:30
committed by GitHub
parent cd98312083
commit 66ee208cb2
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/selling/doctype/sales_order_item/sales_order_item.json
View File

@@ -1035,11 +1035,7 @@
"idx": 1, "idx": 1,
"istable": 1, "istable": 1,
"links": [], "links": [],
<<<<<<< HEAD
"modified": "2026-02-21 16:39:00.200328",
=======
"modified": "2026-02-22 16:40:00.200328", "modified": "2026-02-22 16:40:00.200328",
>>>>>>> 8f83616b60 (fix: print hide unnecessary fields)
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Selling", "module": "Selling",
"name": "Sales Order Item", "name": "Sales Order Item",