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

fix: valuation rate for the legacy batches (backport #42011) (#42020)

Browse Source 
fix: valuation rate for the legacy batches (#42011)

(cherry picked from commit 9ab333d105)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
This commit is contained in:
mergify[bot]
2024-06-25 13:07:03 +05:30
committed by GitHub
parent 838cc5b72a
commit f6be19cb7c
4 changed files with 63 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

86
erpnext/stock/deprecated_serial_batch.py
View File

@@ -1,3 +1,6 @@
import datetime
from collections import defaultdict
import frappe import frappe
from frappe.query_builder.functions import CombineDatetime, Sum from frappe.query_builder.functions import CombineDatetime, Sum
from frappe.utils import flt from frappe.utils import flt
@@ -8,12 +11,7 @@ from pypika import Order
class DeprecatedSerialNoValuation: class DeprecatedSerialNoValuation:
@deprecated @deprecated
def calculate_stock_value_from_deprecarated_ledgers(self): def calculate_stock_value_from_deprecarated_ledgers(self):
if not frappe.db.get_all( if not has_sle_for_serial_nos(self.sle.item_code):
"Stock Ledger Entry",
fields=["name"],
filters={"serial_no": ("is", "set"), "is_cancelled": 0, "item_code": self.sle.item_code},
limit=1,
):
return return
serial_nos = self.get_filterd_serial_nos() serial_nos = self.get_filterd_serial_nos()
@@ -82,6 +80,20 @@ class DeprecatedSerialNoValuation:
return incoming_values return incoming_values
@frappe.request_cache
def has_sle_for_serial_nos(item_code):
serial_nos = frappe.db.get_all(
"Stock Ledger Entry",
fields=["name"],
filters={"serial_no": ("is", "set"), "is_cancelled": 0, "item_code": item_code},
limit=1,
)
if serial_nos:
return True
return False
class DeprecatedBatchNoValuation: class DeprecatedBatchNoValuation:
@deprecated @deprecated
def calculate_avg_rate_from_deprecarated_ledgers(self): def calculate_avg_rate_from_deprecarated_ledgers(self):
@@ -92,19 +104,25 @@ class DeprecatedBatchNoValuation:
@deprecated @deprecated
def get_sle_for_batches(self): def get_sle_for_batches(self):
from erpnext.stock.utils import get_combine_datetime
if not self.batchwise_valuation_batches: if not self.batchwise_valuation_batches:
return [] return []
sle = frappe.qb.DocType("Stock Ledger Entry") sle = frappe.qb.DocType("Stock Ledger Entry")
timestamp_condition = CombineDatetime(sle.posting_date, sle.posting_time) < CombineDatetime( timestamp_condition = None
self.sle.posting_date, self.sle.posting_time if self.sle.posting_date and self.sle.posting_time:
) posting_datetime = get_combine_datetime(self.sle.posting_date, self.sle.posting_time)
if self.sle.creation: if not self.sle.creation:
timestamp_condition |= ( posting_datetime = posting_datetime + datetime.timedelta(milliseconds=1)
CombineDatetime(sle.posting_date, sle.posting_time)
== CombineDatetime(self.sle.posting_date, self.sle.posting_time) timestamp_condition = sle.posting_datetime < posting_datetime
) & (sle.creation < self.sle.creation)
if self.sle.creation:
timestamp_condition |= (sle.posting_datetime == posting_datetime) & (
sle.creation < self.sle.creation
)
query = ( query = (
frappe.qb.from_(sle) frappe.qb.from_(sle)
@@ -120,10 +138,12 @@ class DeprecatedBatchNoValuation:
& (sle.batch_no.isnotnull()) & (sle.batch_no.isnotnull())
& (sle.is_cancelled == 0) & (sle.is_cancelled == 0)
) )
.where(timestamp_condition)
.groupby(sle.batch_no) .groupby(sle.batch_no)
) )
if timestamp_condition:
query = query.where(timestamp_condition)
if self.sle.name: if self.sle.name:
query = query.where(sle.name != self.sle.name) query = query.where(sle.name != self.sle.name)
@@ -134,8 +154,8 @@ class DeprecatedBatchNoValuation:
if not self.non_batchwise_valuation_batches: if not self.non_batchwise_valuation_batches:
return return
self.non_batchwise_balance_value = 0.0 self.non_batchwise_balance_value = defaultdict(float)
self.non_batchwise_balance_qty = 0.0 self.non_batchwise_balance_qty = defaultdict(float)
self.set_balance_value_for_non_batchwise_valuation_batches() self.set_balance_value_for_non_batchwise_valuation_batches()
@@ -146,12 +166,12 @@ class DeprecatedBatchNoValuation:
if not self.non_batchwise_balance_qty: if not self.non_batchwise_balance_qty:
continue continue
if self.non_batchwise_balance_value == 0: if self.non_batchwise_balance_qty.get(batch_no) == 0:
self.batch_avg_rate[batch_no] = 0.0 self.batch_avg_rate[batch_no] = 0.0
self.stock_value_differece[batch_no] = 0.0 self.stock_value_differece[batch_no] = 0.0
else: else:
self.batch_avg_rate[batch_no] = ( self.batch_avg_rate[batch_no] = (
self.non_batchwise_balance_value / self.non_batchwise_balance_qty self.non_batchwise_balance_value[batch_no] / self.non_batchwise_balance_qty[batch_no]
) )
self.stock_value_differece[batch_no] = self.non_batchwise_balance_value self.stock_value_differece[batch_no] = self.non_batchwise_balance_value
@@ -174,17 +194,21 @@ class DeprecatedBatchNoValuation:
@deprecated @deprecated
def set_balance_value_from_sl_entries(self) -> None: def set_balance_value_from_sl_entries(self) -> None:
from erpnext.stock.utils import get_combine_datetime
sle = frappe.qb.DocType("Stock Ledger Entry") sle = frappe.qb.DocType("Stock Ledger Entry")
batch = frappe.qb.DocType("Batch") batch = frappe.qb.DocType("Batch")
timestamp_condition = CombineDatetime(sle.posting_date, sle.posting_time) < CombineDatetime( posting_datetime = get_combine_datetime(self.sle.posting_date, self.sle.posting_time)
self.sle.posting_date, self.sle.posting_time if not self.sle.creation:
) posting_datetime = posting_datetime + datetime.timedelta(milliseconds=1)
timestamp_condition = sle.posting_datetime < posting_datetime
if self.sle.creation: if self.sle.creation:
timestamp_condition |= ( timestamp_condition |= (sle.posting_datetime == posting_datetime) & (
CombineDatetime(sle.posting_date, sle.posting_time) sle.creation < self.sle.creation
== CombineDatetime(self.sle.posting_date, self.sle.posting_time) )
) & (sle.creation < self.sle.creation)
query = ( query = (
frappe.qb.from_(sle) frappe.qb.from_(sle)
@@ -201,6 +225,7 @@ class DeprecatedBatchNoValuation:
& (sle.batch_no.isnotnull()) & (sle.batch_no.isnotnull())
& (batch.use_batchwise_valuation == 0) & (batch.use_batchwise_valuation == 0)
& (sle.is_cancelled == 0) & (sle.is_cancelled == 0)
& (sle.batch_no.isin(self.non_batchwise_valuation_batches))
) )
.where(timestamp_condition) .where(timestamp_condition)
.groupby(sle.batch_no) .groupby(sle.batch_no)
@@ -210,8 +235,8 @@ class DeprecatedBatchNoValuation:
query = query.where(sle.name != self.sle.name) query = query.where(sle.name != self.sle.name)
for d in query.run(as_dict=True): for d in query.run(as_dict=True):
self.non_batchwise_balance_value += flt(d.batch_value) self.non_batchwise_balance_value[d.batch_no] += flt(d.batch_value)
self.non_batchwise_balance_qty += flt(d.batch_qty) self.non_batchwise_balance_qty[d.batch_no] += flt(d.batch_qty)
self.available_qty[d.batch_no] += flt(d.batch_qty) self.available_qty[d.batch_no] += flt(d.batch_qty)
@deprecated @deprecated
@@ -249,6 +274,7 @@ class DeprecatedBatchNoValuation:
& (bundle.is_cancelled == 0) & (bundle.is_cancelled == 0)
& (bundle.docstatus == 1) & (bundle.docstatus == 1)
& (bundle.type_of_transaction.isin(["Inward", "Outward"])) & (bundle.type_of_transaction.isin(["Inward", "Outward"]))
& (bundle_child.batch_no.isin(self.non_batchwise_valuation_batches))
) )
.where(timestamp_condition) .where(timestamp_condition)
.groupby(bundle_child.batch_no) .groupby(bundle_child.batch_no)
@@ -260,6 +286,6 @@ class DeprecatedBatchNoValuation:
query = query.where(bundle.voucher_type != "Pick List") query = query.where(bundle.voucher_type != "Pick List")
for d in query.run(as_dict=True): for d in query.run(as_dict=True):
self.non_batchwise_balance_value += flt(d.batch_value) self.non_batchwise_balance_value[d.batch_no] += flt(d.batch_value)
self.non_batchwise_balance_qty += flt(d.batch_qty) self.non_batchwise_balance_qty[d.batch_no] += flt(d.batch_qty)
self.available_qty[d.batch_no] += flt(d.batch_qty) self.available_qty[d.batch_no] += flt(d.batch_qty)

