Code

chore: release v15#2753

Code

Merged

asmitahase merged 22 commits intoversion-15frappe/hrms:version-15from version-15-hotfixfrappe/hrms:version-15-hotfixCopy head branch name to clipboardFeb 4, 2025

+170-47

Commits

Commits on Feb 2, 2025

• test: fixed failing tests due implicitly set dates while creating salary structure

  Show description for 711b323
  

  asmitahase

  authored and

  mergify[bot]

  committed
  711b323

  Copy full SHA for 711b323

• test: failing assertion value due to missing precision

  Show description for 26cf8bb
  

  asmitahase

  authored and

  mergify[bot]

  committed
  26cf8bb

  Copy full SHA for 26cf8bb

Commits on Feb 3, 2025

• fix: show validation message before changing shift start time

  Show description for 3d07f81
  

  asmitahase

  authored and

  mergify[bot]

  committed
  3d07f81

  Copy full SHA for 3d07f81

• refactor: better validation message

  Show description for 9f16b93
  

  asmitahase

  authored and

  mergify[bot]

  committed
  9f16b93

  Copy full SHA for 9f16b93

• patch: typo in the validation message

  Show description for 967bed8
  

  asmitahase

  authored and

  mergify[bot]

  committed
  967bed8

  Copy full SHA for 967bed8

• Merge pull request #2746 from frappe/mergify/bp/version-15-hotfix/pr-2743

  Show description for 2ed6e34
  asmitahase

  authored
  2ed6e34

  Copy full SHA for 2ed6e34

• Merge branch 'version-15-hotfix' into mergify/bp/version-15-hotfix/pr-2742

  asmitahase

  authored
  37d9032

  Copy full SHA for 37d9032

• Merge pull request #2747 from frappe/mergify/bp/version-15-hotfix/pr-2742

  Show description for 4d2df35
  asmitahase

  authored
  4d2df35

  Copy full SHA for 4d2df35

Commits on Feb 4, 2025

• fix: applying permissions while fetching attendance in calendar view

  Show description for 9dd0910
  

  asmitahase

  authored and

  mergify[bot]

  committed
  9dd0910

  Copy full SHA for 9dd0910

• fix: don't show any records in calendar if not employee

  Show description for 3eae1da
  

  asmitahase

  authored and

  mergify[bot]

  committed
  3eae1da

  Copy full SHA for 3eae1da

• fix: set date filters correctly

  Show description for 85dd728
  

  asmitahase

  authored and

  mergify[bot]

  committed
  85dd728

  Copy full SHA for 85dd728

• Merge pull request #2750 from frappe/mergify/bp/version-15-hotfix/pr-2739

  Show description for d9fc19e
  asmitahase

  authored
  d9fc19e

  Copy full SHA for d9fc19e

• chore: fixed test for leave policy assignment based on employee joining date

  Show description for bb9a5b0
  

  asmitahase

  authored and

  mergify[bot]

  committed
  bb9a5b0

  Copy full SHA for bb9a5b0

• fix: allocate earned leaves pro-rata if policy assignment is submitted after the effective period

  Show description for 6a537df
  

  asmitahase

  authored and

  mergify[bot]

  committed
  6a537df

  Copy full SHA for 6a537df

• chore: added a test for earned allocation with leave period spanning two years

  Show description for e4d2d7d
  

  asmitahase

  authored and

  mergify[bot]

  committed
  e4d2d7d

  Copy full SHA for e4d2d7d

• chore: resolved merge conflicts

  asmitahase

  committed
  e191f00

  Copy full SHA for e191f00

• Merge pull request #2752 from frappe/mergify/bp/version-15-hotfix/pr-2704

  Show description for b92735b
  asmitahase

  authored
  b92735b

  Copy full SHA for b92735b

• fix: include current month full tax in total income tax and current month tax

  Show description for 419f0c9
  

  Sudharsanan11

  authored and

  mergify[bot]

  committed
  419f0c9

  Copy full SHA for 419f0c9

• fix: remove employee other income from CTC

  Show description for 2f0c238
  

  Sudharsanan11

  authored and

  mergify[bot]

  committed
  2f0c238

  Copy full SHA for 2f0c238

• fix: update ctc amount

  Show description for 0316026
  

  Sudharsanan11

  authored and

  mergify[bot]

  committed
  0316026

  Copy full SHA for 0316026

• Merge pull request #2756 from frappe/mergify/bp/version-15-hotfix/pr-2731

  Show description for e25e369
  AyshaHakeem

  authored
  e25e369

  Copy full SHA for e25e369

• Merge pull request #2760 from frappe/mergify/bp/version-15-hotfix/pr-2725

  Show description for 69a8b8c
  AyshaHakeem

  authored
  69a8b8c

  Copy full SHA for 69a8b8c