CalvinBackup/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-03-23 04:04:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: validation message in stock reco row idx

Browse Source 
(cherry picked from commit 3960c01798)
This commit is contained in:
Mihir Kandoi
2026-01-20 20:18:59 +05:30
committed by Mergify
parent e854eafc0b
commit 176096bc5b
1 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py
View File

@@ -75,6 +75,7 @@ class StockReconciliation(StockController):
self.validate_duplicate_serial_and_batch_bundle("items") self.validate_duplicate_serial_and_batch_bundle("items")
self.remove_items_with_no_change() self.remove_items_with_no_change()
self.validate_data() self.validate_data()
self.change_row_indexes()
self.validate_expense_account() self.validate_expense_account()
self.validate_customer_provided_item() self.validate_customer_provided_item()
self.set_zero_value_for_customer_provided_items() self.set_zero_value_for_customer_provided_items()
@@ -556,8 +557,7 @@ class StockReconciliation(StockController):
elif len(items) != len(self.items): elif len(items) != len(self.items):
self.items = items self.items = items
for i, item in enumerate(self.items): self.change_idx = True
item.idx = i + 1
frappe.msgprint(_("Removed items with no change in quantity or value.")) frappe.msgprint(_("Removed items with no change in quantity or value."))
def calculate_difference_amount(self, item, item_dict): def calculate_difference_amount(self, item, item_dict):
@@ -574,14 +574,14 @@ class StockReconciliation(StockController):
def validate_data(self): def validate_data(self):
def _get_msg(row_num, msg): def _get_msg(row_num, msg):
return _("Row # {0}:").format(row_num + 1) + " " + msg return _("Row #{0}:").format(row_num) + " " + msg
self.validation_messages = [] self.validation_messages = []
item_warehouse_combinations = [] item_warehouse_combinations = []
default_currency = frappe.db.get_default("currency") default_currency = frappe.db.get_default("currency")
for row_num, row in enumerate(self.items): for row in self.items:
# find duplicates # find duplicates
key = [row.item_code, row.warehouse] key = [row.item_code, row.warehouse]
for field in ["serial_no", "batch_no"]: for field in ["serial_no", "batch_no"]:
@@ -594,7 +594,7 @@ class StockReconciliation(StockController):
if key in item_warehouse_combinations: if key in item_warehouse_combinations:
self.validation_messages.append( self.validation_messages.append(
_get_msg(row_num, _("Same item and warehouse combination already entered.")) _get_msg(row.idx, _("Same item and warehouse combination already entered."))
) )
else: else:
item_warehouse_combinations.append(key) item_warehouse_combinations.append(key)
@@ -604,7 +604,7 @@ class StockReconciliation(StockController):
if row.serial_no and not row.qty: if row.serial_no and not row.qty:
self.validation_messages.append( self.validation_messages.append(
_get_msg( _get_msg(
row_num, row.idx,
f"Quantity should not be zero for the {bold(row.item_code)} since serial nos are specified", f"Quantity should not be zero for the {bold(row.item_code)} since serial nos are specified",
) )
) )
@@ -612,17 +612,17 @@ class StockReconciliation(StockController):
# if both not specified # if both not specified
if row.qty in ["", None] and row.valuation_rate in ["", None]: if row.qty in ["", None] and row.valuation_rate in ["", None]:
self.validation_messages.append( self.validation_messages.append(
_get_msg(row_num, _("Please specify either Quantity or Valuation Rate or both")) _get_msg(row.idx, _("Please specify either Quantity or Valuation Rate or both"))
) )
# do not allow negative quantity # do not allow negative quantity
if flt(row.qty) < 0: if flt(row.qty) < 0:
self.validation_messages.append(_get_msg(row_num, _("Negative Quantity is not allowed"))) self.validation_messages.append(_get_msg(row.idx, _("Negative Quantity is not allowed")))
# do not allow negative valuation # do not allow negative valuation
if flt(row.valuation_rate) < 0: if flt(row.valuation_rate) < 0:
self.validation_messages.append( self.validation_messages.append(
_get_msg(row_num, _("Negative Valuation Rate is not allowed")) _get_msg(row.idx, _("Negative Valuation Rate is not allowed"))
) )
if row.qty and row.valuation_rate in ["", None]: if row.qty and row.valuation_rate in ["", None]:
@@ -654,6 +654,11 @@ class StockReconciliation(StockController):
raise frappe.ValidationError(self.validation_messages) raise frappe.ValidationError(self.validation_messages)
def change_row_indexes(self):
if getattr(self, "change_idx", False):
for i, item in enumerate(self.items):
item.idx = i + 1
def validate_item(self, item_code, row): def validate_item(self, item_code, row):
from erpnext.stock.doctype.item.item import ( from erpnext.stock.doctype.item.item import (
validate_cancelled_item, validate_cancelled_item,