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

chore: fix conflicts

Browse Source 
Removed legacy code for fetching incoming rates from serial numbers.
This commit is contained in:
rohitwaghchaure
2026-05-21 14:28:29 +05:30
committed by GitHub
parent 6e6ef83d60
commit 08466218d8
1 changed files with 0 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
erpnext/stock/deprecated_serial_batch.py
View File

@@ -32,18 +32,6 @@ class DeprecatedSerialNoValuation:
# get rate from serial nos within same company # get rate from serial nos within same company
incoming_values = 0.0 incoming_values = 0.0
<<<<<<< HEAD
=======
posting_datetime = self.sle.posting_datetime
if not posting_datetime and self.sle.posting_date:
posting_datetime = get_combine_datetime(self.sle.posting_date, self.sle.posting_time)
do_not_fetch_rate = frappe.db.get_single_value(
"Stock Reposting Settings", "do_not_fetch_incoming_rate_from_serial_no"
)
>>>>>>> 2773b7c002 (fix: incoming rate for legacy serial no)
for serial_no in serial_nos: for serial_no in serial_nos:
sn_details = frappe.db.get_value("Serial No", serial_no, ["purchase_rate", "company"], as_dict=1) sn_details = frappe.db.get_value("Serial No", serial_no, ["purchase_rate", "company"], as_dict=1)
if ( if (