Compare commits
2 commits
8ba9787d4b
...
54998ab9d0
| Author | SHA1 | Date | |
|---|---|---|---|
| 54998ab9d0 | |||
| 014e88aa24 |
2 changed files with 1 additions and 11 deletions
|
|
@ -73,16 +73,6 @@ 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):
|
||||
|
|
|
|||
|
|
@ -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 self.accepted_by or self.accepted_at
|
||||
return bool(self.accepted_by or self.accepted_at)
|
||||
|
||||
@property
|
||||
def can_be_accepted(self):
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue