Merge remote-tracking branch 'origin/main' into ms/3212-FEB-questions

This commit is contained in:
matthewswspence 2025-03-18 15:00:08 -05:00
commit ae03ec2314
No known key found for this signature in database
GPG key ID: FB458202A7852BA4
37 changed files with 2115 additions and 484 deletions

View file

@ -1528,7 +1528,9 @@ class DomainRequest(TimeStampedModel):
def converted_federal_type(self):
if self.portfolio:
return self.portfolio.federal_type
return self.federal_type
elif self.federal_agency:
return self.federal_agency.federal_type
return None
@property
def converted_address_line1(self):