Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore: release v15 #2726

Merged
merged 29 commits into from
Jan 31, 2025
Merged

chore: release v15 #2726

merged 29 commits into from
Jan 31, 2025

Conversation

frappe-pr-bot
Copy link
Collaborator

Automated Release.

AyshaHakeem and others added 2 commits January 29, 2025 06:48
@AyshaHakeem @mergify
fix: handle None values in earnings and deductions to avoid TypeError
af27f29 
(cherry picked from commit 8f5581f)
@nabinhait
Merge pull request #2723 from frappe/mergify/bp/version-15-hotfix/pr-…
65bb9de 
…2715

fix: handle None values in earnings and deductions to avoid TypeError (backport #2715)
mergify bot and others added 26 commits January 29, 2025 17:22
@mergify @NagariaHussain
feat: add CI for production docker container build (#2728) (#2729)
3c3a3ad 
(cherry picked from commit 36a8ded)

Co-authored-by: Md Hussain Nagaria <[email protected]>
@AyshaHakeem @mergify
fix: exclude advances scheduled for deduction when adjusting them aga…
59ebfb5 
…inst expense claims

(cherry picked from commit 6786671)
@AyshaHakeem @mergify
fix: exclude claimed and returned advance amounts
58da779 
(cherry picked from commit 3997c5a)
@AyshaHakeem @mergify
fix: claim allocation issue
f774af2 
(cherry picked from commit c0b82e9)

# Conflicts:
#	hrms/hr/doctype/expense_claim_advance/expense_claim_advance.json
@AyshaHakeem @mergify
chore: add test
98f5374 
(cherry picked from commit 5b018c6)
@AyshaHakeem @mergify
chore: add get_allocation_amount function
dfcb3b4 
(cherry picked from commit 3159dbe)
@AyshaHakeem @mergify
chore: return_amount field in advances child table
b0ec9db 
(cherry picked from commit 16196b4)

# Conflicts:
#	hrms/hr/doctype/expense_claim_advance/expense_claim_advance.json
@AyshaHakeem @mergify
fix: fix test
fa0ff96 
(cherry picked from commit 9c4bde1)
@AyshaHakeem @mergify
fix: update field description
ceda0a3 
(cherry picked from commit 542cb89)

# Conflicts:
#	hrms/hr/doctype/employee_advance/employee_advance.json
@AyshaHakeem @mergify
fix: update return_amount field's display property
f93cca2 
(cherry picked from commit c3e4e05)

# Conflicts:
#	hrms/hr/doctype/expense_claim_advance/expense_claim_advance.json
@ruchamahabal
chore: fix conflicts
33af395
@AyshaHakeem
Merge pull request #2730 from frappe/mergify/bp/version-15-hotfix/pr-…
6624b9d 
…2552

fix: Exclude advances scheduled for deduction when creating expense claim (backport #2552)
@asmitahase @mergify
feat: new hr setting to enable/disable self-leave approval
fdd9ee8 
(cherry picked from commit c74d2bb)
@asmitahase @mergify
feat: Enable/disable leave applicants from approving their own leaves…
c8c6d50 
… based on the leave approval HR setting

(cherry picked from commit 4acf169)
@asmitahase @mergify
chore: tests for self leave approval
2274286 
(cherry picked from commit 24056f3)
@asmitahase @mergify
chore: remove print statements
b7f6df2 
(cherry picked from commit 525fcdd)
@asmitahase @mergify
fix: ignore the self-approval setting a workfow is active on Leave Ap…
43e8cca 
…plication

(cherry picked from commit 7653c51)
@asmitahase @mergify
fix: let administrator approve leaves irrespective of self approval s…
856b15d 
…etting

(cherry picked from commit 654d55b)
@asmitahase @mergify
chore: fixed failing tests for self leave approval
383054f 
(cherry picked from commit 0610d4b)
@asmitahase @mergify
chore: fixed linter error "useless get_doc dict"
00f8e1a 
(cherry picked from commit 8374c75)
@asmitahase @mergify
fix: status fields becomes read only if self leave approval is prevented
3646818 
refactor: used onload to check hr settings
refactor: hr setting name changed for readability

(cherry picked from commit 52b5e1f)
@asmitahase @mergify
fix: prevent_self_leave_approval should be false by deafult
f3ac588 
(cherry picked from commit e49c5a7)
@asmitahase @mergify
chore: fixed linter error frappe-missing-translation-button-text
22b5954 
(cherry picked from commit 079054c)
@asmitahase @mergify
fix: removed action buttons
4c77806 
(cherry picked from commit bb15010)
@asmitahase
Merge pull request #2735 from frappe/mergify/bp/version-15-hotfix/pr-…
757bc20 
…2486

feat: toggle self leave approval for employees from HR settings (backport #2486)
@asmitahase @mergify
chore: upgrading upload and download artifact verions to v4 from v3
d3f287b 
(cherry picked from commit e71c223)
@asmitahase
Merge pull request #2738 from frappe/mergify/bp/version-15-hotfix/pr-…
e363886 
…2736

chore: Upgrade artifact actions from v3 to v4 (backport #2736)
@asmitahase asmitahase merged commit 1fd9942 into version-15 Jan 31, 2025
7 checks passed
@frappe-pr-bot
Copy link
Collaborator Author

🎉 This PR is included in version 15.39.0 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ruchamahabal ruchamahabal Awaiting requested review from ruchamahabal ruchamahabal is a code owner

Assignees
No one assigned
Labels
needs-tests released
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@frappe-pr-bot @asmitahase @AyshaHakeem @nabinhait @ruchamahabal