diff --git a/inventory/signals.py b/inventory/signals.py index 30ee0c29..e34ee8f4 100644 --- a/inventory/signals.py +++ b/inventory/signals.py @@ -1180,7 +1180,7 @@ def bill_model_in_approve_notification(sender, instance, created, **kwargs): ).format( bill_number=instance.bill_number, url=reverse( - "bill-detail", + "bill-update", kwargs={"dealer_slug": dealer.slug, "entity_slug": dealer.entity.slug, "bill_pk": instance.pk}, ), ), diff --git a/templates/bill/includes/card_bill.html b/templates/bill/includes/card_bill.html index 3d829e36..f6c27c08 100644 --- a/templates/bill/includes/card_bill.html +++ b/templates/bill/includes/card_bill.html @@ -225,21 +225,18 @@ {% endif %} - {% endif %} - {% if bill.can_approve and not request.is_manager or not request.is_dealer %} + {% if bill.can_approve and perms.django_ledger.can_approve_billmodel %} + + {% endif %} + {% if bill.can_approve and not request.is_manager %} - {% else %} - {% if bill.can_approve and perms.django_ledger.can_approve_billmodel %} - - {% endif %} {% endif %} - {% if "detail" not in request.path %} {% if bill.can_pay %} {% modal_action_v2 bill bill.get_mark_as_canceled_url bill.get_mark_as_canceled_message bill.get_mark_as_canceled_html_id %} {% endif %} - {% endif %} + {% endif %} {% endif %}