4
erpnext/stock/doctype/stock_reconciliation/test_stock_reconciliation.py
View File

@@ -647,7 +647,7 @@ class TestStockReconciliation(FrappeTestCase, StockTestMixin):
"has_serial_no": 1, "has_serial_no": 1,
"has_batch_no": 1, "has_batch_no": 1,
"serial_no_series": "SRS9.####", "serial_no_series": "SRS9.####",
"batch_number_series": "BNS9.####", "batch_number_series": "BNS90.####",
"create_new_batch": 1, "create_new_batch": 1,
}, },
) )
@@ -680,7 +680,7 @@ class TestStockReconciliation(FrappeTestCase, StockTestMixin):
{ {
"is_stock_item": 1, "is_stock_item": 1,
"has_batch_no": 1, "has_batch_no": 1,
"batch_number_series": "BNS9.####", "batch_number_series": "BNS91.####",
"create_new_batch": 1, "create_new_batch": 1,
}, },
).name ).name

6
erpnext/stock/utils.py
View File

@@ -276,11 +276,7 @@ def get_incoming_rate(args, raise_error_if_no_rate=True):
sn_obj = SerialNoValuation(sle=args, warehouse=args.get("warehouse"), item_code=args.get("item_code")) sn_obj = SerialNoValuation(sle=args, warehouse=args.get("warehouse"), item_code=args.get("item_code"))
return sn_obj.get_incoming_rate() return sn_obj.get_incoming_rate()
elif ( elif args.get("batch_no") and not args.get("serial_and_batch_bundle"):
args.get("batch_no")
and frappe.db.get_value("Batch", args.get("batch_no"), "use_batchwise_valuation", cache=True)
and not args.get("serial_and_batch_bundle")
):
args.actual_qty = args.qty args.actual_qty = args.qty
args.batch_nos = frappe._dict({args.batch_no: args}) args.batch_nos = frappe._dict({args.batch_no: args})

8
erpnext/subcontracting/doctype/subcontracting_receipt/test_subcontracting_receipt.py
View File

@@ -623,8 +623,8 @@ class TestSubcontractingReceipt(FrappeTestCase):
"has_batch_no": 1, "has_batch_no": 1,
"has_serial_no": 1, "has_serial_no": 1,
"create_new_batch": 1, "create_new_batch": 1,
"batch_number_series": "BNGS-.####", "batch_number_series": "BNGS0-.####",
"serial_no_series": "BNSS-.####", "serial_no_series": "BNSS90-.####",
} }
).name ).name
@@ -715,8 +715,8 @@ class TestSubcontractingReceipt(FrappeTestCase):
"has_batch_no": 1, "has_batch_no": 1,
"has_serial_no": 1, "has_serial_no": 1,
"create_new_batch": 1, "create_new_batch": 1,
"batch_number_series": "BNGS-.####", "batch_number_series": "BNGS91-.####",
"serial_no_series": "BNSS-.####", "serial_no_series": "BNSS91-.####",
} }
).name ).name