From a2ace9d39428cc88f74ae7ecc0ea8312d586ff3d Mon Sep 17 00:00:00 2001 From: Mihir Kandoi Date: Mon, 27 Jul 2026 13:57:01 +0530 Subject: [PATCH] fix: resolve backport conflict in stock ageing test imports --- erpnext/stock/report/stock_ageing/test_stock_ageing.py | 7 ------- 1 file changed, 7 deletions(-) diff --git a/erpnext/stock/report/stock_ageing/test_stock_ageing.py b/erpnext/stock/report/stock_ageing/test_stock_ageing.py index 17136da9830..9feca367e9e 100644 --- a/erpnext/stock/report/stock_ageing/test_stock_ageing.py +++ b/erpnext/stock/report/stock_ageing/test_stock_ageing.py @@ -7,19 +7,12 @@ import frappe from frappe.tests.utils import FrappeTestCase from erpnext.stock.report.stock_ageing.stock_ageing import ( -<<<<<<< HEAD -======= BATCH_SLOT_QTY_INDEX, BATCH_SLOT_VALUE_INDEX, ->>>>>>> 545262c5d4 (test: assert batch pooling preserves the group total on a repeating rate) FIFOSlots, format_report_data, get_average_age, ) -<<<<<<< HEAD -======= -from erpnext.tests.utils import ERPNextTestSuite ->>>>>>> 545262c5d4 (test: assert batch pooling preserves the group total on a repeating rate) class TestStockAgeing(FrappeTestCase):