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

Release v15.41.2 #44037

Merged
merged 12 commits into from
Nov 8, 2024
Merged

Release v15.41.2 #44037

merged 12 commits into from
Nov 8, 2024

Commits on Nov 8, 2024

  1. fix: improved the conditions for determining voucher subtypes 

    (cherry picked from commit 00eee16)
    @ljain112 @mergify
    ljain112 authored and mergify[bot] committed Nov 8, 2024
    Configuration menu
    Copy the full SHA
    58ca4a2 View commit details
    Browse the repository at this point in the history

  2. fix: patch 

    (cherry picked from commit d76cc21)

# Conflicts:
#	erpnext/patches.txt
    @ljain112 @mergify
    ljain112 authored and mergify[bot] committed Nov 8, 2024
    Configuration menu
    Copy the full SHA
    107d53b View commit details
    Browse the repository at this point in the history

  3. test: test voucher subtype for sales invoice 

    (cherry picked from commit ad6cc35)
    @vorasmit @mergify
    vorasmit authored and mergify[bot] committed Nov 8, 2024
    Configuration menu
    Copy the full SHA
    d7f9182 View commit details
    Browse the repository at this point in the history

  4. chore: resolve conflict

    @ruthra-kumar
    ruthra-kumar committed Nov 8, 2024
    Configuration menu
    Copy the full SHA
    6649d17 View commit details
    Browse the repository at this point in the history

  5. fix: NoneType while updating ordered_qty in SO for removed items 

    (cherry picked from commit 442cdd7)
    @mergify
    bhaveshkumar.j authored and mergify[bot] committed Nov 8, 2024
    Configuration menu
    Copy the full SHA
    978a007 View commit details
    Browse the repository at this point in the history

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

    …-43273

fix: improved the conditions for determining voucher subtypes (backport #43273)
    @ruthra-kumar
    ruthra-kumar authored Nov 8, 2024
    Configuration menu
    Copy the full SHA
    23e9a46 View commit details
    Browse the repository at this point in the history

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

    …-43762

fix: handle NoneType error when updating ordered_qty in SO for remove… (backport #43762)
    @ruthra-kumar
    ruthra-kumar authored Nov 8, 2024
    Configuration menu
    Copy the full SHA
    f397361 View commit details
    Browse the repository at this point in the history

  8. refactor: add "margin_type" and "margin_rate_or_amount" to no copy 

    (cherry picked from commit 70f090c)
    @NethminaHiker360 @mergify
    NethminaHiker360 authored and mergify[bot] committed Nov 8, 2024
    Configuration menu
    Copy the full SHA
    487b577 View commit details
    Browse the repository at this point in the history

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

    …-43873

fix: add missing fields to field_no_map array (backport #43873)
    @ruthra-kumar
    ruthra-kumar authored Nov 8, 2024
    Configuration menu
    Copy the full SHA
    489fde8 View commit details
    Browse the repository at this point in the history

  10. fix: item not set in the batch quick entry form (backport #44028) (#4… 

    …4031)

fix: item not set in the batch quick entry form (#44028)

(cherry picked from commit 0399ccc)

Co-authored-by: rohitwaghchaure <[email protected]>
    @mergify @rohitwaghchaure
    mergify[bot] and rohitwaghchaure authored Nov 8, 2024
    Configuration menu
    Copy the full SHA
    6dcd015 View commit details
    Browse the repository at this point in the history

  11. fix: calculate percentage received and delivered considering over-rec… 

    …eipt and over-delivery (backport #43870) (#44030)

fix: calculate percentage received and delivered considering over-receipt and over-delivery (#43870)

(cherry picked from commit adba116)

Co-authored-by: Nabin Hait <[email protected]>
    @mergify @nabinhait
    mergify[bot] and nabinhait authored Nov 8, 2024
    Configuration menu
    Copy the full SHA
    5958d0c View commit details
    Browse the repository at this point in the history

  12. fix: sort by ascending to get the first period closing voucher (backp… 

    …ort #44029) (#44035)

fix: sort by ascending to get the first period closing voucher (#44029)

(cherry picked from commit 42dcdcd)

Co-authored-by: Venkatesh <[email protected]>
    @mergify @venkat102
    mergify[bot] and venkat102 authored Nov 8, 2024
    Configuration menu
    Copy the full SHA
    56f25ae View commit details
    Browse the repository at this point in the history