From 4204598181c4fd033439a05944ade22744444969 Mon Sep 17 00:00:00 2001
From: Shrikrishna Singh <krishnasingh.ss30@gmail.com>
Date: Wed, 9 Feb 2022 09:26:32 +0530
Subject: [PATCH] Fix invoice list on finance 1 dashboard
---
hypha/apply/dashboard/views.py | 2 +-
hypha/apply/projects/models/payment.py | 3 +++
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/hypha/apply/dashboard/views.py b/hypha/apply/dashboard/views.py
index 26a81ef34..ac7a22f69 100644
--- a/hypha/apply/dashboard/views.py
+++ b/hypha/apply/dashboard/views.py
@@ -164,7 +164,7 @@ class FinanceDashboardView(MyFlaggedMixin, TemplateView):
if self.request.user.is_finance_level_2:
invoices = Invoice.objects.approved_by_finance_1()
else:
- invoices = Invoice.objects.approved_by_staff()
+ invoices = Invoice.objects.for_finance_1()
return {
'count': invoices.count(),
diff --git a/hypha/apply/projects/models/payment.py b/hypha/apply/projects/models/payment.py
index d873b1890..94ac5b67b 100644
--- a/hypha/apply/projects/models/payment.py
+++ b/hypha/apply/projects/models/payment.py
@@ -77,6 +77,9 @@ class InvoiceQueryset(models.QuerySet):
def approved_by_finance_1(self):
return self.filter(status=APPROVED_BY_FINANCE_1)
+ def for_finance_1(self):
+ return self.filter(status__in=[APPROVED_BY_STAFF, CHANGES_REQUESTED_BY_FINANCE_2])
+
def rejected(self):
return self.filter(status=DECLINED)
--
GitLab