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

chore: Resolve conflicts

Browse Source
This commit is contained in:
Deepesh Garg
2022-08-26 18:10:09 +05:30
committed by GitHub
parent 0b40117bfd
commit 4095a3dae2
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -841,11 +841,7 @@
"idx": 1, "idx": 1,
"istable": 1, "istable": 1,
"links": [], "links": [],
<<<<<<< HEAD
"modified": "2022-02-24 14:41:36.392560",
=======
"modified": "2022-08-26 12:06:31.205417", "modified": "2022-08-26 12:06:31.205417",
>>>>>>> c42fef541a (chore: remove precision on discount_percentage of Sales Invoice Item)
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Accounts", "module": "Accounts",
"name": "Sales Invoice Item", "name": "Sales Invoice Item",