From 9217e919c33169cfc43ec280a53f594128e92a75 Mon Sep 17 00:00:00 2001 From: rohitwaghchaure Date: Fri, 31 Jan 2025 10:36:25 +0530 Subject: [PATCH] chore: fix conflicts --- .../batch_wise_balance_history.py | 65 ++----------------- 1 file changed, 5 insertions(+), 60 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 3ebea0f72af..757059f7976 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 +from frappe.utils import cint, flt, get_table_name, getdate, get_datetime from pypika import functions as fn from erpnext.stock.doctype.warehouse.warehouse import apply_warehouse_filter @@ -99,6 +99,8 @@ def get_stock_ledger_entries(filters): if not filters.get("to_date"): frappe.throw(_("'To Date' is required")) + to_date = get_datetime(filters.get("to_date") + " 23:59:59") + sle = frappe.qb.DocType("Stock Ledger Entry") query = ( frappe.qb.from_(sle) @@ -113,7 +115,7 @@ def get_stock_ledger_entries(filters): (sle.docstatus < 2) & (sle.is_cancelled == 0) & (fn.IfNull(sle.batch_no, "") != "") - & (sle.posting_date <= filters["to_date"]) + & (sle.posting_datetime <= to_date) ) .groupby(sle.voucher_no, sle.batch_no, sle.item_code, sle.warehouse) .orderby(sle.item_code, sle.warehouse) @@ -134,65 +136,8 @@ def get_stock_ledger_entries(filters): if filters.get(field): query = query.where(sle[field] == filters.get(field)) -<<<<<<< HEAD + return query -======= - if filters.start_from: - query = query.where(sle.posting_datetime > get_datetime(filters.start_from)) - - return query.run(as_dict=True) or [] - - -def get_stock_ledger_entries_for_batch_bundle(filters): - sle = frappe.qb.DocType("Stock Ledger Entry") - batch_package = frappe.qb.DocType("Serial and Batch Entry") - - to_date = get_datetime(filters.to_date + " 23:59:59") - - query = ( - frappe.qb.from_(sle) - .inner_join(batch_package) - .on(batch_package.parent == sle.serial_and_batch_bundle) - .select( - sle.item_code, - sle.warehouse, - batch_package.batch_no, - sle.posting_date, - fn.Sum(batch_package.qty).as_("actual_qty"), - ) - .where( - (sle.docstatus < 2) - & (sle.is_cancelled == 0) - & (sle.has_batch_no == 1) - & (sle.posting_datetime <= to_date) - ) - .groupby(sle.voucher_no, batch_package.batch_no, batch_package.warehouse) - .orderby(sle.item_code, sle.warehouse) - ) - - query = apply_warehouse_filter(query, sle, filters) - if filters.warehouse_type and not filters.warehouse: - warehouses = frappe.get_all( - "Warehouse", - filters={"warehouse_type": filters.warehouse_type, "is_group": 0}, - pluck="name", - ) - - if warehouses: - query = query.where(sle.warehouse.isin(warehouses)) - - for field in ["item_code", "batch_no", "company"]: - if filters.get(field): - if field == "batch_no": - query = query.where(batch_package[field] == filters.get(field)) - else: - query = query.where(sle[field] == filters.get(field)) - - if filters.start_from: - query = query.where(sle.posting_date > getdate(filters.start_from)) - - return query.run(as_dict=True) or [] ->>>>>>> e61ab48145 (fix: posting_date to posting_datetime in stock related queries) def get_item_warehouse_batch_map(filters, float_precision):