nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-30 18:34:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: resolve conflicts

Browse Source
This commit is contained in:
Deepesh Garg
2022-12-30 20:56:50 +05:30
committed by GitHub
parent 65688684a7
commit 038fa4dbe2
1 changed files with 0 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json
View File

@@ -843,12 +843,7 @@
"idx": 1, "idx": 1,
"istable": 1, "istable": 1,
"links": [], "links": [],
<<<<<<< HEAD
"modified": "2022-10-10 20:57:38.340026",
=======
"modified": "2022-12-28 16:17:33.484531", "modified": "2022-12-28 16:17:33.484531",
>>>>>>> 617518389a (fix: Conversion factor error for invoices without item code (petty expenses) (#32714))
"modified_by": "Administrator",
"module": "Accounts", "module": "Accounts",
"name": "Sales Invoice Item", "name": "Sales Invoice Item",
"naming_rule": "Random", "naming_rule": "Random",