nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-02-16 08:05:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: fix conflicts

Browse Source
This commit is contained in:
rohitwaghchaure
2025-10-16 00:17:50 +05:30
committed by GitHub
parent 85c509ea69
commit 210786119d
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/stock/stock_ledger.py
View File

@@ -496,14 +496,10 @@ class update_entries_after:
elif dependant_sle.voucher_type == "Stock Entry" and is_transfer_stock_entry(
dependant_sle.voucher_no
):
<<<<<<< HEAD
print(dependant_sle.voucher_no)
=======
if self.distinct_item_warehouses[key].get("transfer_entry_to_repost"):
return
val["transfer_entry_to_repost"] = True
>>>>>>> 2f25b445ab (fix: do reposting of first transfer entry based on item-wh combination)
self.distinct_item_warehouses[key] = val
self.new_items_found = True