nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-02-16 08:05:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #45970 from rohitwaghchaure/fixed-support-32040

Browse Source 
fix: serial no status for internal transfer delivery note
This commit is contained in:
rohitwaghchaure
2025-02-18 13:51:00 +05:30
committed by GitHub
parent 1eea76cbad 3333331a3d
commit 74621eeb1b
2 changed files with 46 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
erpnext/controllers/selling_controller.py
View File

@@ -593,12 +593,13 @@ class SellingController(StockController):
if not self.is_internal_transfer() or self.docstatus == 1
else None
)
if serial_and_batch_bundle and self.is_internal_transfer() and self.is_return:
if self.docstatus == 1:
if self.is_internal_transfer():
if serial_and_batch_bundle and self.docstatus == 1 and self.is_return:
serial_and_batch_bundle = self.make_package_for_transfer(
serial_and_batch_bundle, item_row.warehouse, type_of_transaction="Inward"
)
else:
elif not serial_and_batch_bundle:
serial_and_batch_bundle = frappe.db.get_value(
"Stock Ledger Entry",
{"voucher_detail_no": item_row.name, "warehouse": item_row.warehouse},

42
erpnext/stock/doctype/delivery_note/test_delivery_note.py
View File

@@ -790,6 +790,48 @@ class TestDeliveryNote(IntegrationTestCase):
{"warehouse": "_Test Warehouse - _TC"},
)
def test_delivery_note_internal_transfer_serial_no_status(self):
from erpnext.selling.doctype.customer.test_customer import create_internal_customer
item = make_item(
"_Test Item for Internal Transfer With Serial No Status",
properties={"has_serial_no": 1, "is_stock_item": 1, "serial_no_series": "INT-SN-.####"},
).name
warehouse = "_Test Warehouse - _TC"
target = "Stores - _TC"
company = "_Test Company"
customer = create_internal_customer(represents_company=company)
rate = 42
se = make_stock_entry(target=warehouse, qty=5, basic_rate=rate, item_code=item)
serial_nos = get_serial_nos_from_bundle(se.get("items")[0].serial_and_batch_bundle)
dn = create_delivery_note(
item_code=item,
company=company,
customer=customer,
qty=5,
rate=500,
warehouse=warehouse,
target_warehouse=target,
ignore_pricing_rule=0,
use_serial_batch_fields=1,
serial_no="\n".join(serial_nos),
)
for serial_no in serial_nos:
sn = frappe.db.get_value("Serial No", serial_no, ["status", "warehouse"], as_dict=1)
self.assertEqual(sn.status, "Active")
self.assertEqual(sn.warehouse, target)
dn.cancel()
for serial_no in serial_nos:
sn = frappe.db.get_value("Serial No", serial_no, ["status", "warehouse"], as_dict=1)
self.assertEqual(sn.status, "Active")
self.assertEqual(sn.warehouse, warehouse)
def test_delivery_of_bundled_items_to_target_warehouse(self):
from erpnext.selling.doctype.customer.test_customer import create_internal_customer