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(Salary Slip): remove company filter from employee (backport #1873) #1876

Merged
merged 2 commits into from
Jun 11, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jun 11, 2024

Dont set company filter on employee field, and remove "Remember last" property for company field.


This is an automatic backport of pull request #1873 done by Mergify.

(cherry picked from commit de55c07)

# Conflicts:
#	hrms/payroll/doctype/salary_slip/salary_slip.json
Copy link
Contributor Author

mergify bot commented Jun 11, 2024

Cherry-pick of de55c07 has failed:

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

You are currently cherry-picking commit de55c0709.
  (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

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   hrms/payroll/doctype/salary_slip/salary_slip.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 merged commit e9dc0b1 into version-14-hotfix Jun 11, 2024
7 checks passed
@mergify mergify bot deleted the mergify/bp/version-14-hotfix/pr-1873 branch June 11, 2024 11:19
frappe-pr-bot pushed a commit that referenced this pull request Jun 12, 2024
## [14.28.5](v14.28.4...v14.28.5) (2024-06-12)

### Bug Fixes

* calculate leaves for months passed even when policy assignment is based on custom range (backport [#1697](#1697)) ([#1884](#1884)) ([4b2312d](4b2312d))
* **Salary Slip:** remove company filter from employee (backport [#1873](#1873)) ([#1876](#1876)) ([e9dc0b1](e9dc0b1))
* **Salary Structure Assignment:** Preview Salary Slip date (backport [#1869](#1869)) ([#1878](#1878)) ([f735482](f735482))
* **Shift Assignment:** type error while comparing dates during computation of previous/next shift (backport [#1839](#1839)) ([#1882](#1882)) ([37578e6](37578e6))
@frappe-pr-bot
Copy link
Collaborator

🎉 This PR is included in version 14.28.5 🎉

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