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

feat: make Bulk Assign Structure a primary button and add Branch filter #1197

Merged

Conversation

krantheman
Copy link
Member

@krantheman krantheman commented Dec 19, 2023

Changes

  • Make Bulk Assignment primary action, instead of an option in Actions menu
image
  • Add Branch filter
image

no-docs

@krantheman krantheman force-pushed the bulk-salary-structure-assignment branch from 5ea36ac to 573fd02 Compare December 19, 2023 10:20
Co-authored-by: Rucha Mahabal <[email protected]>
@ruchamahabal ruchamahabal marked this pull request as draft December 27, 2023 07:23
@krantheman krantheman marked this pull request as ready for review January 1, 2024 11:16
@ruchamahabal ruchamahabal merged commit 85ca6dc into frappe:develop Jan 9, 2024
6 of 7 checks passed
@ruchamahabal
Copy link
Member

Unrelated test failure. Fixed in another PR

mergify bot pushed a commit that referenced this pull request Jan 9, 2024
…er (#1197)

* feat: add Branch filter and make Bulk Assign Structure the primary action

* fix: anti pattern

* fix: Button label

Co-authored-by: Rucha Mahabal <[email protected]>

* fix: add branch filter to server side

---------

Co-authored-by: Rucha Mahabal <[email protected]>
(cherry picked from commit 85ca6dc)
@krantheman krantheman deleted the bulk-salary-structure-assignment branch January 9, 2024 07:38
ruchamahabal pushed a commit that referenced this pull request Jan 9, 2024
…er (backport #1197) (#1276)

* feat: add Branch filter and make Bulk Assign Structure the primary action

* fix: anti pattern

* fix: Button label

Co-authored-by: Rucha Mahabal <[email protected]>

* fix: add branch filter to server side

---------

Co-authored-by: Rucha Mahabal <[email protected]>
(cherry picked from commit 85ca6dc)

Co-authored-by: Akash  Tom <[email protected]>
frappe-pr-bot pushed a commit that referenced this pull request Jan 10, 2024
# [15.9.0](v15.8.0...v15.9.0) (2024-01-10)

### Bug Fixes

* cannot update status for Group Goals ([fba6087](fba6087))
* comp leave request fails on leave period boundary dates ([82144c3](82144c3))
* error message tense ([bc6024c](bc6024c))
* **Expense Claim:** description not saved (backport [#1265](#1265)) ([#1267](#1267)) ([60c099b](60c099b))
* expired leave balance is -ve when leaves taken > carry forwarded expired leaves (backport [#1288](#1288)) ([#1292](#1292)) ([48dfe64](48dfe64))
* get current leave period for leave balance report (backport [#1277](#1277)) ([#1279](#1279)) ([beb3d82](beb3d82))
* incorrect night shift assignment timings in shift calendar ([a12df94](a12df94))
* naming ([2fd540d](2fd540d))
* salary slip cancellation with loan repayment (backport [#1270](#1270)) ([#1271](#1271)) ([98702b0](98702b0))
* **Salary Slip:** data evaluation (backport [#1283](#1283)) ([#1290](#1290)) ([c7b4dfc](c7b4dfc))
* show error after confirm dialog ([c75a3b9](c75a3b9))
* status past tense ([9221bc0](9221bc0))
* translation strings ([b8f8b86](b8f8b86))
* ui update on progress update ([f23f995](f23f995))

### Features

* add bulk action for updating status ([2885a51](2885a51))
* add bulk unarchive and reopen ([c9fdb37](c9fdb37))
* **Goal Tree:** add Mark as Completed ([6e445aa](6e445aa))
* make Bulk Assign Structure a primary button and add Branch filter (backport [#1197](#1197)) ([#1276](#1276)) ([1fedea1](1fedea1))
krantheman added a commit to krantheman/hrms that referenced this pull request Jan 12, 2024
…er (frappe#1197)

* feat: add Branch filter and make Bulk Assign Structure the primary action

* fix: anti pattern

* fix: Button label

Co-authored-by: Rucha Mahabal <[email protected]>

* fix: add branch filter to server side

---------

Co-authored-by: Rucha Mahabal <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants