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: remove ESS role when not mapped to employee (backport #37867) #38133

Merged

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Nov 16, 2023

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


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

* fix: remove ESS role when not mapped to employee

* fix: emp role removal on unlinking

* fix: test case for user employee role mapping

* fix: mapped employee and user on creation

(cherry picked from commit 56b8d1b)
@ruchamahabal
Copy link
Member

Unrelated test case failure

@ruchamahabal ruchamahabal merged commit 8276614 into version-15-hotfix Nov 16, 2023
@mergify mergify bot deleted the mergify/bp/version-15-hotfix/pr-37867 branch November 16, 2023 14:58
frappe-pr-bot pushed a commit that referenced this pull request Nov 17, 2023
# [15.2.0](v15.1.0...v15.2.0) (2023-11-17)

### Bug Fixes

* add revaluation journal filter in Payable report ([c967468](c967468))
* allow regional gl in payment entry for gl preview ([#38136](#38136)) ([20e15eb](20e15eb))
* bom creator not able to amend / duplicate  (backport [#38128](#38128)) ([#38129](#38129)) ([ed9cd7c](ed9cd7c))
* **dn:** regression from bulk transaction fix ([ea43862](ea43862))
* GL Entries for receiving non CWIP assets using Purchase Receipt ([#38123](#38123)) ([d512371](d512371))
* handle partial return against invoices ([ac61abb](ac61abb))
* remove ESS role when not mapped to employee (backport [#37867](#37867)) ([#38133](#38133)) ([8276614](8276614))
* reset dr_or_cr for every reference ([22b39ac](22b39ac))
* test total unallocated amount in payment ([cb4bb5b](cb4bb5b))
* valuation rate for the subcontracting receipt supplied items with Serial and Batch Bundle (backport [#38094](#38094)) ([#38097](#38097)) ([28e6e5d](28e6e5d))

### Features

* virtual parent doctype ([e68d2e1](e68d2e1))
@frappe-pr-bot
Copy link
Collaborator

🎉 This PR is included in version 15.2.0 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

@github-actions github-actions bot locked as resolved and limited conversation to collaborators Jan 8, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants