nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-04-12 19:35:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: bugs

Browse Source 
(cherry picked from commit 19ae405742)
This commit is contained in:
Mihir Kandoi
2026-01-16 13:15:22 +05:30
committed by Mergify
parent f04221417e
commit accce1fe59
2 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
erpnext/stock/doctype/stock_entry/stock_entry.py
View File

@@ -3449,19 +3449,19 @@ def move_sample_to_retention_warehouse(company, items):
sabe = next(item for item in sabb.entries if item.batch_no == batch_no) sabe = next(item for item in sabb.entries if item.batch_no == batch_no)
if sample_quantity: if sample_quantity:
total_qty += sample_quantity
if sabb.has_serial_no: if sabb.has_serial_no:
sabe_list.extend( new_sabe = [
[ entry
entry for entry in sabb.entries
for entry in sabb.entries if entry.batch_no == batch_no
if entry.batch_no == batch_no and frappe.db.exists(
and frappe.db.exists( "Serial No", {"name": entry.serial_no, "warehouse": warehouse}
"Serial No", {"name": entry.serial_no, "warehouse": warehouse} )
) ][: int(sample_quantity)]
][: int(sample_quantity)] sabe_list.extend(new_sabe)
) total_qty += len(new_sabe)
else: else:
total_qty += sample_quantity
sabe.qty = sample_quantity sabe.qty = sample_quantity
else: else:
sabb.entries.remove(sabe) sabb.entries.remove(sabe)

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

@@ -2291,7 +2291,7 @@ class TestStockEntry(IntegrationTestCase):
"retain_sample": 1, "retain_sample": 1,
"sample_quantity": 2, "sample_quantity": 2,
"has_batch_no": 1, "has_batch_no": 1,
"has_seral_no": 1, "has_serial_no": 1,
"create_new_batch": 1, "create_new_batch": 1,
"batch_number_series": "SAMPLE-RET-.#####", "batch_number_series": "SAMPLE-RET-.#####",
"serial_no_series": "SAMPLE-RET-SN-.#####", "serial_no_series": "SAMPLE-RET-SN-.#####",