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

chore: fix conflicts

Browse Source
This commit is contained in:
rohitwaghchaure
2025-01-31 12:01:45 +05:30
committed by GitHub
parent dee6e2b697
commit 50aa4ed55a
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py
View File

@@ -4,7 +4,7 @@
import frappe import frappe
from frappe import _ 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 pypika import functions as fn
from erpnext.stock.doctype.warehouse.warehouse import apply_warehouse_filter from erpnext.stock.doctype.warehouse.warehouse import apply_warehouse_filter
@@ -136,7 +136,6 @@ def get_stock_ledger_entries(filters):
if filters.get(field): if filters.get(field):
query = query.where(sle[field] == filters.get(field)) query = query.where(sle[field] == filters.get(field))
return query return query