nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-06 21:59:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: fix conflicts

Browse Source
This commit is contained in:
rohitwaghchaure
2024-02-05 12:13:14 +05:30
committed by GitHub
parent b32848d69d
commit 26dfbb7a64
1 changed files with 0 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
erpnext/stock/report/stock_balance/stock_balance.py
View File

@@ -98,14 +98,8 @@ class StockBalanceReport(object):
_func = itemgetter(1) _func = itemgetter(1)
<<<<<<< HEAD
self.item_warehouse_map = self.get_item_warehouse_map()
=======
del self.sle_entries del self.sle_entries
sre_details = self.get_sre_reserved_qty_details()
>>>>>>> b70f3de16b (perf: memory consumption for the stock balance report (#39626))
variant_values = {} variant_values = {}
if self.filters.get("show_variant_attributes"): if self.filters.get("show_variant_attributes"):
variant_values = self.get_variant_values_for() variant_values = self.get_variant_values_for()