Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: BOM Update Cost, when no actual qty #34656

Merged
merged 4 commits into from
Apr 1, 2023
Merged

fix: BOM Update Cost, when no actual qty #34656

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a4112c7
fix: BOM Update Cost, when no actual qty
s-aga-r Mar 30, 2023
b6c0a67
Merge branch 'develop' into FIX-33830
s-aga-r Mar 30, 2023
b4ace34
Merge branch 'develop' into FIX-33830
s-aga-r Mar 31, 2023
2c2b5a5
Merge branch 'develop' into FIX-33830
s-aga-r Mar 31, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions erpnext/manufacturing/doctype/bom/bom.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -943,7 +943,8 @@ def get_valuation_rate(data):
2) If no value, get last valuation rate from SLE
3) If no value, get valuation rate from Item
"""
from frappe.query_builder.functions import Sum
from frappe.query_builder.functions import Count, IfNull, Sum
from pypika import Case

item_code, company = data.get("item_code"), data.get("company")
valuation_rate = 0.0
Expand All @@ -954,7 +955,14 @@ def get_valuation_rate(data):
frappe.qb.from_(bin_table)
.join(wh_table)
.on(bin_table.warehouse == wh_table.name)
.select((Sum(bin_table.stock_value) / Sum(bin_table.actual_qty)).as_("valuation_rate"))
.select(
Case()
.when(
Count(bin_table.name) > 0, IfNull(Sum(bin_table.stock_value) / Sum(bin_table.actual_qty), 0.0)
)
.else_(None)
.as_("valuation_rate")
)
.where((bin_table.item_code == item_code) & (wh_table.company == company))
).run(as_dict=True)[0]

Expand Down