CalvinBackup/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-03-25 14:11:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix: validation for serial no (backport #44133) (#44151)

Browse Source 
* fix: validation for serial no (#44133)

(cherry picked from commit 93c8b4c39a)

# Conflicts:
#	erpnext/stock/doctype/stock_entry/test_stock_entry.py

* chore: fix conflicts

---------

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
This commit is contained in:
mergify[bot]
2024-11-15 16:55:32 +05:30
committed by GitHub
parent b6fe1f5842
commit 725d107288
2 changed files with 0 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -749,10 +749,6 @@ class SerialandBatchBundle(Document):
) )
def validate_incorrect_serial_nos(self, serial_nos): def validate_incorrect_serial_nos(self, serial_nos):
if self.voucher_type == "Stock Entry" and self.voucher_no:
if frappe.get_cached_value("Stock Entry", self.voucher_no, "purpose") == "Repack":
return
incorrect_serial_nos = frappe.get_all( incorrect_serial_nos = frappe.get_all(
"Serial No", "Serial No",
filters={"name": ("in", serial_nos), "item_code": ("!=", self.item_code)}, filters={"name": ("in", serial_nos), "item_code": ("!=", self.item_code)},

55
erpnext/stock/doctype/stock_entry/test_stock_entry.py
View File

@@ -970,61 +970,6 @@ class TestStockEntry(FrappeTestCase):
self.assertRaises(frappe.ValidationError, ste.submit) self.assertRaises(frappe.ValidationError, ste.submit)
def test_same_serial_nos_in_repack_or_manufacture_entries(self):
s1 = make_serialized_item(target_warehouse="_Test Warehouse - _TC")
serial_nos = get_serial_nos_from_bundle(s1.get("items")[0].serial_and_batch_bundle)
s2 = make_stock_entry(
item_code="_Test Serialized Item With Series",
source="_Test Warehouse - _TC",
qty=2,
basic_rate=100,
purpose="Repack",
serial_no=serial_nos,
do_not_save=True,
)
frappe.flags.use_serial_and_batch_fields = True
cls_obj = SerialBatchCreation(
{
"type_of_transaction": "Inward",
"serial_and_batch_bundle": s2.items[0].serial_and_batch_bundle,
"item_code": "_Test Serialized Item",
"warehouse": "_Test Warehouse - _TC",
}
)
cls_obj.duplicate_package()
bundle_id = cls_obj.serial_and_batch_bundle
doc = frappe.get_doc("Serial and Batch Bundle", bundle_id)
doc.db_set(
{
"item_code": "_Test Serialized Item",
"warehouse": "_Test Warehouse - _TC",
}
)
doc.load_from_db()
s2.append(
"items",
{
"item_code": "_Test Serialized Item",
"t_warehouse": "_Test Warehouse - _TC",
"qty": 2,
"basic_rate": 120,
"expense_account": "Stock Adjustment - _TC",
"conversion_factor": 1.0,
"cost_center": "_Test Cost Center - _TC",
"serial_and_batch_bundle": bundle_id,
},
)
s2.submit()
s2.cancel()
frappe.flags.use_serial_and_batch_fields = False
def test_quality_check(self): def test_quality_check(self):
item_code = "_Test Item For QC" item_code = "_Test Item For QC"
if not frappe.db.exists("Item", item_code): if not frappe.db.exists("Item", item_code):