mirror of
https://github.com/frappe/erpnext.git
synced 2026-03-20 18:54:55 +00:00
refactor: old serial nos filter
(cherry picked from commit 6a8bd0ae9e)
# Conflicts:
# erpnext/stock/deprecated_serial_batch.py
This commit is contained in:
committed by
Mergify
parent
baa6d2bcdc
commit
e02a55b188
@@ -13,10 +13,10 @@ from pypika.functions import Coalesce
|
||||
class DeprecatedSerialNoValuation:
|
||||
@deprecated
|
||||
def calculate_stock_value_from_deprecarated_ledgers(self):
|
||||
if not has_sle_for_serial_nos(self.sle.item_code):
|
||||
return
|
||||
serial_nos = []
|
||||
if hasattr(self, "old_serial_nos"):
|
||||
serial_nos = self.old_serial_nos
|
||||
|
||||
serial_nos = self.get_filterd_serial_nos()
|
||||
if not serial_nos:
|
||||
return
|
||||
|
||||
@@ -26,6 +26,7 @@ class DeprecatedSerialNoValuation:
|
||||
|
||||
self.stock_value_change += flt(stock_value_change)
|
||||
|
||||
<<<<<<< HEAD
|
||||
def get_filterd_serial_nos(self):
|
||||
serial_nos = []
|
||||
non_filtered_serial_nos = self.get_serial_nos()
|
||||
@@ -38,6 +39,14 @@ class DeprecatedSerialNoValuation:
|
||||
return serial_nos
|
||||
|
||||
@deprecated
|
||||
=======
|
||||
@deprecated(
|
||||
"erpnext.stock.serial_batch_bundle.SerialNoValuation.get_incoming_value_for_serial_nos",
|
||||
"unknown",
|
||||
"v16",
|
||||
"No known instructions.",
|
||||
)
|
||||
>>>>>>> 6a8bd0ae9e (refactor: old serial nos filter)
|
||||
def get_incoming_value_for_serial_nos(self, serial_nos):
|
||||
from erpnext.stock.utils import get_combine_datetime
|
||||
|
||||
@@ -82,20 +91,6 @@ class DeprecatedSerialNoValuation:
|
||||
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:
|
||||
@deprecated
|
||||
def calculate_avg_rate_from_deprecarated_ledgers(self):
|
||||
|
||||
@@ -580,11 +580,13 @@ class SerialNoValuation(DeprecatedSerialNoValuation):
|
||||
else:
|
||||
self.serial_no_incoming_rate = defaultdict(float)
|
||||
self.stock_value_change = 0.0
|
||||
self.old_serial_nos = []
|
||||
|
||||
serial_nos = self.get_serial_nos()
|
||||
for serial_no in serial_nos:
|
||||
incoming_rate = self.get_incoming_rate_from_bundle(serial_no)
|
||||
if incoming_rate is None:
|
||||
self.old_serial_nos.append(serial_no)
|
||||
continue
|
||||
|
||||
self.stock_value_change += incoming_rate
|
||||
|
||||
Reference in New Issue
Block a user