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.

Sign up for GitHub

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

Jump to bottom

chore: release v15 #2374

Merged
merged 42 commits into from
Oct 31, 2024
Merged

chore: release v15 #2374

merged 42 commits into from
Oct 31, 2024

Commits on Oct 18, 2024

  1. test: add test Employees Working on a Holiday report 

    (cherry picked from commit 3e3ed07)
    @krantheman @mergify
    krantheman authored and mergify[bot] committed Oct 18, 2024
    Configuration menu
    Copy the full SHA
    103a423 View commit details
    Browse the repository at this point in the history

Commits on Oct 23, 2024

  1. fix: daily work summary page not found error (backport #2208) (#2328) 

    Co-authored-by: Parameshwari Palanisamy <101092028+creative-paramu@users.noreply.github.com>
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
fix: daily work summary page not found error (#2208)
    @mergify @creative-paramu @ruchamahabal
    3 people authored Oct 23, 2024
    Configuration menu
    Copy the full SHA
    bf0be70 View commit details
    Browse the repository at this point in the history

  2. chore: use FrappeTestCase

    @krantheman
    krantheman committed Oct 23, 2024
    Configuration menu
    Copy the full SHA
    91d9fde View commit details
    Browse the repository at this point in the history

  3. fix(PWA): Use standard formatter for currency 

    (cherry picked from commit ceffe34)
    @cogk @mergify
    cogk authored and mergify[bot] committed Oct 23, 2024
    Configuration menu
    Copy the full SHA
    48d4996 View commit details
    Browse the repository at this point in the history

  4. feat(PWA): Add translations loader plugin 

    (cherry picked from commit b1cc435)
    @cogk @mergify
    cogk authored and mergify[bot] committed Oct 23, 2024
    Configuration menu
    Copy the full SHA
    d24ec2c View commit details
    Browse the repository at this point in the history

  5. feat(PWA): Add translations to bootinfo 

    (cherry picked from commit 3712878)

# Conflicts:
#	hrms/www/hrms.py
    @cogk @mergify
    cogk authored and mergify[bot] committed Oct 23, 2024
    Configuration menu
    Copy the full SHA
    4a5ecca View commit details
    Browse the repository at this point in the history

  6. feat(PWA): Translate app 

    (cherry picked from commit 95a0dee)
    @cogk @mergify
    cogk authored and mergify[bot] committed Oct 23, 2024
    Configuration menu
    Copy the full SHA
    32c50d6 View commit details
    Browse the repository at this point in the history

  7. refactor(PWA): Handle tab buttons translations 

    (cherry picked from commit 1ba80e4)
    @cogk @mergify
    cogk authored and mergify[bot] committed Oct 23, 2024
    Configuration menu
    Copy the full SHA
    7f1ddd6 View commit details
    Browse the repository at this point in the history

  8. fix(PWA): Fix translated toast message 

    (cherry picked from commit 278a003)
    @cogk @mergify
    cogk authored and mergify[bot] committed Oct 23, 2024
    Configuration menu
    Copy the full SHA
    fb41efb View commit details
    Browse the repository at this point in the history

  9. feat(PWA): Translate Attendance dashboard 

    (cherry picked from commit 5dc263a)
    @cogk @mergify
    cogk authored and mergify[bot] committed Oct 23, 2024
    Configuration menu
    Copy the full SHA
    561c9dc View commit details
    Browse the repository at this point in the history

  10. fix(PWA): Fix translation of durations 

    (cherry picked from commit d55b368)
    @cogk @mergify
    cogk authored and mergify[bot] committed Oct 23, 2024
    Configuration menu
    Copy the full SHA
    07c14e0 View commit details
    Browse the repository at this point in the history

  11. chore: remove unused function 

    (cherry picked from commit 5465aa0)
    @krantheman @mergify
    krantheman authored and mergify[bot] committed Oct 23, 2024
    Configuration menu
    Copy the full SHA
    cae26d6 View commit details
    Browse the repository at this point in the history

  12. Merge pull request #2307 from frappe/mergify/bp/version-15-hotfix/pr-… 

    …2305
    @krantheman
    krantheman authored Oct 23, 2024
    Configuration menu
    Copy the full SHA
    65ed460 View commit details
    Browse the repository at this point in the history

  13. fix: merge conflicts

    @krantheman
    krantheman committed Oct 23, 2024
    Configuration menu
    Copy the full SHA
    d83d3df View commit details
    Browse the repository at this point in the history

  14. fix: remove function call

    @krantheman
    krantheman committed Oct 23, 2024
    Configuration menu
    Copy the full SHA
    ecd5aef View commit details
    Browse the repository at this point in the history

  15. Merge pull request #2330 from frappe/mergify/bp/version-15-hotfix/pr-… 

    …1856
    @krantheman
    krantheman authored Oct 23, 2024
    Configuration menu
    Copy the full SHA
    a16a2f5 View commit details
    Browse the repository at this point in the history

Commits on Oct 24, 2024

  1. fix(appraisal_cycle): Value missing for Appraisal: Company while crea… 

    …ting Appraisal from Appraisal Cycle (backport #2336) (#2338)

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
Co-authored-by: jabir-elat <44110258+jabir-elat@users.noreply.github.com>
    @mergify @ruchamahabal @jabir-elat
    3 people authored Oct 24, 2024
    Configuration menu
    Copy the full SHA
    57ffe17 View commit details
    Browse the repository at this point in the history

Commits on Oct 25, 2024

  1. feat: allow fractional values for "Current Work Experience" field in … 

    …gratuity doctype (#2340)
    @asmitahase
    asmitahase authored Oct 25, 2024
    Configuration menu
    Copy the full SHA
    08984a6 View commit details
    Browse the repository at this point in the history

Commits on Oct 28, 2024

  1. build: fix v15 yarn lock (#2344)

    @blaggacao
    blaggacao authored Oct 28, 2024
    Configuration menu
    Copy the full SHA
    0927f77 View commit details
    Browse the repository at this point in the history

  2. fix: correct bank entry calculation with deductions and prevent multi… 

    …ple loan repayment deductions

(cherry picked from commit 3ce5890)
    @Nihantra-Patel @mergify
    Nihantra-Patel authored and mergify[bot] committed Oct 28, 2024
    Configuration menu
    Copy the full SHA
    4d93cfa View commit details
    Browse the repository at this point in the history

  3. fix: correct bank entry calculation and update the testcase 

    (cherry picked from commit 44cdcc7)

# Conflicts:
#	hrms/payroll/doctype/payroll_entry/test_payroll_entry.py
    @Nihantra-Patel @mergify
    Nihantra-Patel authored and mergify[bot] committed Oct 28, 2024
    Configuration menu
    Copy the full SHA
    f0be056 View commit details
    Browse the repository at this point in the history

  4. fix: update the testcase 

    (cherry picked from commit 4d3e0f5)
    @Nihantra-Patel @mergify
    Nihantra-Patel authored and mergify[bot] committed Oct 28, 2024
    Configuration menu
    Copy the full SHA
    962ddcf View commit details
    Browse the repository at this point in the history

  5. chore: fix conflicts

    @ruchamahabal
    ruchamahabal authored Oct 28, 2024
    Configuration menu
    Copy the full SHA
    ece15e3 View commit details
    Browse the repository at this point in the history

  6. Merge pull request #2348 from frappe/mergify/bp/version-15-hotfix/pr-… 

    …2347

fix: correct bank entry calculation with deductions and prevent multiple loan repayment deductions (backport #2347)
    @ruchamahabal
    ruchamahabal authored Oct 28, 2024
    Configuration menu
    Copy the full SHA
    360517e View commit details
    Browse the repository at this point in the history

Commits on Oct 29, 2024

  1. fix(PWA): post login redirection fails due to default_route conflic… 

    …t with other app (backport #2351) (#2353)

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
    @mergify @ruchamahabal
    mergify[bot] and ruchamahabal authored Oct 29, 2024
    Configuration menu
    Copy the full SHA
    a07bca5 View commit details
    Browse the repository at this point in the history

Commits on Oct 30, 2024

  1. fix(PWA): broken translation strings 

    (cherry picked from commit 6e60ba6)
    @ruchamahabal @mergify
    ruchamahabal authored and mergify[bot] committed Oct 30, 2024
    Configuration menu
    Copy the full SHA
    87504dc View commit details
    Browse the repository at this point in the history

  2. fix(PWA): broken translation strings in expense tables 

    (cherry picked from commit 0fbe4a4)
    @ruchamahabal @mergify
    ruchamahabal authored and mergify[bot] committed Oct 30, 2024
    Configuration menu
    Copy the full SHA
    5caf1de View commit details
    Browse the repository at this point in the history

  3. fix: translation function used without injecting 

    (cherry picked from commit 59d753f)
    @ruchamahabal @mergify
    ruchamahabal authored and mergify[bot] committed Oct 30, 2024
    Configuration menu
    Copy the full SHA
    f9951db View commit details
    Browse the repository at this point in the history

  4. chore: fix formatting 

    (cherry picked from commit 3fa44d4)
    @ruchamahabal @mergify
    ruchamahabal authored and mergify[bot] committed Oct 30, 2024
    Configuration menu
    Copy the full SHA
    42985e0 View commit details
    Browse the repository at this point in the history

  5. fix: translate passed message in EmptyState component instead of tran… 

    …slating it everywhere

(cherry picked from commit 96a05bf)
    @ruchamahabal @mergify
    ruchamahabal authored and mergify[bot] committed Oct 30, 2024
    Configuration menu
    Copy the full SHA
    e178078 View commit details
    Browse the repository at this point in the history

  6. refactor: simplify translated messages in request action sheet 

    (cherry picked from commit a49b14c)
    @ruchamahabal @mergify
    ruchamahabal authored and mergify[bot] committed Oct 30, 2024
    Configuration menu
    Copy the full SHA
    8ed8c73 View commit details
    Browse the repository at this point in the history

  7. Merge pull request #2361 from frappe/mergify/bp/version-15-hotfix/pr-… 

    …2359

fix(PWA): broken translation strings (backport #2359)
    @ruchamahabal
    ruchamahabal authored Oct 30, 2024
    Configuration menu
    Copy the full SHA
    6da012d View commit details
    Browse the repository at this point in the history

  8. fix: stop leave allocation for left employees (backport #2358) (#2363) 

    Co-authored-by: Aysha <74527579+AyshaHakeem@users.noreply.github.com>
    @mergify @AyshaHakeem
    mergify[bot] and AyshaHakeem authored Oct 30, 2024
    Configuration menu
    Copy the full SHA
    eccc11c View commit details
    Browse the repository at this point in the history

  9. fix: submit attendance request for future dates (backport #2352) (#2364) 

    Co-authored-by: Aysha <74527579+AyshaHakeem@users.noreply.github.com>
    @mergify @AyshaHakeem
    mergify[bot] and AyshaHakeem authored Oct 30, 2024
    Configuration menu
    Copy the full SHA
    8afd526 View commit details
    Browse the repository at this point in the history

  10. fix(PWA): replace datepicker with input component (backport #2366) (#… 

    …2368)

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
    @mergify @ruchamahabal
    mergify[bot] and ruchamahabal authored Oct 30, 2024
    Configuration menu
    Copy the full SHA
    a9b85d3 View commit details
    Browse the repository at this point in the history

  11. Merge branch 'version-15' into version-15-hotfix

    @ruchamahabal
    ruchamahabal authored Oct 30, 2024
    Configuration menu
    Copy the full SHA
    853c9df View commit details
    Browse the repository at this point in the history

Commits on Oct 31, 2024

  1. feat: add Payroll Entry to Bank Account dashboard (backport #2369) (#… 

    …2372)

Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
    @mergify @barredterra
    mergify[bot] and barredterra authored Oct 31, 2024
    Configuration menu
    Copy the full SHA
    940c6dc View commit details
    Browse the repository at this point in the history

  2. Revert "build: fix v15 yarn lock" (#2376)

    @ruchamahabal
    ruchamahabal authored Oct 31, 2024
    Configuration menu
    Copy the full SHA
    74f57d5 View commit details
    Browse the repository at this point in the history

  3. build: upgrade frappe-ui 

    - submodule was pointing to an old commit but package.json had new version after roster update
    @ruchamahabal
    ruchamahabal committed Oct 31, 2024
    Configuration menu
    Copy the full SHA
    0dfb3ca View commit details
    Browse the repository at this point in the history

  4. build: upgrade common dependencies to the same version in both the wo… 

    …rkspaces
    @ruchamahabal
    ruchamahabal committed Oct 31, 2024
    Configuration menu
    Copy the full SHA
    f28d451 View commit details
    Browse the repository at this point in the history

  5. chore: regenerate yarn.lock

    @ruchamahabal
    ruchamahabal committed Oct 31, 2024
    Configuration menu
    Copy the full SHA
    2b46fba View commit details
    Browse the repository at this point in the history

  6. Merge pull request #2377 from ruchamahabal/fix-yarn-workspaces-v15

    @ruchamahabal
    ruchamahabal authored Oct 31, 2024
    Configuration menu
    Copy the full SHA
    eeaac9f View commit details
    Browse the repository at this point in the history