Skip to content

Commit 4a0de84

Browse files
authored
Merge pull request #3416 from iamkhanraheel/fix/show_rejected_claim_summary
2 parents 2f40402 + 537ff49 commit 4a0de84

File tree

2 files changed

+9
-2
lines changed

2 files changed

+9
-2
lines changed

frontend/src/components/ExpenseClaimSummary.vue

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,8 @@
5757
<span class="text-gray-800 text-base font-semibold leading-6">
5858
{{
5959
formatCurrency(
60-
summary.data?.total_rejected_amount,
60+
summary.data?.total_rejected_amount +
61+
(summary.data?.total_claimed_in_approved - summary.data?.total_approved_amount),
6162
company_currency
6263
)
6364
}}
@@ -79,7 +80,7 @@ import { formatCurrency } from "@/utils/formatters"
7980
const total_claimed_amount = computed(() => {
8081
return (
8182
summary.data?.total_pending_amount +
82-
summary.data?.total_approved_amount +
83+
summary.data?.total_claimed_in_approved +
8384
summary.data?.total_rejected_amount
8485
)
8586
})

hrms/api/__init__.py

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -543,6 +543,11 @@ def get_expense_claim_summary(employee: str) -> dict:
543543
)
544544
sum_approved_claims = Sum(approved_claims_case).as_("total_approved_amount")
545545

546+
approved_total_claimed_case = (
547+
frappe.qb.terms.Case().when(Claim.approval_status == "Approved", Claim.total_claimed_amount).else_(0)
548+
)
549+
sum_approved_total_claimed = Sum(approved_total_claimed_case).as_("total_claimed_in_approved")
550+
546551
rejected_claims_case = (
547552
frappe.qb.terms.Case().when(Claim.approval_status == "Rejected", Claim.total_claimed_amount).else_(0)
548553
)
@@ -554,6 +559,7 @@ def get_expense_claim_summary(employee: str) -> dict:
554559
sum_pending_claims,
555560
sum_approved_claims,
556561
sum_rejected_claims,
562+
sum_approved_total_claimed,
557563
Claim.company,
558564
)
559565
.where((Claim.docstatus != 2) & (Claim.employee == employee))

0 commit comments

Comments
 (0)