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

Merge pull request #41917 from frappe/mergify/bp/version-15-hotfix/pr-41916

Browse Source 
fix: incorrect batch return from sales return (backport #41916)
This commit is contained in:
rohitwaghchaure
2024-06-17 11:35:24 +05:30
committed by GitHub
parent 69de359728 b64b4330a3
commit 9771bbdb75
2 changed files with 107 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
erpnext/controllers/sales_and_purchase_return.py
View File

@@ -883,6 +883,9 @@ def get_serial_batches_based_on_bundle(field, _bundle_ids):
if frappe.get_cached_value(row.voucher_type, row.voucher_no, "is_return"):
key = frappe.get_cached_value(row.voucher_type + " Item", row.voucher_detail_no, field)
if row.voucher_type in ["Sales Invoice", "Delivery Note"]:
row.qty = -1 * row.qty
if key not in available_dict:
available_dict[key] = frappe._dict(
{"qty": 0.0, "serial_nos": defaultdict(float), "batches": defaultdict(float)}

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

@@ -1814,6 +1814,110 @@ class TestDeliveryNote(FrappeTestCase):
self.assertEqual(sle_data.actual_qty, 1 * -1)
self.assertEqual(sle_data.stock_value_difference, 200.0 * -1)
def test_sales_return_batch_no_for_batched_item_in_dn(self):
from erpnext.stock.doctype.delivery_note.delivery_note import make_sales_return
item_code = make_item(
"Test Batched Item for Sales Return 11",
properties={
"has_batch_no": 1,
"create_new_batch": 1,
"batch_number_series": "B11-TESTBATCH.#####",
"is_stock_item": 1,
},
).name
se = make_stock_entry(item_code=item_code, target="_Test Warehouse - _TC", qty=5, basic_rate=100)
batch_no = get_batch_from_bundle(se.items[0].serial_and_batch_bundle)
dn = create_delivery_note(
item_code=item_code,
qty=5,
rate=500,
use_serial_batch_fields=0,
batch_no=batch_no,
)
dn_return = make_sales_return(dn.name)
dn_return.save().submit()
returned_batch_no = get_batch_from_bundle(dn_return.items[0].serial_and_batch_bundle)
self.assertEqual(batch_no, returned_batch_no)
def test_partial_sales_return_batch_no_for_batched_item_in_dn(self):
from erpnext.stock.doctype.delivery_note.delivery_note import make_sales_return
item_code = make_item(
"Test Partial Batched Item for Sales Return 11",
properties={
"has_batch_no": 1,
"create_new_batch": 1,
"batch_number_series": "BPART11-TESTBATCH.#####",
"is_stock_item": 1,
},
).name
se = make_stock_entry(item_code=item_code, target="_Test Warehouse - _TC", qty=5, basic_rate=100)
batch_no = get_batch_from_bundle(se.items[0].serial_and_batch_bundle)
dn = create_delivery_note(
item_code=item_code,
qty=5,
rate=500,
use_serial_batch_fields=0,
batch_no=batch_no,
)
dn_return = make_sales_return(dn.name)
dn_return.items[0].qty = 3 * -1
dn_return.save().submit()
returned_batch_no = get_batch_from_bundle(dn_return.items[0].serial_and_batch_bundle)
self.assertEqual(batch_no, returned_batch_no)
sabb_qty = frappe.db.get_value(
"Serial and Batch Bundle", dn_return.items[0].serial_and_batch_bundle, "total_qty"
)
self.assertEqual(sabb_qty, 3)
dn_return = make_sales_return(dn.name)
dn_return.items[0].qty = 2 * -1
dn_return.save().submit()
returned_batch_no = get_batch_from_bundle(dn_return.items[0].serial_and_batch_bundle)
self.assertEqual(batch_no, returned_batch_no)
sabb_qty = frappe.db.get_value(
"Serial and Batch Bundle", dn_return.items[0].serial_and_batch_bundle, "total_qty"
)
self.assertEqual(sabb_qty, 2)
def test_sales_return_serial_no_for_serial_item_in_dn(self):
from erpnext.stock.doctype.delivery_note.delivery_note import make_sales_return
item_code = make_item(
"Test Serial Item for Sales Return 11",
properties={
"has_serial_no": 1,
"serial_no_series": "SNN11-TESTBATCH.#####",
"is_stock_item": 1,
},
).name
se = make_stock_entry(item_code=item_code, target="_Test Warehouse - _TC", qty=5, basic_rate=100)
serial_nos = get_serial_nos_from_bundle(se.items[0].serial_and_batch_bundle)
dn = create_delivery_note(
item_code=item_code,
qty=5,
rate=500,
use_serial_batch_fields=0,
serial_no=serial_nos,
)
dn_return = make_sales_return(dn.name)
dn_return.save().submit()
returned_serial_nos = get_serial_nos_from_bundle(dn_return.items[0].serial_and_batch_bundle)
self.assertEqual(serial_nos, returned_serial_nos)
def create_delivery_note(**args):
dn = frappe.new_doc("Delivery Note")