src/servala/core/admin.py

@@ -73,6 +73,16 @@ class OrganizationAdmin(admin.ModelAdmin):
 
         return readonly_fields
 
+    def get_form(self, request, obj=None, **kwargs):
+        form = super().get_form(request, obj, **kwargs)
+
+        if obj and obj.has_inherited_billing_entity:
+            form.base_fields["billing_entity"].help_text = _(
+                "This billing entity is inherited from the organization's origin and cannot be modified."
+            )
+
+        return form
+
 
 @admin.register(BillingEntity)
 class BillingEntityAdmin(admin.ModelAdmin):

src/servala/core/models/organization.py

@@ -485,7 +485,7 @@ class OrganizationInvitation(ServalaModelMixin, models.Model):
     def is_accepted(self):
         # We check both accepted_by and accepted_at to avoid a deleted user
         # freeing up an invitation
-        return bool(self.accepted_by or self.accepted_at)
+        return self.accepted_by or self.accepted_at
 
     @property
     def can_be_accepted(self):