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

Merge pull request #52684 from frappe/mergify/bp/version-16-hotfix/pr-52681

Browse Source 
fix: better validation for negative batch (backport #52681)
This commit is contained in:
rohitwaghchaure
2026-02-16 16:02:55 +05:30
committed by GitHub
parent 4a4e9956e2 e46e8741b4
commit de5e8a6e6b
2 changed files with 27 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py
View File

@@ -17,6 +17,7 @@ from frappe.utils import (
cint,
cstr,
flt,
format_datetime,
get_datetime,
get_link_to_form,
getdate,
@@ -1459,22 +1460,33 @@ class SerialandBatchBundle(Document):
if flt(available_qty, precision) < 0:
self.throw_negative_batch(d.batch_no, available_qty, precision)
def throw_negative_batch(self, batch_no, available_qty, precision):
def throw_negative_batch(self, batch_no, available_qty, precision, posting_datetime=None):
from erpnext.stock.stock_ledger import NegativeStockError
if frappe.db.get_single_value("Stock Settings", "allow_negative_stock_for_batch"):
return
date_msg = ""
if posting_datetime:
date_msg = " " + _("as of {0}").format(format_datetime(posting_datetime))
msg = _(
"""
The Batch {0} of an item {1} has negative stock in the warehouse {2}{3}.
Please add a stock quantity of {4} to proceed with this entry.
If it is not possible to make an adjustment entry, please enable 'Allow Negative Stock for Batch' in Stock Settings to proceed.
However, enabling this setting may lead to negative stock in the system.
So please ensure the stock levels are adjusted as soon as possible to maintain the correct valuation rate."""
).format(
bold(batch_no),
bold(self.item_code),
bold(self.warehouse),
date_msg,
bold(abs(flt(available_qty, precision))),
)
frappe.throw(
_(
"""
The Batch {0} of an item {1} has negative stock in the warehouse {2}. Please add a stock quantity of {3} to proceed with this entry."""
).format(
bold(batch_no),
bold(self.item_code),
bold(self.warehouse),
bold(abs(flt(available_qty, precision))),
),
msg,
title=_("Negative Stock Error"),
exc=NegativeStockError,
)
@@ -1497,7 +1509,9 @@ class SerialandBatchBundle(Document):
available_qty[row.batch_no] = flt(row.qty)
if flt(available_qty[row.batch_no], precision) < 0:
self.throw_negative_batch(row.batch_no, available_qty[row.batch_no], precision)
self.throw_negative_batch(
row.batch_no, available_qty[row.batch_no], precision, row.posting_datetime
)
return available_qty

4
erpnext/stock/doctype/stock_settings/stock_settings.json
View File

@@ -550,7 +550,7 @@
},
{
"default": "0",
"description": "If enabled, the system will allow negative stock entries for the batch, but this could calculate the valuation rate incorrectly, so avoid using this option.",
"description": "If enabled, the system will allow negative stock entries for the batch. But, this may lead to incorrect valuation rates, so it is recommended to avoid using this option. The system will permit negative stock only when it is caused by backdated entries and will validate and block negative stock in all other cases.",
"fieldname": "allow_negative_stock_for_batch",
"fieldtype": "Check",
"label": "Allow Negative Stock for Batch"
@@ -562,7 +562,7 @@
"index_web_pages_for_search": 1,
"issingle": 1,
"links": [],
"modified": "2026-02-09 15:01:12.466175",
"modified": "2026-02-16 10:36:59.921491",
"modified_by": "Administrator",
"module": "Stock",
"name": "Stock Settings",