Commit 42d718ae authored by Gabriel Detraz's avatar Gabriel Detraz Committed by root

Fix display facture + room + machine_name

parent 510d7ab3
......@@ -194,14 +194,16 @@ class Facture(BaseInvoice):
return True, None
def can_view(self, user_request, *_args, **_kwargs):
if not user_request.has_perm('cotisations.view_facture') and \
self.user != user_request:
if not user_request.has_perm('cotisations.view_facture'):
if self.user != user_request:
return False, _("You don't have the right to view someone else's "
"invoices history.")
elif not self.valid:
return False, _("The invoice has been invalidated.")
return True, None
return True, None
def can_change_control(user_request, *_args, **_kwargs):
......@@ -197,7 +197,11 @@ class Machine(RevMixin, FieldPermissionModelMixin, models.Model):
def short_name(self):
"""Par defaut, renvoie le nom de la première interface
de cette machine"""
return str(self.interface_set.first()
interfaces_set = self.interface_set.first()
if interfaces_set:
return str(
return "None"
def complete_name(self):
......@@ -845,8 +845,7 @@ class User(RevMixin, FieldPermissionModelMixin, AbstractBaseUser,
return user_request == self, None
def can_change_room(user_request, *_args, **_kwargs):
def can_change_room(self, user_request, *_args, **_kwargs):
""" Check if a user can change a room
:param user_request: The user who request
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment