diff --git a/atst/models/task_order.py b/atst/models/task_order.py index 0b3c27ba..d2a63964 100644 --- a/atst/models/task_order.py +++ b/atst/models/task_order.py @@ -1,5 +1,4 @@ from enum import Enum -from decimal import Decimal from sqlalchemy import Column, DateTime, ForeignKey, String from sqlalchemy.ext.hybrid import hybrid_property @@ -141,14 +140,6 @@ class TaskOrder(Base, mixins.TimestampsMixin): def total_contract_amount(self): return sum((clin.total_amount for clin in self.clins if clin.total_amount)) - @property - def invoiced_funds(self): - # TODO: implement this using reporting data from the CSP - if self.is_active: - return self.total_obligated_funds * Decimal(0.75) - else: - return 0 - @property def display_status(self): if self.status == Status.UNSIGNED: diff --git a/templates/task_orders/fragments/task_order_view.html b/templates/task_orders/fragments/task_order_view.html index 796bbfa6..c78434ee 100644 --- a/templates/task_orders/fragments/task_order_view.html +++ b/templates/task_orders/fragments/task_order_view.html @@ -8,8 +8,8 @@ {% set expended_funds = task_order.invoiced_funds %}
- {{ expended_funds | dollars }} -
-{{ task_order.total_contract_amount | dollars }}
{{ task_order.total_obligated_funds | dollars }}
{{ task_order.invoiced_funds | dollars }}
-