Code

chore: release v15#2726

Code

Merged

asmitahase merged 29 commits intoversion-15frappe/hrms:version-15from version-15-hotfixfrappe/hrms:version-15-hotfixCopy head branch name to clipboardJan 31, 2025

+334-25

Commits

Commits on Jan 29, 2025

• fix: handle None values in earnings and deductions to avoid TypeError

  Show description for af27f29
  

  AyshaHakeem

  authored and

  mergify[bot]

  committed
  af27f29

  Copy full SHA for af27f29

• Merge pull request #2723 from frappe/mergify/bp/version-15-hotfix/pr-2715

  Show description for 65bb9de
  nabinhait

  authored
  65bb9de

  Copy full SHA for 65bb9de

• feat: add CI for production docker container build (#2728) (#2729)

  Show description for 3c3a3ad
  

  mergify[bot]

  and

  NagariaHussain

  authored
  3c3a3ad

  Copy full SHA for 3c3a3ad

• fix: exclude advances scheduled for deduction when adjusting them against expense claims

  Show description for 59ebfb5
  

  AyshaHakeem

  authored and

  mergify[bot]

  committed
  59ebfb5

  Copy full SHA for 59ebfb5

• fix: exclude claimed and returned advance amounts

  Show description for 58da779
  

  AyshaHakeem

  authored and

  mergify[bot]

  committed
  58da779

  Copy full SHA for 58da779

• fix: claim allocation issue

  Show description for f774af2
  

  AyshaHakeem

  authored and

  mergify[bot]

  committed
  f774af2

  Copy full SHA for f774af2

• chore: add test

  Show description for 98f5374
  

  AyshaHakeem

  authored and

  mergify[bot]

  committed
  98f5374

  Copy full SHA for 98f5374

• chore: add get_allocation_amount function

  Show description for dfcb3b4
  

  AyshaHakeem

  authored and

  mergify[bot]

  committed
  dfcb3b4

  Copy full SHA for dfcb3b4

• chore: return_amount field in advances child table

  Show description for b0ec9db
  

  AyshaHakeem

  authored and

  mergify[bot]

  committed
  b0ec9db

  Copy full SHA for b0ec9db

• fix: fix test

  Show description for fa0ff96
  

  AyshaHakeem

  authored and

  mergify[bot]

  committed
  fa0ff96

  Copy full SHA for fa0ff96

• fix: update field description

  Show description for ceda0a3
  

  AyshaHakeem

  authored and

  mergify[bot]

  committed
  ceda0a3

  Copy full SHA for ceda0a3

• fix: update return_amount field's display property

  Show description for f93cca2
  

  AyshaHakeem

  authored and

  mergify[bot]

  committed
  f93cca2

  Copy full SHA for f93cca2

Commits on Jan 30, 2025

• chore: fix conflicts

  ruchamahabal

  authored
  33af395

  Copy full SHA for 33af395

• Merge pull request #2730 from frappe/mergify/bp/version-15-hotfix/pr-2552

  Show description for 6624b9d
  AyshaHakeem

  authored
  6624b9d

  Copy full SHA for 6624b9d

• feat: new hr setting to enable/disable self-leave approval

  Show description for fdd9ee8
  

  asmitahase

  authored and

  mergify[bot]

  committed
  fdd9ee8

  Copy full SHA for fdd9ee8

• feat: Enable/disable leave applicants from approving their own leaves based on the leave approval HR setting

  Show description for c8c6d50
  

  asmitahase

  authored and

  mergify[bot]

  committed
  c8c6d50

  Copy full SHA for c8c6d50

• chore: tests for self leave approval

  Show description for 2274286
  

  asmitahase

  authored and

  mergify[bot]

  committed
  2274286

  Copy full SHA for 2274286

• chore: remove print statements

  Show description for b7f6df2
  

  asmitahase

  authored and

  mergify[bot]

  committed
  b7f6df2

  Copy full SHA for b7f6df2

• fix: ignore the self-approval setting a workfow is active on Leave Application

  Show description for 43e8cca
  

  asmitahase

  authored and

  mergify[bot]

  committed
  43e8cca

  Copy full SHA for 43e8cca

• fix: let administrator approve leaves irrespective of self approval setting

  Show description for 856b15d
  

  asmitahase

  authored and

  mergify[bot]

  committed
  856b15d

  Copy full SHA for 856b15d

• chore: fixed failing tests for self leave approval

  Show description for 383054f
  

  asmitahase

  authored and

  mergify[bot]

  committed
  383054f

  Copy full SHA for 383054f

• chore: fixed linter error "useless get_doc dict"

  Show description for 00f8e1a
  

  asmitahase

  authored and

  mergify[bot]

  committed
  00f8e1a

  Copy full SHA for 00f8e1a

• fix: status fields becomes read only if self leave approval is prevented

  Show description for 3646818
  

  asmitahase

  authored and

  mergify[bot]

  committed
  3646818

  Copy full SHA for 3646818

• fix: prevent_self_leave_approval should be false by deafult

  Show description for f3ac588
  

  asmitahase

  authored and

  mergify[bot]

  committed
  f3ac588

  Copy full SHA for f3ac588

• chore: fixed linter error frappe-missing-translation-button-text

  Show description for 22b5954
  

  asmitahase

  authored and

  mergify[bot]

  committed
  22b5954

  Copy full SHA for 22b5954

• fix: removed action buttons

  Show description for 4c77806
  

  asmitahase

  authored and

  mergify[bot]

  committed
  4c77806

  Copy full SHA for 4c77806

• Merge pull request #2735 from frappe/mergify/bp/version-15-hotfix/pr-2486

  Show description for 757bc20
  asmitahase

  authored
  757bc20

  Copy full SHA for 757bc20

• chore: upgrading upload and download artifact verions to v4 from v3

  Show description for d3f287b
  

  asmitahase

  authored and

  mergify[bot]

  committed
  d3f287b

  Copy full SHA for d3f287b

• Merge pull request #2738 from frappe/mergify/bp/version-15-hotfix/pr-2736

  Show description for e363886
  asmitahase

  authored
  e363886

  Copy full SHA for e363886