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

Merge pull request #47027 from frappe/mergify/bp/version-15-hotfix/pr-47026

Browse Source 
fix: batchwise valuation for MA item (backport #47026)
This commit is contained in:
rohitwaghchaure
2025-04-11 22:56:25 +05:30
committed by GitHub
parent 706092061b debfcdc61f
commit 1b8a317de9
1 changed files with 1 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
erpnext/stock/stock_ledger.py
View File

@@ -547,9 +547,6 @@ class update_entries_after:
self.allow_zero_rate = allow_zero_rate
self.via_landed_cost_voucher = via_landed_cost_voucher
self.item_code = args.get("item_code")
self.use_moving_avg_for_batch = frappe.db.get_single_value(
"Stock Settings", "do_not_use_batchwise_valuation"
)
self.allow_negative_stock = allow_negative_stock or is_negative_stock_allowed(
item_code=self.item_code
@@ -842,7 +839,7 @@ class update_entries_after:
if sle.get(dimension.get("fieldname")):
has_dimensions = True
if sle.serial_and_batch_bundle and (not self.use_moving_avg_for_batch or sle.has_serial_no):
if sle.serial_and_batch_bundle:
self.calculate_valuation_for_serial_batch_bundle(sle)
elif sle.serial_no and not self.args.get("sle_id"):
# Only run in reposting
@@ -912,15 +909,6 @@ class update_entries_after:
sle.doctype = "Stock Ledger Entry"
frappe.get_doc(sle).db_update()
if (
sle.serial_and_batch_bundle
and self.valuation_method == "Moving Average"
and self.use_moving_avg_for_batch
and (sle.batch_no or sle.has_batch_no)
):
valuation_rate = flt(stock_value_difference) / flt(sle.actual_qty)
self.update_valuation_rate_in_serial_and_batch_bundle(sle, valuation_rate)
if not self.args.get("sle_id") or (
sle.serial_and_batch_bundle and sle.auto_created_serial_and_batch_bundle
):
@@ -1036,15 +1024,6 @@ class update_entries_after:
self.wh_data.qty_after_transaction, self.flt_precision
)
def update_valuation_rate_in_serial_and_batch_bundle(self, sle, valuation_rate):
# Only execute if the item has batch_no and the valuation method is moving average
if not frappe.db.exists("Serial and Batch Bundle", sle.serial_and_batch_bundle):
return
doc = frappe.get_cached_doc("Serial and Batch Bundle", sle.serial_and_batch_bundle)
doc.update_valuation_rate(valuation_rate, save=True)
doc.calculate_qty_and_amount(save=True)
def get_outgoing_rate_for_batched_item(self, sle):
if self.wh_data.qty_after_transaction == 0:
return 0