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: add Payroll Entry to Bank Account dashboard #2369

Merged
merged 1 commit into from
Oct 30, 2024

Conversation

barredterra
Copy link
Collaborator

@barredterra barredterra commented Oct 30, 2024

Corresponding PR on ERPNext: frappe/erpnext#43931

no-docs

@ruchamahabal ruchamahabal merged commit 708120c into frappe:develop Oct 30, 2024
9 of 10 checks passed
mergify bot pushed a commit that referenced this pull request Oct 30, 2024
(cherry picked from commit 708120c)
mergify bot pushed a commit that referenced this pull request Oct 30, 2024
@barredterra barredterra deleted the bank-acc-dashboard branch October 30, 2024 17:37
ruchamahabal pushed a commit that referenced this pull request Oct 31, 2024
…2372)

Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
ruchamahabal pushed a commit that referenced this pull request Oct 31, 2024
…2371)

Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
frappe-pr-bot pushed a commit that referenced this pull request Oct 31, 2024
# [14.35.0](v14.34.2...v14.35.0) (2024-10-31)

### Bug Fixes

* stop leave allocation for left employees (backport [#2358](#2358)) ([#2362](#2362)) ([ec0b808](ec0b808))
* submit attendance request for future dates (backport [#2352](#2352)) ([#2365](#2365)) ([5ed555f](5ed555f))

### Features

* add Payroll Entry to Bank Account dashboard (backport [#2369](#2369)) ([#2371](#2371)) ([b5e51f4](b5e51f4))
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))
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.

None yet

2 participants