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

chore: fix conflicts

Browse Source 
Reintroduce the _qty_tolerance function to handle float rounding.
This commit is contained in:
rohitwaghchaure
2026-06-08 19:44:48 +05:30
committed by GitHub
parent ba19a24526
commit 335173c5ba
1 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
erpnext/stock/doctype/stock_entry/stock_entry.py
View File

@@ -80,17 +80,7 @@ from erpnext.controllers.stock_controller import StockController
form_grid_templates = {"items": "templates/form_grid/stock_entry_grid.html"}
<<<<<<< HEAD
class StockEntry(StockController):
=======
def _qty_tolerance(precision: int) -> float:
"""One unit at the column's precision -- absorbs float rounding without letting a real
(whole-unit) quantity divergence slip through."""
return 1.0 / (10**precision)
class StockEntry(StockController, SubcontractingInwardController):
>>>>>>> 4453c1072a (fix: validate fg and materials qty in the disassemble entry)
# begin: auto-generated types
# This code is auto-generated. Do not modify anything in this block.
@@ -3491,6 +3481,12 @@ def move_sample_to_retention_warehouse(company, items):
return stock_entry.as_dict()
def _qty_tolerance(precision: int) -> float:
"""One unit at the column's precision -- absorbs float rounding without letting a real
(whole-unit) quantity divergence slip through."""
return 1.0 / (10**precision)
@frappe.whitelist()
def make_stock_in_entry(source_name, target_doc=None):
def set_missing_values(source, target):