|
@@ -1,7 +1,6 @@
|
|
|
from django.contrib.auth.decorators import login_required
|
|
|
from django.core.urlresolvers import reverse
|
|
|
from django.shortcuts import render, get_object_or_404
|
|
|
-from django.db.models import Sum
|
|
|
|
|
|
from .models import Document, Service, ServiceUse, CostUse, GoodUse
|
|
|
|
|
@@ -36,9 +35,8 @@ def detail_document(request, pk):
|
|
|
request, 'costs/document_detail.html', {
|
|
|
'document': doc,
|
|
|
'breadcrumbs': breadcrumbs,
|
|
|
- 'total_recuring_costs': doc.cost_set.aggregate(
|
|
|
- sum=Sum('price'))['sum'],
|
|
|
- 'total_goods': doc.good_set.aggregate(sum=Sum('price'))['sum'],
|
|
|
+ 'total_recuring_costs': doc.get_total_recuring_costs(),
|
|
|
+ 'total_goods': doc.get_total_goods()
|
|
|
})
|
|
|
|
|
|
|