Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: incorrect balance qty (backport #33144) #33149

Merged
merged 2 commits into from
Nov 29, 2022
Merged

fix: incorrect balance qty (backport #33144) #33149

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f92b501
fix: incorrect balance qty
rohitwaghchaure Nov 28, 2022
93ec57d
test: test case for serialized batched item
rohitwaghchaure Nov 28, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,7 @@ def update_stock_ledger(self):

if item.has_serial_no or item.has_batch_no:
has_serial_no = True
self.get_sle_for_serialized_items(row, sl_entries)
self.get_sle_for_serialized_items(row, sl_entries, item)
else:
if row.serial_no or row.batch_no:
frappe.throw(
Expand Down Expand Up @@ -282,7 +282,7 @@ def update_stock_ledger(self):
if has_serial_no and sl_entries:
self.update_valuation_rate_for_serial_no()

def get_sle_for_serialized_items(self, row, sl_entries):
def get_sle_for_serialized_items(self, row, sl_entries, item):
from erpnext.stock.stock_ledger import get_previous_sle

serial_nos = get_serial_nos(row.serial_no)
Expand Down Expand Up @@ -348,6 +348,9 @@ def get_sle_for_serialized_items(self, row, sl_entries):
if row.qty:
args = self.get_sle_for_items(row)

if item.has_serial_no and item.has_batch_no:
args["qty_after_transaction"] = row.qty

args.update(
{
"actual_qty": row.qty,
Expand Down
32 changes: 32 additions & 0 deletions erpnext/stock/doctype/stock_reconciliation/test_stock_reconciliation.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -644,6 +644,38 @@ def test_serial_no_creation_and_inactivation(self):
)
self.assertEqual(len(active_sr_no), 0)

def test_serial_no_batch_no_item(self):
item = self.make_item(
"Test Serial No Batch No Item",
{
"is_stock_item": 1,
"has_serial_no": 1,
"has_batch_no": 1,
"serial_no_series": "SRS9.####",
"batch_number_series": "BNS9.####",
"create_new_batch": 1,
},
)

warehouse = "_Test Warehouse - _TC"

sr = create_stock_reconciliation(
item_code=item.name,
warehouse=warehouse,
qty=1,
rate=100,
)

sl_entry = frappe.db.get_value(
"Stock Ledger Entry",
{"voucher_type": "Stock Reconciliation", "voucher_no": sr.name},
["actual_qty", "qty_after_transaction"],
as_dict=1,
)

self.assertEqual(flt(sl_entry.actual_qty), 1.0)
self.assertEqual(flt(sl_entry.qty_after_transaction), 1.0)


def create_batch_item_with_batch(item_name, batch_id):
batch_item_doc = create_item(item_name, is_stock_item=1)
Expand Down