Mirrored_Repos/InvenTree
1
0
Fork 0
mirror of https://github.com/inventree/InvenTree synced 2024-08-30 18:33:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Handle case when aggregation returns None

Browse Source
This commit is contained in:
Oliver 2022-01-27 10:49:30 +11:00
parent d25397e95c
commit 9153b62ea0
1 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
InvenTree/stock/models.py
View File

@ -788,7 +788,12 @@ class StockItem(MPTTModel):
query = self.allocations.aggregate(q=Coalesce(Sum('quantity'), Decimal(0))) query = self.allocations.aggregate(q=Coalesce(Sum('quantity'), Decimal(0)))
return query['q'] total = query['q']
if total is None:
total = Decimal(0)
return total
def sales_order_allocation_count(self): def sales_order_allocation_count(self):
""" """
@ -797,14 +802,22 @@ class StockItem(MPTTModel):
query = self.sales_order_allocations.aggregate(q=Coalesce(Sum('quantity'), Decimal(0))) query = self.sales_order_allocations.aggregate(q=Coalesce(Sum('quantity'), Decimal(0)))
return query['q'] total = query['q']
if total is None:
total = Decimal(0)
return total
def allocation_count(self): def allocation_count(self):
""" """
Return the total quantity allocated to builds or orders Return the total quantity allocated to builds or orders
""" """
return self.build_allocation_count() + self.sales_order_allocation_count() bo = self.build_allocation_count()
so = self.sales_order_allocation_count()
return bo + so
def unallocated_quantity(self): def unallocated_quantity(self):
""" """