Merge branch 'staging' into datetime-to-pendulum

This commit is contained in:
graham-dds
2020-02-17 14:12:08 -05:00
committed by GitHub
4 changed files with 7 additions and 31 deletions

View File

@@ -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: