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

chore: fix conflicts

Browse Source
This commit is contained in:
rohitwaghchaure
2025-10-07 16:02:30 +05:30
committed by GitHub
parent e02a55b188
commit 6ea07ba56d
1 changed files with 0 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
erpnext/stock/deprecated_serial_batch.py
View File

@@ -26,27 +26,7 @@ class DeprecatedSerialNoValuation:
self.stock_value_change += flt(stock_value_change) 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()
# If the serial no inwarded using the Serial and Batch Bundle, then the serial no should not be considered
for serial_no in non_filtered_serial_nos:
if serial_no and serial_no not in self.serial_no_incoming_rate:
serial_nos.append(serial_no)
return serial_nos
@deprecated @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): def get_incoming_value_for_serial_nos(self, serial_nos):
from erpnext.stock.utils import get_combine_datetime from erpnext.stock.utils import get_combine_datetime