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

fix(stock): resolve backport conflict in quality inspection imports

Browse Source 
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.
This commit is contained in:
Mihir Kandoi
2026-08-03 12:31:55 +05:30
parent 444dd9e817
commit 656db1c2fe
1 changed files with 1 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
erpnext/stock/doctype/quality_inspection/quality_inspection.py
View File

@@ -2,22 +2,14 @@
# License: GNU General Public License v3. See license.txt # License: GNU General Public License v3. See license.txt
<<<<<<< HEAD
=======
from math import isfinite from math import isfinite
from typing import Any
>>>>>>> 5b5f354090 (fix(stock): accept every number a reading can be written as)
import frappe import frappe
from frappe import _ from frappe import _
from frappe.model.document import Document from frappe.model.document import Document
from frappe.model.mapper import get_mapped_doc from frappe.model.mapper import get_mapped_doc
<<<<<<< HEAD from frappe.utils import cint, cstr, flt, get_link_to_form
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.number_format import NUMBER_FORMAT_MAP, NumberFormat 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 ( from erpnext.controllers.stock_controller import (
QI_INCOMING_PURPOSES, QI_INCOMING_PURPOSES,