mirror of
https://github.com/inventree/InvenTree
synced 2024-08-30 18:33:04 +00:00
Fix for #1861
This commit is contained in:
parent
125260160c
commit
a6b52a9fae
@ -995,8 +995,9 @@ class BomList(generics.ListCreateAPIView):
|
|||||||
|
|
||||||
# Get values for currencies
|
# Get values for currencies
|
||||||
currencies = queryset.annotate(
|
currencies = queryset.annotate(
|
||||||
|
purchase_price=F('sub_part__stock_items__purchase_price'),
|
||||||
purchase_price_currency=F('sub_part__stock_items__purchase_price_currency'),
|
purchase_price_currency=F('sub_part__stock_items__purchase_price_currency'),
|
||||||
).values('pk', 'sub_part', 'purchase_price_currency')
|
).values('pk', 'sub_part', 'purchase_price', 'purchase_price_currency')
|
||||||
|
|
||||||
def convert_price(price, currency, decimal_places=4):
|
def convert_price(price, currency, decimal_places=4):
|
||||||
""" Convert price field, returns Money field """
|
""" Convert price field, returns Money field """
|
||||||
@ -1032,7 +1033,7 @@ class BomList(generics.ListCreateAPIView):
|
|||||||
# Find associated currency (select first found)
|
# Find associated currency (select first found)
|
||||||
purchase_price_currency = None
|
purchase_price_currency = None
|
||||||
for currency_item in currencies:
|
for currency_item in currencies:
|
||||||
if currency_item['pk'] == bom_item.pk and currency_item['sub_part'] == bom_item.sub_part.pk:
|
if currency_item['pk'] == bom_item.pk and currency_item['sub_part'] == bom_item.sub_part.pk and currency_item['purchase_price']:
|
||||||
purchase_price_currency = currency_item['purchase_price_currency']
|
purchase_price_currency = currency_item['purchase_price_currency']
|
||||||
break
|
break
|
||||||
# Convert prices
|
# Convert prices
|
||||||
|
Loading…
Reference in New Issue
Block a user