feat: add filter by fiscal year to Expense Claim Summary in PWA #1787
Conversation
| {{ | ||
| formatCurrency( | ||
| summary.data?.total_pending_amount, | ||
| company_currency | ||
| ) | ||
| }} | ||
| formatCurrency( | ||
| summary.data?.total_pending_amount, | ||
| company_currency | ||
| ) | ||
| }} |
There was a problem hiding this comment.
The formatting of the existing code seems messed up
Avoid this. It gets harder to find and review the actual changes made in the PR 😅
Can you revert the unwanted changes first?
hrms/api/__init__.py
Outdated
| @@ -396,6 +396,52 @@ def get_expense_claim_summary(employee: str) -> dict: | |||
| return summary | |||
|
|
|||
|
|
|||
| @frappe.whitelist() | |||
| def get_expense_claim_summary_for_payroll_period(employee: str, start_date: str, end_date: str) -> dict: | |||
There was a problem hiding this comment.
There is already an API above this. Just modify that to accept start and end dates. If dates aren't provided don't apply the filter. Avoid adding a duplicate API for this.
| } | ||
| ) | ||
|
|
||
| const payrollPeriods = createListResource({ |
There was a problem hiding this comment.
IMO, Expense claims should be based on the fiscal year and not the payroll period since its mostly settled using payment entries/journal entries and not via payroll.
| <div | ||
| class="flex flex-col gap-4 bg-white py-3 px-3.5 rounded-lg border-none" | ||
| > | ||
| <Autocomplete label="Payroll Period" class="w-full" placeholder="Select Payroll Period" |
There was a problem hiding this comment.
This autocomplete doesn't look good on a gray background. Move it somewhere inside the card like how the salary slip dashboard does it.
vinyselopal
force-pushed
the
expense-claim-summary-filter
branch
3 times, most recently
from
21459b6
to
760f237
Compare
vinyselopal
changed the title
vinyselopal
force-pushed
the
expense-claim-summary-filter
branch
from
1be07a0
to
5861e83
Compare
vinyselopal
changed the title
vinyselopal
force-pushed
the
expense-claim-summary-filter
branch
from
5861e83
to
07cb687
Compare
vinyselopal
force-pushed
the
expense-claim-summary-filter
branch
from
07cb687
to
a164386
Compare
|
Closing this as there are issues with design and code that would be better dealt with in a separate PR. |
Added filter component to select Payroll Period and fetch Expense Claim Summary of that period.
