From 210786119dffca90396f6df2eaa706d6de1c53c4 Mon Sep 17 00:00:00 2001 From: rohitwaghchaure Date: Thu, 16 Oct 2025 00:17:50 +0530 Subject: [PATCH] chore: fix conflicts --- erpnext/stock/stock_ledger.py | 4 ---- 1 file changed, 4 deletions(-) diff --git a/erpnext/stock/stock_ledger.py b/erpnext/stock/stock_ledger.py index 406305bde14..68c7c314091 100644 --- a/erpnext/stock/stock_ledger.py +++ b/erpnext/stock/stock_ledger.py @@ -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