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.

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

fix: timesheet based salary slip (backport #2686) #2696

Merged
merged 3 commits into from
Jan 24, 2025

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jan 24, 2025

For salary slips based on timesheets:

…y, calculate salary slip dates if payroll frequency is set not if its not a timesheet based salary slip

(cherry picked from commit 8abf1c4)

# Conflicts:
#	hrms/payroll/doctype/payroll_entry/payroll_entry.json
@mergify mergify bot added the conflicts label Jan 24, 2025
@mergify mergify bot requested a review from ruchamahabal as a code owner January 24, 2025 06:38
Copy link
Contributor Author

mergify bot commented Jan 24, 2025

Cherry-pick of 8abf1c4 has failed:

On branch mergify/bp/version-15-hotfix/pr-2686
Your branch is up to date with 'origin/version-15-hotfix'.

You are currently cherry-picking commit 8abf1c4e.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   hrms/payroll/doctype/salary_slip/salary_slip.js
	modified:   hrms/payroll/doctype/salary_slip/salary_slip.py

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   hrms/payroll/doctype/payroll_entry/payroll_entry.json

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@ruchamahabal ruchamahabal changed the title Fix timesheet based salary slip (backport #2686) fix: timesheet based salary slip (backport #2686) Jan 24, 2025
@ruchamahabal ruchamahabal merged commit 4f90a22 into version-15-hotfix Jan 24, 2025
8 checks passed
@frappe-pr-bot
Copy link
Collaborator

🎉 This PR is included in version 15.38.2 🎉

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
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants