From 9489589e4560ff3063c9a992351322599bcb7004 Mon Sep 17 00:00:00 2001 From: Charles-Henri Decultot Date: Sat, 16 Dec 2023 13:54:18 +0100 Subject: [PATCH] fix: Handle permission error on portal --- .../doctype/subscription/subscription.py | 41 ++++++++++--------- .../templates/subscription_list.html | 2 +- 2 files changed, 23 insertions(+), 20 deletions(-) diff --git a/erpnext/accounts/doctype/subscription/subscription.py b/erpnext/accounts/doctype/subscription/subscription.py index 6dfb5ae9e30..02abd1b3491 100644 --- a/erpnext/accounts/doctype/subscription/subscription.py +++ b/erpnext/accounts/doctype/subscription/subscription.py @@ -495,25 +495,28 @@ def get_subscriptions_list( filters.extend([("customer", "in", customers)]) - return get_list( - doctype, - txt, - filters=filters, - fields=[ - "name", - "status", - "start", - "cancellation_date", - "current_invoice_start", - "current_invoice_end", - "recurrence_period", - "grand_total", - ], - limit_start=limit_start, - limit_page_length=limit_page_length, - ignore_permissions=ignore_permissions, - order_by="modified desc", - ) + try: + return get_list( + doctype, + txt, + filters=filters, + fields=[ + "name", + "status", + "start", + "cancellation_date", + "current_invoice_start", + "current_invoice_end", + "recurrence_period", + "grand_total", + ], + limit_start=limit_start, + limit_page_length=limit_page_length, + ignore_permissions=ignore_permissions, + order_by="modified desc", + ) + except frappe.PermissionError: + return [] def make_subscription_from_sales_order_item(doc, method): diff --git a/erpnext/accounts/doctype/subscription/templates/subscription_list.html b/erpnext/accounts/doctype/subscription/templates/subscription_list.html index 09367f0c6eb..004cf3fe58b 100644 --- a/erpnext/accounts/doctype/subscription/templates/subscription_list.html +++ b/erpnext/accounts/doctype/subscription/templates/subscription_list.html @@ -2,7 +2,7 @@

{{ sub_title }}

{% endif %} {% if not result -%} -
+
{{ no_result_message or _("Nothing to show") }}
-- GitLab