mirror of
https://github.com/frappe/erpnext.git
synced 2026-06-19 12:44:03 +00:00
fix: do not allow to make changes in SABB after submit
(cherry picked from commit e36426e235)
# Conflicts:
# erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py
This commit is contained in:
committed by
Mergify
parent
7852ea65af
commit
07b61113af
@@ -2169,7 +2169,16 @@ def get_type_of_transaction(parent_doc, child_row):
|
||||
|
||||
|
||||
def update_serial_batch_no_ledgers(bundle, entries, child_row, parent_doc, warehouse=None) -> object:
|
||||
frappe.has_permission("Serial and Batch Bundle", "write", throw=True)
|
||||
doc = frappe.get_doc("Serial and Batch Bundle", bundle)
|
||||
|
||||
if doc.docstatus == 1:
|
||||
doc.throw_error_message(
|
||||
_("Serial and Batch Bundle {0} is submitted and its entries cannot be modified.").format(
|
||||
frappe.bold(bundle)
|
||||
)
|
||||
)
|
||||
|
||||
doc.voucher_detail_no = child_row.name
|
||||
doc.posting_date = parent_doc.posting_date
|
||||
doc.posting_time = parent_doc.posting_time
|
||||
|
||||
@@ -734,6 +734,60 @@ class TestSerialandBatchBundle(FrappeTestCase):
|
||||
docstatus = frappe.db.get_value("Serial and Batch Bundle", bundle, "docstatus")
|
||||
self.assertEqual(docstatus, 2)
|
||||
|
||||
def test_submitted_bundle_entries_cannot_be_mutated(self):
|
||||
# A submitted Serial and Batch Bundle is the immutable source of truth for the stock
|
||||
# ledger, live batch availability and repost/valuation replay. update_serial_batch_no_ledgers
|
||||
# (which the whitelisted add_serial_batch_ledgers delegates to for an existing bundle) must
|
||||
# refuse to rebuild -- and thereby inflate -- the quantities of an already submitted bundle.
|
||||
from erpnext.stock.doctype.serial_and_batch_bundle.serial_and_batch_bundle import (
|
||||
update_serial_batch_no_ledgers,
|
||||
)
|
||||
|
||||
item_code = make_item(
|
||||
properties={
|
||||
"has_batch_no": 1,
|
||||
"create_new_batch": 1,
|
||||
"batch_number_series": "TAMPER-SBB-.#####",
|
||||
}
|
||||
).name
|
||||
|
||||
se = make_stock_entry(
|
||||
item_code=item_code,
|
||||
target="_Test Warehouse - _TC",
|
||||
qty=10,
|
||||
rate=100,
|
||||
)
|
||||
|
||||
bundle = se.items[0].serial_and_batch_bundle
|
||||
self.assertEqual(frappe.db.get_value("Serial and Batch Bundle", bundle, "docstatus"), 1)
|
||||
|
||||
original = frappe.db.get_value(
|
||||
"Serial and Batch Entry", {"parent": bundle}, ["name", "batch_no", "qty"], as_dict=True
|
||||
)
|
||||
self.assertEqual(original.qty, 10)
|
||||
|
||||
# Attempt to forge the submitted bundle: keep the same batch but inflate qty. The guard
|
||||
# fires immediately after the bundle is loaded (docstatus check), so child_row / parent_doc
|
||||
# only need the minimal fields the function reads.
|
||||
tampered_entries = [{"batch_no": original.batch_no, "qty": 1000}]
|
||||
child_row = frappe._dict({"name": se.items[0].name})
|
||||
parent_doc = frappe._dict({"posting_date": today(), "posting_time": nowtime()})
|
||||
|
||||
self.assertRaises(
|
||||
frappe.ValidationError,
|
||||
update_serial_batch_no_ledgers,
|
||||
bundle,
|
||||
tampered_entries,
|
||||
child_row,
|
||||
parent_doc,
|
||||
)
|
||||
|
||||
# The on-disk quantity must be untouched by the rejected mutation attempt.
|
||||
self.assertEqual(
|
||||
frappe.db.get_value("Serial and Batch Entry", original.name, "qty"),
|
||||
10,
|
||||
)
|
||||
|
||||
def test_batch_duplicate_entry(self):
|
||||
item_code = make_item(properties={"has_batch_no": 1}).name
|
||||
|
||||
|
||||
@@ -9,14 +9,19 @@ from frappe.utils import add_to_date, cint, cstr, flt, get_datetime, now
|
||||
|
||||
import erpnext
|
||||
from erpnext.accounts.utils import get_company_default
|
||||
from erpnext.controllers.stock_controller import StockController, create_repost_item_valuation_entry
|
||||
from erpnext.controllers.stock_controller import StockController
|
||||
from erpnext.stock.doctype.batch.batch import get_available_batches, get_batch_qty
|
||||
from erpnext.stock.doctype.inventory_dimension.inventory_dimension import get_inventory_dimensions
|
||||
from erpnext.stock.doctype.serial_and_batch_bundle.serial_and_batch_bundle import (
|
||||
get_available_serial_nos,
|
||||
)
|
||||
from erpnext.stock.doctype.serial_no.serial_no import get_serial_nos
|
||||
<<<<<<< HEAD
|
||||
from erpnext.stock.utils import get_combine_datetime, get_incoming_rate, get_stock_balance
|
||||
=======
|
||||
from erpnext.stock.doctype.stock_reconciliation_item.stock_reconciliation_item import StockReconciliationItem
|
||||
from erpnext.stock.utils import get_incoming_rate, get_stock_balance
|
||||
>>>>>>> e36426e235 (fix: do not allow to make changes in SABB after submit)
|
||||
|
||||
|
||||
class OpeningEntryAccountError(frappe.ValidationError):
|
||||
@@ -842,22 +847,6 @@ class StockReconciliation(StockController):
|
||||
|
||||
sl_entries.append(args)
|
||||
|
||||
def update_valuation_rate_for_serial_no(self):
|
||||
for d in self.items:
|
||||
if not d.serial_no:
|
||||
continue
|
||||
|
||||
serial_nos = get_serial_nos(d.serial_no)
|
||||
self.update_valuation_rate_for_serial_nos(d, serial_nos)
|
||||
|
||||
def update_valuation_rate_for_serial_nos(self, row, serial_nos):
|
||||
valuation_rate = row.valuation_rate if self.docstatus == 1 else row.current_valuation_rate
|
||||
if valuation_rate is None:
|
||||
return
|
||||
|
||||
for d in serial_nos:
|
||||
frappe.db.set_value("Serial No", d, "purchase_rate", valuation_rate)
|
||||
|
||||
def get_sle_for_items(self, row, serial_nos=None, current_bundle=True):
|
||||
"""Insert Stock Ledger Entries"""
|
||||
|
||||
@@ -1011,11 +1000,6 @@ class StockReconciliation(StockController):
|
||||
d.quantity_difference = flt(d.qty) - flt(d.current_qty)
|
||||
d.amount_difference = flt(d.amount) - flt(d.current_amount)
|
||||
|
||||
def get_items_for(self, warehouse):
|
||||
self.items = []
|
||||
for item in get_items(warehouse, self.posting_date, self.posting_time, self.company):
|
||||
self.append("items", item)
|
||||
|
||||
def submit(self):
|
||||
if len(self.items) > 100:
|
||||
msgprint(
|
||||
@@ -1038,6 +1022,7 @@ class StockReconciliation(StockController):
|
||||
else:
|
||||
self._cancel()
|
||||
|
||||
<<<<<<< HEAD
|
||||
def add_missing_stock_ledger_entry(self, row, voucher_detail_no, sle_creation):
|
||||
if row.current_qty == 0:
|
||||
return
|
||||
@@ -1177,6 +1162,8 @@ def get_batch_qty_for_stock_reco(
|
||||
|
||||
return flt(qty)
|
||||
|
||||
=======
|
||||
>>>>>>> e36426e235 (fix: do not allow to make changes in SABB after submit)
|
||||
|
||||
@frappe.whitelist()
|
||||
def get_items(warehouse, posting_date, posting_time, company, item_code=None, ignore_empty_stock=False):
|
||||
|
||||
Reference in New Issue
Block a user