mirror of
https://github.com/frappe/erpnext.git
synced 2026-04-20 23:35:11 +00:00
This commit is contained in:
@@ -1446,6 +1446,7 @@ class SerialandBatchBundle(Document):
|
|||||||
def on_cancel(self):
|
def on_cancel(self):
|
||||||
self.validate_voucher_no_docstatus()
|
self.validate_voucher_no_docstatus()
|
||||||
self.validate_batch_quantity()
|
self.validate_batch_quantity()
|
||||||
|
self.remove_source_document_no()
|
||||||
|
|
||||||
def validate_batch_quantity(self):
|
def validate_batch_quantity(self):
|
||||||
if not self.has_batch_no:
|
if not self.has_batch_no:
|
||||||
@@ -1464,6 +1465,19 @@ class SerialandBatchBundle(Document):
|
|||||||
if flt(available_qty, precision) < 0:
|
if flt(available_qty, precision) < 0:
|
||||||
self.throw_negative_batch(d.batch_no, available_qty, precision)
|
self.throw_negative_batch(d.batch_no, available_qty, precision)
|
||||||
|
|
||||||
|
def remove_source_document_no(self):
|
||||||
|
if not self.has_serial_no:
|
||||||
|
return
|
||||||
|
|
||||||
|
if self.total_qty > 0:
|
||||||
|
serial_nos = [d.serial_no for d in self.entries if d.serial_no]
|
||||||
|
sn_table = frappe.qb.DocType("Serial No")
|
||||||
|
(
|
||||||
|
frappe.qb.update(sn_table)
|
||||||
|
.set(sn_table.purchase_document_no, None)
|
||||||
|
.where((sn_table.name.isin(serial_nos)) & (sn_table.purchase_document_no == self.voucher_no))
|
||||||
|
).run()
|
||||||
|
|
||||||
def throw_negative_batch(self, batch_no, available_qty, precision, posting_datetime=None):
|
def throw_negative_batch(self, batch_no, available_qty, precision, posting_datetime=None):
|
||||||
from erpnext.stock.stock_ledger import NegativeStockError
|
from erpnext.stock.stock_ledger import NegativeStockError
|
||||||
|
|
||||||
|
|||||||
@@ -1071,6 +1071,38 @@ class TestSerialandBatchBundle(FrappeTestCase):
|
|||||||
self.assertTrue(bundle_doc.docstatus == 0)
|
self.assertTrue(bundle_doc.docstatus == 0)
|
||||||
self.assertRaises(frappe.ValidationError, bundle_doc.submit)
|
self.assertRaises(frappe.ValidationError, bundle_doc.submit)
|
||||||
|
|
||||||
|
def test_reference_voucher_on_cancel(self):
|
||||||
|
"""
|
||||||
|
When a source document is cancelled, the reference voucher field
|
||||||
|
in the respective serial or batch document should be nullified.
|
||||||
|
"""
|
||||||
|
|
||||||
|
item_code = make_item(
|
||||||
|
"Serial Item",
|
||||||
|
properties={
|
||||||
|
"is_stock_item": 1,
|
||||||
|
"has_serial_no": 1,
|
||||||
|
"serial_no_series": "SERIAL.#####",
|
||||||
|
},
|
||||||
|
).name
|
||||||
|
|
||||||
|
se = make_stock_entry(
|
||||||
|
item_code=item_code,
|
||||||
|
qty=1,
|
||||||
|
target="_Test Warehouse - _TC",
|
||||||
|
)
|
||||||
|
serial_no = get_serial_nos_from_bundle(se.items[0].serial_and_batch_bundle)[0]
|
||||||
|
self.assertEqual(frappe.get_value("Serial No", serial_no, "purchase_document_no"), se.name)
|
||||||
|
|
||||||
|
se.cancel()
|
||||||
|
self.assertIsNone(frappe.get_value("Serial No", serial_no, "purchase_document_no"))
|
||||||
|
|
||||||
|
se1 = frappe.copy_doc(se, ignore_no_copy=False)
|
||||||
|
se1.items[0].serial_no = serial_no
|
||||||
|
se1.submit()
|
||||||
|
|
||||||
|
self.assertEqual(frappe.get_value("Serial No", serial_no, "purchase_document_no"), se1.name)
|
||||||
|
|
||||||
|
|
||||||
def get_batch_from_bundle(bundle):
|
def get_batch_from_bundle(bundle):
|
||||||
from erpnext.stock.serial_batch_bundle import get_batch_nos
|
from erpnext.stock.serial_batch_bundle import get_batch_nos
|
||||||
|
|||||||
Reference in New Issue
Block a user