CalvinBackup/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-03-17 17:26:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: conflicts

Browse Source
This commit is contained in:
rohitwaghchaure
2023-07-10 17:12:41 +05:30
committed by GitHub
parent 5d77e3ce05
commit 6459c28316
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

@@ -1574,11 +1574,7 @@
"idx": 204,
"is_submittable": 1,
"links": [],
<<<<<<< HEAD
"modified": "2023-04-29 12:57:50.832598",
=======
"modified": "2023-07-04 17:22:59.145031",
>>>>>>> d618aaef32 (fix: accepted warehouse and rejected warehouse can't be same)
"modified": "2023-07-04 17:23:59.145031",
"modified_by": "Administrator",
"module": "Accounts",
"name": "Purchase Invoice",