schuetz3/schuetz3-erpnext
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: Remove conflicts

Browse Source
This commit is contained in:
Deepesh Garg
2022-02-28 18:15:29 +05:30
committed by GitHub
parent ebf70a4b5d
commit ca6f196bad
1 changed files with 1 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -850,11 +850,6 @@
"owner": "Administrator", "owner": "Administrator",
"permissions": [], "permissions": [],
"sort_field": "modified", "sort_field": "modified",
<<<<<<< HEAD
"sort_order": "DESC" "sort_order": "DESC"
} }
=======
"sort_order": "DESC",
"states": []
}
>>>>>>> 0373914704 (fix: Commission not applied while making Sales Order from Quotation)