mirror of
https://github.com/frappe/erpnext.git
synced 2026-03-26 06:31:13 +01:00
fix: Auto Create Serial and Batch Bundle For Outward (#42778)
(cherry picked from commit 48c3b0d094)
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
This commit is contained in:
@@ -701,6 +701,57 @@ class TestSerialandBatchBundle(FrappeTestCase):
|
|||||||
serial_nos = get_serial_nos_from_bundle(se.items[0].serial_and_batch_bundle)
|
serial_nos = get_serial_nos_from_bundle(se.items[0].serial_and_batch_bundle)
|
||||||
self.assertEqual(serial_nos, serial_nos1)
|
self.assertEqual(serial_nos, serial_nos1)
|
||||||
|
|
||||||
|
def test_auto_create_serial_and_batch_bundle_for_outward_for_batch_item(self):
|
||||||
|
item_code = make_item(
|
||||||
|
"Test Auto Create Batch Bundle for Outward 1",
|
||||||
|
properties={
|
||||||
|
"is_stock_item": 1,
|
||||||
|
"has_batch_no": 1,
|
||||||
|
"batch_number_series": "ACSBBO-TACSB-.#####",
|
||||||
|
},
|
||||||
|
).name
|
||||||
|
|
||||||
|
if not frappe.db.exists("Batch", "ACSBBO-TACSB-00001"):
|
||||||
|
frappe.get_doc(
|
||||||
|
{
|
||||||
|
"doctype": "Batch",
|
||||||
|
"batch_id": "ACSBBO-TACSB-00001",
|
||||||
|
"item": item_code,
|
||||||
|
"company": "_Test Company",
|
||||||
|
}
|
||||||
|
).insert(ignore_permissions=True)
|
||||||
|
|
||||||
|
make_stock_entry(
|
||||||
|
item_code=item_code,
|
||||||
|
qty=10,
|
||||||
|
target="_Test Warehouse - _TC",
|
||||||
|
rate=500,
|
||||||
|
use_serial_batch_fields=True,
|
||||||
|
batch_no="ACSBBO-TACSB-00001",
|
||||||
|
)
|
||||||
|
|
||||||
|
dispatch = make_stock_entry(
|
||||||
|
item_code=item_code,
|
||||||
|
qty=10,
|
||||||
|
target="_Test Warehouse - _TC",
|
||||||
|
rate=500,
|
||||||
|
do_not_submit=True,
|
||||||
|
)
|
||||||
|
|
||||||
|
original_value = frappe.db.get_single_value(
|
||||||
|
"Stock Settings", "auto_create_serial_and_batch_bundle_for_outward"
|
||||||
|
)
|
||||||
|
|
||||||
|
frappe.db.set_single_value("Stock Settings", "auto_create_serial_and_batch_bundle_for_outward", 0)
|
||||||
|
self.assertRaises(frappe.ValidationError, dispatch.submit)
|
||||||
|
|
||||||
|
frappe.db.set_single_value("Stock Settings", "auto_create_serial_and_batch_bundle_for_outward", 1)
|
||||||
|
dispatch.submit()
|
||||||
|
|
||||||
|
frappe.db.set_single_value(
|
||||||
|
"Stock Settings", "auto_create_serial_and_batch_bundle_for_outward", original_value
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
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
|
||||||
|
|||||||
@@ -221,7 +221,15 @@ class SerialBatchBundle:
|
|||||||
not self.sle.is_cancelled
|
not self.sle.is_cancelled
|
||||||
and not self.sle.serial_and_batch_bundle
|
and not self.sle.serial_and_batch_bundle
|
||||||
and self.item_details.has_batch_no == 1
|
and self.item_details.has_batch_no == 1
|
||||||
and self.item_details.create_new_batch
|
and (
|
||||||
|
self.item_details.create_new_batch
|
||||||
|
or (
|
||||||
|
frappe.db.get_single_value(
|
||||||
|
"Stock Settings", "auto_create_serial_and_batch_bundle_for_outward"
|
||||||
|
)
|
||||||
|
and self.sle.actual_qty < 0
|
||||||
|
)
|
||||||
|
)
|
||||||
):
|
):
|
||||||
self.make_serial_batch_no_bundle()
|
self.make_serial_batch_no_bundle()
|
||||||
elif not self.sle.is_cancelled:
|
elif not self.sle.is_cancelled:
|
||||||
|
|||||||
Reference in New Issue
Block a user