inventree/InvenTree
2
0
Fork 0
mirror of https://github.com/inventree/InvenTree.git synced 2025-06-17 20:45:44 +00:00
Code Activity

Fix for SalesOrderLineItem allocation calculation

Browse Source 
Also function to render a progress bar
This commit is contained in:
Oliver Walters
2020-04-21 16:45:44 +10:00
parent a1376eeb9e
commit 89ede3e103
5 changed files with 48 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
InvenTree/order/models.py
View File

@ -19,9 +19,7 @@ import os
from datetime import datetime
from decimal import Decimal
from stock.models import StockItem
from company.models import Company, SupplierPart
from part.models import Part
from InvenTree.fields import RoundingDecimalField
from InvenTree.helpers import decimal2string
@ -372,7 +370,7 @@ class SalesOrderLineItem(OrderLineItem):
order = models.ForeignKey(SalesOrder, on_delete=models.CASCADE, related_name='lines', help_text=_('Sales Order'))
part = models.ForeignKey(Part, on_delete=models.SET_NULL, related_name='sales_order_line_items', null=True, help_text=_('Part'), limit_choices_to={'salable': True})
part = models.ForeignKey('part.Part', on_delete=models.SET_NULL, related_name='sales_order_line_items', null=True, help_text=_('Part'), limit_choices_to={'salable': True})
def allocated_quantity(self):
""" Return the total stock quantity allocated to this LineItem.
@ -380,6 +378,6 @@ class SalesOrderLineItem(OrderLineItem):
This is a summation of the quantity of each attached StockItem
"""
query = self.stock_items.aggregate(allocated=Coalesce(Sum('stock_item__quantity'), Decimal(0)))
query = self.stock_items.aggregate(allocated=Coalesce(Sum('quantity'), Decimal(0)))
return query['allocated']

7
InvenTree/order/templates/order/sales_order_detail.html
View File

@ -72,12 +72,7 @@ $("#so-lines-table").inventreeTable({
field: 'quantity',
title: 'Quantity',
formatter: function(value, row, index, field) {
return `
<div class='progress-bar'>
<div class='progress-bar progress-bar-inner' style='width: 50%;'></div>
<div class='progress-bar-value'>${row.allocated} / ${row.quantity}</div>
</div>
`;
return makeProgressBar(row.allocated, row.quantity);
}
},
{