From 656db1c2fe3918811c1b038643a1c822c99f4b8f Mon Sep 17 00:00:00 2001 From: Mihir Kandoi Date: Mon, 3 Aug 2026 12:31:55 +0530 Subject: [PATCH] fix(stock): resolve backport conflict in quality inspection imports The backport left both import hunks unresolved, so the file did not compile. version-16-hotfix keeps item_query unannotated and still imports cstr, so only get_number_format_info goes, replaced by NumberFormat; typing.Any is not carried over because nothing on this branch uses it. --- .../doctype/quality_inspection/quality_inspection.py | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/erpnext/stock/doctype/quality_inspection/quality_inspection.py b/erpnext/stock/doctype/quality_inspection/quality_inspection.py index 9491b72fe2d..f213656fcd4 100644 --- a/erpnext/stock/doctype/quality_inspection/quality_inspection.py +++ b/erpnext/stock/doctype/quality_inspection/quality_inspection.py @@ -2,22 +2,14 @@ # License: GNU General Public License v3. See license.txt -<<<<<<< HEAD -======= from math import isfinite -from typing import Any ->>>>>>> 5b5f354090 (fix(stock): accept every number a reading can be written as) import frappe from frappe import _ from frappe.model.document import Document from frappe.model.mapper import get_mapped_doc -<<<<<<< HEAD -from frappe.utils import cint, cstr, flt, get_link_to_form, get_number_format_info -======= -from frappe.utils import cint, flt, get_link_to_form +from frappe.utils import cint, cstr, flt, get_link_to_form from frappe.utils.number_format import NUMBER_FORMAT_MAP, NumberFormat ->>>>>>> 5b5f354090 (fix(stock): accept every number a reading can be written as) from erpnext.controllers.stock_controller import ( QI_INCOMING_PURPOSES,