nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-08-17 00:18:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: resolve backport conflict in stock ageing test imports

Browse Source
This commit is contained in:
Mihir Kandoi
2026-07-27 13:57:01 +05:30
parent 168ec661e4
commit a2ace9d394
1 changed files with 0 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
erpnext/stock/report/stock_ageing/test_stock_ageing.py
View File

@@ -7,19 +7,12 @@ import frappe
from frappe.tests.utils import FrappeTestCase from frappe.tests.utils import FrappeTestCase
from erpnext.stock.report.stock_ageing.stock_ageing import ( from erpnext.stock.report.stock_ageing.stock_ageing import (
<<<<<<< HEAD
=======
BATCH_SLOT_QTY_INDEX, BATCH_SLOT_QTY_INDEX,
BATCH_SLOT_VALUE_INDEX, BATCH_SLOT_VALUE_INDEX,
>>>>>>> 545262c5d4 (test: assert batch pooling preserves the group total on a repeating rate)
FIFOSlots, FIFOSlots,
format_report_data, format_report_data,
get_average_age, 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): class TestStockAgeing(FrappeTestCase):