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: allow Employee role to select Department (backport #41877) #41881

Merged
merged 2 commits into from
Jun 12, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jun 12, 2024

allow Employee role to select Department


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

(cherry picked from commit 56082f5)

# Conflicts:
#	erpnext/setup/doctype/department/department.json
Copy link
Contributor Author

mergify bot commented Jun 12, 2024

Cherry-pick of 56082f5 has failed:

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

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

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   erpnext/setup/doctype/department/department.json

no changes added to commit (use "git add" and/or "git commit -a")

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 3bc5076 into version-15-hotfix Jun 12, 2024
10 of 11 checks passed
@ruchamahabal ruchamahabal deleted the mergify/bp/version-15-hotfix/pr-41877 branch June 12, 2024 11:49
frappe-pr-bot pushed a commit that referenced this pull request Jun 19, 2024
## [15.27.7](v15.27.6...v15.27.7) (2024-06-19)

### Bug Fixes

* add LCV flag to determine negative expenses ([83ccb32](83ccb32))
* add strings for translation in pos_item_cart.js ([f4852d4](f4852d4))
* add test case for update received qty in MR ([858058c](858058c))
* add test case for update received qty in MR ([aaee028](aaee028))
* add test case for update received qty in MR ([125d97a](125d97a))
* add test case for update received qty in MR - import sorter ([084658e](084658e))
* add test case for update received qty in MR - import sorter ([21596c6](21596c6))
* allow Employee role to select Department (backport [#41877](#41877)) ([#41881](#41881)) ([3bc5076](3bc5076))
* batch qty in the dropdown field ([67d1709](67d1709))
* consistent query field name in item wise purchase register with item wise sales register ([a43c181](a43c181))
* download materials request plan in PP ([7193633](7193633))
* download materials request plan in PP ([ef2a6c7](ef2a6c7))
* download materials request plan in PP -prettier ([3370825](3370825))
* download materials request plan in production plan ([9cb7c27](9cb7c27))
* duplicate rows fetching in RFQ ([c159e3b](c159e3b))
* handle NoneType error where customer details are not available in sales register ([ceafa0c](ceafa0c))
* incorrect batch return from sales return ([b64b433](b64b433))
* item_code filter in item-wise sales-purchase register ([98c8fed](98c8fed))
* migrate lead notes ([5663432](5663432))
* only show user and date if available ([24ee765](24ee765))
* parameters for PI references ([8618402](8618402))
* regional overide for updating item valution ([5ea2cdc](5ea2cdc))
* reposting validation related PCV ([794ade8](794ade8))
* reset perpetual inventory flag after test ([4c11f2b](4c11f2b))
* return from accepted and rejected warehouse at a same time not working ([6c57971](6c57971))
* update received qty in MR on purchase invoice submit with update stock ([7e9f6ae](7e9f6ae))
* update received qty in MR on purchase invoice submit with update stock ([4551b4b](4551b4b))
* use invoice outstanding on Dunning ([#41817](#41817)) ([04f0c96](04f0c96))
@frappe-pr-bot
Copy link
Collaborator

🎉 This PR is included in version 15.27.7 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

@github-actions github-actions bot locked as resolved and limited conversation to collaborators Jul 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.

2 participants