CalvinBackup/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-03-24 13:42:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix: conflicts

Browse Source
This commit is contained in:
rohitwaghchaure
2023-07-10 17:13:23 +05:30
committed by GitHub
parent 6459c28316
commit a178e6693c
1 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
erpnext/stock/doctype/purchase_receipt/purchase_receipt.json
View File

@@ -1240,11 +1240,7 @@
"idx": 261, "idx": 261,
"is_submittable": 1, "is_submittable": 1,
"links": [], "links": [],
<<<<<<< HEAD "modified": "2023-07-04 17:24:17.025390",
"modified": "2023-05-07 20:18:25.458185",
=======
"modified": "2023-07-04 17:23:17.025390",
>>>>>>> d618aaef32 (fix: accepted warehouse and rejected warehouse can't be same)
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Stock", "module": "Stock",
"name": "Purchase Receipt", "name": "Purchase Receipt",