Skip to content

Commit

Permalink
Merge pull request #37249 from akhilnarang/drop-redundant-check
Browse files Browse the repository at this point in the history
Drop redundant check
  • Loading branch information
ankush authored Sep 26, 2023
2 parents 8051c2d + dd911aa commit 4555543
Showing 1 changed file with 12 additions and 17 deletions.
29 changes: 12 additions & 17 deletions erpnext/stock/stock_ledger.py
Original file line number Diff line number Diff line change
Expand Up @@ -1464,8 +1464,6 @@ def get_valuation_rate(
if not company:
company = frappe.get_cached_value("Warehouse", warehouse, "company")

last_valuation_rate = None

# Get moving average rate of a specific batch number
if warehouse and serial_and_batch_bundle:
batch_obj = BatchNoValuation(
Expand All @@ -1482,21 +1480,18 @@ def get_valuation_rate(
return batch_obj.get_incoming_rate()

# Get valuation rate from last sle for the same item and warehouse
if not last_valuation_rate or last_valuation_rate[0][0] is None:
last_valuation_rate = frappe.db.sql(
"""select valuation_rate
from `tabStock Ledger Entry` force index (item_warehouse)
where
item_code = %s
AND warehouse = %s
AND valuation_rate >= 0
AND is_cancelled = 0
AND NOT (voucher_no = %s AND voucher_type = %s)
order by posting_date desc, posting_time desc, name desc limit 1""",
(item_code, warehouse, voucher_no, voucher_type),
)

if last_valuation_rate:
if last_valuation_rate := frappe.db.sql(
"""select valuation_rate
from `tabStock Ledger Entry` force index (item_warehouse)
where
item_code = %s
AND warehouse = %s
AND valuation_rate >= 0
AND is_cancelled = 0
AND NOT (voucher_no = %s AND voucher_type = %s)
order by posting_date desc, posting_time desc, name desc limit 1""",
(item_code, warehouse, voucher_no, voucher_type),
):
return flt(last_valuation_rate[0][0])

# If negative stock allowed, and item delivered without any incoming entry,
Expand Down

0 comments on commit 4555543

Please sign in to comment.