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 #41877

Merged
merged 1 commit into from
Jun 12, 2024

Conversation

ruchamahabal
Copy link
Member

allow Employee role to select Department

@ruchamahabal ruchamahabal enabled auto-merge (squash) June 12, 2024 11:07
@ruchamahabal ruchamahabal merged commit 56082f5 into frappe:develop Jun 12, 2024
14 checks passed
mergify bot pushed a commit that referenced this pull request Jun 12, 2024
(cherry picked from commit 56082f5)

# Conflicts:
#	erpnext/setup/doctype/department/department.json
mergify bot pushed a commit that referenced this pull request Jun 12, 2024
(cherry picked from commit 56082f5)

# Conflicts:
#	erpnext/setup/doctype/department/department.json
ruchamahabal added a commit that referenced this pull request Jun 12, 2024
* fix: allow Employee role to select Department (#41877)

(cherry picked from commit 56082f5)

# Conflicts:
#	erpnext/setup/doctype/department/department.json

* chore: fix conflicts

---------

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
ruchamahabal added a commit that referenced this pull request Jun 12, 2024
* fix: allow Employee role to select Department (#41877)

(cherry picked from commit 56082f5)

# Conflicts:
#	erpnext/setup/doctype/department/department.json

* chore: fix conflicts

---------

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
frappe-pr-bot pushed a commit that referenced this pull request Jun 19, 2024
## [14.70.7](v14.70.6...v14.70.7) (2024-06-19)

### Bug Fixes

* add LCV flag to determine negative expenses ([20b8ee1](20b8ee1))
* allow Auditor to read a Fiscal Year ([b1a911a](b1a911a))
* allow Auditor to select a company ([18b6d50](18b6d50))
* allow Employee role to select Department (backport [#41877](#41877)) ([#41880](#41880)) ([245c6d8](245c6d8))
* migrate lead notes ([8f5278e](8f5278e))
* only show user and date if available ([598c581](598c581))
* parameters for PI references ([d484553](d484553))
* regional overide for updating item valution ([6441bc7](6441bc7))
* reposting validation related PCV ([bcfc83d](bcfc83d))
* reset perpetual inventory flag after test ([eae5f27](eae5f27))
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))
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Jun 27, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant