From 26dfbb7a641a4a3342030daad6e1c21ff3175103 Mon Sep 17 00:00:00 2001 From: rohitwaghchaure Date: Mon, 5 Feb 2024 12:13:14 +0530 Subject: [PATCH] chore: fix conflicts --- erpnext/stock/report/stock_balance/stock_balance.py | 6 ------ 1 file changed, 6 deletions(-) diff --git a/erpnext/stock/report/stock_balance/stock_balance.py b/erpnext/stock/report/stock_balance/stock_balance.py index 4e6f9865aca..32a2b302d7b 100644 --- a/erpnext/stock/report/stock_balance/stock_balance.py +++ b/erpnext/stock/report/stock_balance/stock_balance.py @@ -98,14 +98,8 @@ class StockBalanceReport(object): _func = itemgetter(1) -<<<<<<< HEAD - self.item_warehouse_map = self.get_item_warehouse_map() -======= del self.sle_entries - sre_details = self.get_sre_reserved_qty_details() ->>>>>>> b70f3de16b (perf: memory consumption for the stock balance report (#39626)) - variant_values = {} if self.filters.get("show_variant_attributes"): variant_values = self.get_variant_values_for()