From 50aa4ed55a0b6e4a0b7a78822aa4d9e839a538f4 Mon Sep 17 00:00:00 2001 From: rohitwaghchaure Date: Fri, 31 Jan 2025 12:01:45 +0530 Subject: [PATCH] chore: fix conflicts --- .../batch_wise_balance_history/batch_wise_balance_history.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py b/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py index 757059f7976..b56d2f99328 100644 --- a/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py +++ b/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py @@ -4,7 +4,7 @@ import frappe from frappe import _ -from frappe.utils import cint, flt, get_table_name, getdate, get_datetime +from frappe.utils import cint, flt, get_datetime, get_table_name, getdate from pypika import functions as fn from erpnext.stock.doctype.warehouse.warehouse import apply_warehouse_filter @@ -136,7 +136,6 @@ def get_stock_ledger_entries(filters): if filters.get(field): query = query.where(sle[field] == filters.get(field)) - return query