mirror of
https://github.com/frappe/erpnext.git
synced 2026-05-02 21:18:27 +00:00
chore: fix conflicts
This commit is contained in:
@@ -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
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user