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

chore: resolve conflicts

Browse Source
This commit is contained in:
Deepesh Garg
2022-10-07 17:33:03 +05:30
committed by GitHub
parent e1c41b9195
commit 2bf76f64bd
1 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
View File

@@ -1437,11 +1437,7 @@
"idx": 204, "idx": 204,
"is_submittable": 1, "is_submittable": 1,
"links": [], "links": [],
<<<<<<< HEAD
"modified": "2022-09-13 23:39:54.525037",
=======
"modified": "2022-10-07 14:19:14.214157", "modified": "2022-10-07 14:19:14.214157",
>>>>>>> 781d160c68 (fix: Do not add tax withheld vouchers post tax withheding in one document)
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Accounts", "module": "Accounts",
"name": "Purchase Invoice", "name": "Purchase Invoice",
@@ -1505,4 +1501,4 @@
"timeline_field": "supplier", "timeline_field": "supplier",
"title_field": "title", "title_field": "title",
"track_changes": 1 "track_changes": 1
} }