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

chore: resolve conflict

Browse Source
This commit is contained in:
ruthra kumar
2025-02-18 14:27:14 +05:30
parent b32e4daf2b
commit 52860cc566
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

@@ -965,11 +965,7 @@
"idx": 1, "idx": 1,
"istable": 1, "istable": 1,
"links": [], "links": [],
<<<<<<< HEAD
"modified": "2024-11-21 14:21:29.743474",
=======
"modified": "2025-02-06 13:29:24.619850", "modified": "2025-02-06 13:29:24.619850",
>>>>>>> 7d47869f4b (fix: add accounting dimensions section in sales order item)
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Selling", "module": "Selling",
"name": "Sales Order Item", "name": "Sales Order Item",