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: daily work summary page not found error (backport #2208) #2328

Merged
merged 2 commits into from
Oct 23, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Oct 23, 2024

Daily Work Summary Doctype Loading Issue
Issue : #2141
Before:
image
After:
image


This is an automatic backport of pull request #2208 done by [Mergify](https://mergify.com).

(cherry picked from commit 27be5d4)

# Conflicts:
#	hrms/hr/doctype/daily_work_summary/daily_work_summary.json
@mergify mergify bot requested a review from ruchamahabal as a code owner October 23, 2024 07:39
@mergify mergify bot added the conflicts label Oct 23, 2024
Copy link
Contributor Author

mergify bot commented Oct 23, 2024

Cherry-pick of 27be5d4 has failed:

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

You are currently cherry-picking commit 27be5d403.
  (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:   hrms/hr/doctype/daily_work_summary/daily_work_summary.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 bf0be70 into version-15-hotfix Oct 23, 2024
7 checks passed
frappe-pr-bot pushed a commit that referenced this pull request Oct 31, 2024
# [15.34.0](v15.33.2...v15.34.0) (2024-10-31)

### Bug Fixes

* **appraisal_cycle:** Value missing for Appraisal: Company while creating Appraisal from Appraisal Cycle (backport [#2336](#2336)) ([#2338](#2338)) ([57ffe17](57ffe17))
* correct bank entry calculation and update the testcase ([f0be056](f0be056))
* correct bank entry calculation with deductions and prevent multiple loan repayment deductions ([4d93cfa](4d93cfa))
* daily work summary page not found error (backport [#2208](#2208)) ([#2328](#2328)) ([bf0be70](bf0be70))
* merge conflicts ([d83d3df](d83d3df))
* **PWA:** broken translation strings ([87504dc](87504dc))
* **PWA:** broken translation strings in expense tables ([5caf1de](5caf1de))
* **PWA:** Fix translated toast message ([fb41efb](fb41efb))
* **PWA:** Fix translation of durations ([07c14e0](07c14e0))
* **PWA:** post login redirection fails due to `default_route` conflict with other app (backport [#2351](#2351)) ([#2353](#2353)) ([a07bca5](a07bca5))
* **PWA:** replace datepicker with input component (backport [#2366](#2366)) ([#2368](#2368)) ([a9b85d3](a9b85d3))
* **PWA:** Use standard formatter for currency ([48d4996](48d4996))
* remove function call ([ecd5aef](ecd5aef))
* stop leave allocation for left employees (backport [#2358](#2358)) ([#2363](#2363)) ([eccc11c](eccc11c))
* submit attendance request for future dates (backport [#2352](#2352)) ([#2364](#2364)) ([8afd526](8afd526))
* translate passed message in EmptyState component instead of translating it everywhere ([e178078](e178078))
* translation function used without injecting ([f9951db](f9951db))
* update the testcase ([962ddcf](962ddcf))

### Features

* add Payroll Entry to Bank Account dashboard (backport [#2369](#2369)) ([#2372](#2372)) ([940c6dc](940c6dc))
* allow fractional values for "Current Work Experience" field in gratuity doctype ([#2340](#2340)) ([08984a6](08984a6))
* **PWA:** Add translations loader plugin ([d24ec2c](d24ec2c))
* **PWA:** Add translations to bootinfo ([4a5ecca](4a5ecca))
* **PWA:** Translate app ([32c50d6](32c50d6))
* **PWA:** Translate Attendance dashboard ([561c9dc](561c9dc))
@frappe-pr-bot
Copy link
Collaborator

🎉 This PR is included in version 15.34.0 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

@ruchamahabal ruchamahabal deleted the mergify/bp/version-15-hotfix/pr-2208 branch October 31, 2024 09:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants