fix(SalarySlip): use correct end_date variable for calculation#2617

Closed

NethminaHiker360 wants to merge 952 commits intofrappe:developfrom NethminaHiker360:fix-2612-salary-slip

+123,793-9,043

This pull request is big! We're only showing the most recent 250 commits

Commits on Feb 19, 2024

fix(Leave Application): Corrected rendering of Leave Application email template when HTML format is used (backport frappe#1435 ) (frappe#1442 )

mergify[bot]
and
zaheer-srushty
authored

Commits on Feb 21, 2024

fix(Monthly Attendance Sheet): parsing error for data values (backport frappe#1446 ) (frappe#1451 )

mergify[bot]
and
krantheman
authored
fix: leave application status vs max consecutive days calculation (backport frappe#1447 ) (frappe#1453 )

mergify[bot]
and
git-avc
authored

Commits on Feb 26, 2024

Commits on Feb 28, 2024

fix(Payroll Entry): consideration of Salary Slip Based on Timesheet as a filter query when it is disabled (backport frappe#1474 ) (frappe#1481 )

mergify[bot]
and
krantheman
authored

Commits on Mar 2, 2024

refactor: update exchange rate of reference document supplied by reconciliation tool (backport frappe#1489 ) (frappe#1490 )

mergify[bot]
and
ruthra-kumar
authored

Commits on Mar 5, 2024

fix: company fixture setup error handling & flags (backport frappe#1504 ) (frappe#1505 )

mergify[bot]
and
ruchamahabal
authored

Commits on Mar 11, 2024

refactor: replace in_list(array, member) with array.includes(member) (backport frappe#1513 ) (frappe#1514 )

mergify[bot]
and
barredterra
authored

Commits on Mar 12, 2024

Commits on Mar 14, 2024

fix(Leave Application): calendar view

barredterra
authored and
mergify[bot]
committed
fix: show blocked dates as "allDay"

barredterra
authored and
mergify[bot]
committed
fix: remove unused whitelisting from get_applicable_block_dates

barredterra
authored and
mergify[bot]
committed
fix: get blocked days in the correct order

barredterra
authored and
mergify[bot]
committed
fix: convert datetime to date

barredterra
authored and
mergify[bot]
committed
refactor: use 1 instead of True

barredterra
authored and
mergify[bot]
committed
fix: set employee before company

barredterra
authored and
mergify[bot]
committed
fix: half day

barredterra
authored and
mergify[bot]
committed
refactor: use get_list instead of sql and simplify date range condition

krantheman
authored and
mergify[bot]
committed
fix: remove employee_name and leave_type before checking in events

krantheman
authored and
mergify[bot]
committed
fix: use get_single_value instead of get_value

krantheman
authored and
mergify[bot]
committed
chore: add comment

krantheman
authored and
mergify[bot]
committed
Merge pull request frappe#1539 from frappe/mergify/bp/version-14-hotfix/pr-1424
krantheman
authored

Commits on Mar 15, 2024

feat(Gratuity): allow setting work experience manually (frappe#1541 ) (frappe#1542 )

mergify[bot]
and
ruchamahabal
authored

Commits on Mar 19, 2024

Commits on Apr 3, 2024

fix: employee filter in list view of employee checkin (backport frappe#1612 ) (frappe#1615 )

authored

Commits on Apr 5, 2024

Commits on Apr 12, 2024

refactor: update Pending Amount on validation

krantheman
authored and
mergify[bot]
committed
feat: add field descriptions

krantheman
authored and
mergify[bot]
committed
perf: better querying

krantheman
authored and
mergify[bot]
committed
fix: fetch only unpaid advances

krantheman
authored and
mergify[bot]
committed
test: add test_pending_amount

krantheman
authored and
mergify[bot]
committed
chore: fix casing in doctype descriptions

ruchamahabal
authored and
mergify[bot]
committed
fix: merge conflicts
krantheman
committed

Commits on Apr 13, 2024

Merge pull request frappe#1655 from frappe/mergify/bp/version-14-hotfix/pr-1478
krantheman
authored

Commits on Apr 19, 2024

Commits on Apr 29, 2024

fix(Employee Advance): selection of currency

krantheman
authored and
mergify[bot]
committed
fix: merge conflicts
krantheman
committed

Commits on Apr 30, 2024

Merge pull request frappe#1722 from frappe/mergify/bp/version-14-hotfix/pr-1721
krantheman
authored

Commits on May 1, 2024

fix(Employee Attendance Tool): 'On Leave' status showing as undefined in marked attendance summary (backport frappe#1712 ) (frappe#1732 )

mergify[bot]
and
creative-paramu
authored
fix(Leave Application): half day date picker rendering (backport frappe#1643 ) (frappe#1730 )

authored
fix: autofill skills on entering designation in Interview Round (backport frappe#1706 ) (frappe#1734 )

authored
feat(Attendance Request): add 'Include Holidays' checkbox (backport frappe#1040 ) (frappe#1727 )

authored
ci: use prettier for js formatting and ruff for py formatting/linting

krantheman
authored and
ruchamahabal
committed
chore: format all JS, CSS, and SCSS files

krantheman
authored and
ruchamahabal
committed
chore: format all Python files

krantheman
authored and
ruchamahabal
committed
chore: ignore formatting commits

krantheman
authored and
ruchamahabal
committed
fix: ruff linting issues

krantheman
authored and
ruchamahabal
committed
fix: ruff linting issues

krantheman
authored and
ruchamahabal
committed
ci: ignore salary_structure file

krantheman
authored and
ruchamahabal
committed
fix: more ruff linting issues

krantheman
authored and
ruchamahabal
committed
fix: semgrep errors

krantheman
authored and
ruchamahabal
committed
chore: ignore sql and cur_frm semgrep rules for now

krantheman
authored and
ruchamahabal
committed
chore: remove unncessary fetch from statements & scripts
ruchamahabal
committed
refactor(Expense Claim): get rid of cur_frm usage
ruchamahabal
committed
chore: handle semgrep errors
ruchamahabal
committed
Merge pull request frappe#1708 from krantheman/update-formatting-v14
ruchamahabal
authored
chore: don't pin frappe dependencies for v14
ruchamahabal
authored

Commits on May 2, 2024

fix: set intro message for leave application (backport frappe#1696 ) (frappe#1741 )

mergify[bot]
and
Nihantra-Patel
authored

Commits on May 7, 2024

chore: grant Employee role read permission for Payroll Period (backport frappe#1746 ) (frappe#1747 )

mergify[bot]
and
ruchamahabal
authored
refactor: remove 'Create Employee' step

krantheman
authored and
mergify[bot]
committed
feat: Preview Salary Slip from Salary Structure Assignment

krantheman
authored and
mergify[bot]
committed
refactor: combine Create & Assign Salary Structure step

krantheman
authored and
mergify[bot]
committed
feat(Create Payroll Period): set Start & End Date as that of Fiscal Year if no Payroll Period exists

krantheman
authored and
mergify[bot]
committed
chore: fix linter

ruchamahabal
authored and
mergify[bot]
committed
fix: set payroll period dates based on last payroll period/current fiscal year

ruchamahabal
authored and
mergify[bot]
committed
fix: open full forms instead of quick entries in onboarding, update button labels

ruchamahabal
authored and
mergify[bot]
committed
fix(Auto Attendance): incorrect previous shift computation for a timestamp leading to incorrect absent marking

ruchamahabal
authored and
mergify[bot]
committed
test: prev & curr shift edge cases

ruchamahabal
authored and
mergify[bot]
committed
Merge pull request frappe#1755 from frappe/mergify/bp/version-14-hotfix/pr-1703
ruchamahabal
authored

Commits on May 10, 2024

Commits on May 16, 2024

fix: validation of overlapping shift dates

krantheman
authored and
mergify[bot]
committed
test: test definite shifts before an indefinite one

krantheman
authored and
mergify[bot]
committed
test: remove redundant code

krantheman
authored and
mergify[bot]
committed
fix: simplify shift request overlapping validation

ruchamahabal
authored and
mergify[bot]
committed
Merge pull request frappe#1781 from frappe/mergify/bp/version-14-hotfix/pr-1765
ruchamahabal
authored
chore: remove mergify from release notes (backport frappe#1783 ) (frappe#1785 )

mergify[bot]
and
ruchamahabal
authored

Commits on May 17, 2024

Commits on May 22, 2024

fix(Interview Feedback): type cast user input for "rating" field to float (backport frappe#1799 ) (frappe#1800 )

mergify[bot]
and
vinyselopal
authored

Commits on May 23, 2024

Commits on May 24, 2024

fix: consider payment days = total working days in the last salary slip while calculating Gratuity

ruchamahabal
authored and
mergify[bot]
committed
refactor: move gratuity calculation functions to the class

ruchamahabal
authored and
mergify[bot]
committed
refactor: remove unnecessary functions, improve readability

ruchamahabal
authored and
mergify[bot]
committed
fix: only fetch required fields from gratuity slabs

ruchamahabal
authored and
mergify[bot]
committed
test: gratuity amount is consistent irrespective of the payment days

ruchamahabal
authored and
mergify[bot]
committed
Merge pull request frappe#1809 from frappe/mergify/bp/version-14-hotfix/pr-1806
ruchamahabal
authored

Commits on May 29, 2024

fix(Travel Request): get currency from Employee Master's Company (backport frappe#1807 ) (frappe#1818 )

authored

Commits on Jun 6, 2024

Commits on Jun 12, 2024

Commits on Jun 14, 2024

fix: add party and party type in PE (backport frappe#1894 ) (frappe#1897 )

mergify[bot]
and
Nihantra-Patel
authored

Commits on Jun 19, 2024

fix(Income Tax Computation): computation of total tax exemption (backport frappe#1902 ) (frappe#1906 )

mergify[bot]
and
krantheman
authored

Commits on Jun 25, 2024

fix(UX): validate missing Income Tax Slab in Salary Structure Assignment (backport frappe#1912 ) (frappe#1914 )

mergify[bot]
and
ruchamahabal
authored

Commits on Jun 26, 2024

fix: HR Settings permissions (frappe#1924 )

krantheman
authored and
mergify[bot]
committed

Commits on Jun 27, 2024

Commits on Jul 17, 2024

Commits on Jul 21, 2024

fix: Use frm instead of this (backport frappe#1990 ) (frappe#1994 )

mergify[bot]
and
marination
authored

Commits on Jul 27, 2024

fix: Sort lists before calling itertools.groupby (backport frappe#1997 ) (frappe#2008 )

mergify[bot]
and
cogk
authored

Commits on Aug 5, 2024

Commits on Aug 6, 2024

Commits on Aug 11, 2024

Commits on Aug 14, 2024

Commits on Aug 15, 2024

Commits on Aug 21, 2024

Commits on Aug 24, 2024

chore: fix typo in form tour (backport frappe#2114 ) (frappe#2115 )

mergify[bot]
and
ruchamahabal
authored

Commits on Aug 28, 2024

fix: translatability of work anniversary reminders (backport frappe#2092 ) (frappe#2124 )

mergify[bot]
and
barredterra
authored

Commits on Sep 17, 2024

fix: show shift for month full of leaves

krantheman
authored and
mergify[bot]
committed
test: update test to check for shift of employees on leave

krantheman
authored and
mergify[bot]
committed
Merge pull request frappe#2201 from frappe/mergify/bp/version-14-hotfix/pr-2198
krantheman
authored

Commits on Sep 18, 2024

Commits on Sep 25, 2024

feat(Earned Leave): allocate leaves manually

krantheman
authored and
mergify[bot]
committed
refactor: move get_monthly_earned_leave to server side

krantheman
authored and
mergify[bot]
committed
feat: add error message for annual allocation exceeded

krantheman
authored and
mergify[bot]
committed
test: allocate leaves manually

krantheman
authored and
mergify[bot]
committed
refactor: group buttons under Actions tab

krantheman
authored and
mergify[bot]
committed

Commits on Sep 26, 2024

Merge pull request frappe#2232 from frappe/mergify/bp/version-14-hotfix/pr-1950
krantheman
authored

Commits on Sep 30, 2024

Commits on Oct 1, 2024

Commits on Oct 8, 2024

Commits on Oct 9, 2024

chore: update site urls from frappehr.com to frappe.io/hr

krantheman
authored and
mergify[bot]
committed

Commits on Oct 10, 2024

Commits on Oct 14, 2024

Commits on Oct 16, 2024

Commits on Oct 17, 2024

Commits on Oct 18, 2024

test: add test Employees Working on a Holiday report

krantheman
authored and
mergify[bot]
committed

Commits on Oct 23, 2024

Commits on Oct 24, 2024

fix(appraisal_cycle): Value missing for Appraisal: Company while creating Appraisal from Appraisal Cycle (backport frappe#2336 ) (frappe#2337 )

authored

Commits on Oct 30, 2024

Commits on Oct 31, 2024

feat: add Payroll Entry to Bank Account dashboard (backport frappe#2369 ) (frappe#2371 )

mergify[bot]
and
barredterra
authored

Commits on Nov 11, 2024

fix: backport german translations from develop (frappe#2406 )
barredterra
authored

Commits on Nov 22, 2024

fix: ignore linked ledger entry record on employee advance cancellation (backport frappe#2432 ) (frappe#2434 )

authored

Commits on Nov 25, 2024

fix: filters on vehicle expenses report (backport frappe#2440 ) (frappe#2446 )

mergify[bot]
and
asmitahase
authored

Commits on Nov 26, 2024

fix(Salary Structure Assignment): validate cost center company on server-side (backport frappe#2445 ) (frappe#2449 )
mergify[bot]
authored

Commits on Dec 4, 2024

fix: prompt user to select company for shift & attendance report creation (backport frappe#2461 ) (frappe#2474 )

authored

Commits on Dec 9, 2024

fix: Apply system precision value while validating leave balance (backport frappe#2482 ) (frappe#2490 )

mergify[bot]
and
AyshaHakeem
authored

Commits on Dec 16, 2024

fix: set correct work experience for gratuity

AyshaHakeem
authored and
mergify[bot]
committed
fix: set field level precision for work experience field in gratuity

AyshaHakeem
authored and
mergify[bot]
committed
chore: remove unused import

ruchamahabal
authored and
mergify[bot]
committed

Commits on Dec 17, 2024

Commits on Dec 18, 2024

Commits on Dec 20, 2024

Commits on Jan 2, 2025

fix(CTC): amount_exempted_from_income_tax only considers last deduction item (exempted from IT), not all (backport frappe#2568 ) (frappe#2569 )

mergify[bot]
and
ruchamahabal
authored

Commits on Jan 10, 2025

fix(SalarySlip): use correct variable
NethminaHiker360
committed