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: set as query report 1 in all workspace #2066

Merged
merged 5 commits into from
Aug 11, 2024

Conversation

mohsinalimat
Copy link
Contributor

@mohsinalimat mohsinalimat commented Aug 11, 2024

fix: set as query report 1 in all workspace

fix: "Daily Work Summary Replies" set as query report 1 in employee lifecycle workspace
@ruchamahabal ruchamahabal merged commit 7b8dfba into frappe:develop Aug 11, 2024
7 of 8 checks passed
mergify bot pushed a commit that referenced this pull request Aug 11, 2024
* fix: set as query report 1 in all workspace

fix: "Daily Work Summary Replies" set as query report 1 in employee lifecycle workspace

* fix: set as query report 1 in expense claims workspace

* Update expense_claims.json

* fix: set as query report 1 in salary payout workspace

* Update salary_payout.json

(cherry picked from commit 7b8dfba)

# Conflicts:
#	hrms/payroll/workspace/salary_payout/salary_payout.json
mergify bot pushed a commit that referenced this pull request Aug 11, 2024
* fix: set as query report 1 in all workspace

fix: "Daily Work Summary Replies" set as query report 1 in employee lifecycle workspace

* fix: set as query report 1 in expense claims workspace

* Update expense_claims.json

* fix: set as query report 1 in salary payout workspace

* Update salary_payout.json

(cherry picked from commit 7b8dfba)
ruchamahabal added a commit that referenced this pull request Aug 11, 2024
* fix: set as query report 1 in all workspace (#2066)

* fix: set as query report 1 in all workspace

fix: "Daily Work Summary Replies" set as query report 1 in employee lifecycle workspace

* fix: set as query report 1 in expense claims workspace

* Update expense_claims.json

* fix: set as query report 1 in salary payout workspace

* Update salary_payout.json

(cherry picked from commit 7b8dfba)

# Conflicts:
#	hrms/payroll/workspace/salary_payout/salary_payout.json

* chore: fix conflicts

---------

Co-authored-by: MohsinAli <[email protected]>
Co-authored-by: Rucha Mahabal <[email protected]>
ruchamahabal pushed a commit that referenced this pull request Aug 11, 2024
* fix: set as query report 1 in all workspace

fix: "Daily Work Summary Replies" set as query report 1 in employee lifecycle workspace

* fix: set as query report 1 in expense claims workspace

* Update expense_claims.json

* fix: set as query report 1 in salary payout workspace

* Update salary_payout.json

(cherry picked from commit 7b8dfba)

Co-authored-by: MohsinAli <[email protected]>
frappe-pr-bot pushed a commit that referenced this pull request Aug 15, 2024
# [15.26.0](v15.25.2...v15.26.0) (2024-08-15)

### Bug Fixes

* "Employee Exits" set as query report in hr workspace (backport [#2063](#2063)) ([#2065](#2065)) ([2bf3984](2bf3984))
* don't show button when attendance has been marked ([1982d81](1982d81))
* get_taxes condition ([9d2016c](9d2016c))
* regenerate yarn.lock file (backport [#2055](#2055)) ([#2056](#2056)) ([5162cc5](5162cc5))
* set as query report 1 in all workspace (backport [#2066](#2066)) ([#2068](#2068)) ([44fbec7](44fbec7))

### Features

* add Fetch Shift buttons from Employee Checkin ([81c0fef](81c0fef))
* show alert when shift is updated ([d187297](d187297))
frappe-pr-bot pushed a commit that referenced this pull request Aug 15, 2024
# [14.30.0](v14.29.3...v14.30.0) (2024-08-15)

### Bug Fixes

* "Employee Exits" set as query report in hr workspace (backport [#2063](#2063)) ([#2064](#2064)) ([c16113d](c16113d))
* don't show button when attendance has been marked ([3cbed12](3cbed12))
* get_taxes condition ([cac8610](cac8610))
* merge conflicts ([7b24c22](7b24c22))
* set as query report 1 in all workspace (backport [#2066](#2066)) ([#2067](#2067)) ([89b2cfa](89b2cfa))

### Features

* add Fetch Shift buttons from Employee Checkin ([21276d0](21276d0))
* show alert when shift is updated ([6cea6cb](6cea6cb))
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