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

chore: release v13 #35130

Merged
merged 22 commits into from
May 3, 2023
Merged

chore: release v13 #35130

merged 22 commits into from
May 3, 2023

Commits on Apr 25, 2023

  1. Configuration menu
    Copy the full SHA
    83afaf4 View commit details
    Browse the repository at this point in the history

Commits on Apr 26, 2023

  1. chore: fix linter

    saurabh6790 committed Apr 26, 2023
    Configuration menu
    Copy the full SHA
    31bda37 View commit details
    Browse the repository at this point in the history
  2. Merge pull request #35032 from saurabh6790/salary-register-report-fix

    chore: set correct currency symbol in salary register for multi-currency salary slip
    saurabh6790 committed Apr 26, 2023
    Configuration menu
    Copy the full SHA
    297facc View commit details
    Browse the repository at this point in the history

Commits on Apr 28, 2023

  1. fix: Hyperlink in Quality Inspection Summary

    (cherry picked from commit 72dd788)
    nihantra authored and mergify[bot] committed Apr 28, 2023
    Configuration menu
    Copy the full SHA
    54388e8 View commit details
    Browse the repository at this point in the history
  2. Merge pull request #35089 from frappe/mergify/bp/version-13-hotfix/pr…

    …-35081
    
    fix: Hyperlink in Quality Inspection Summary (backport #35081)
    s-aga-r committed Apr 28, 2023
    Configuration menu
    Copy the full SHA
    5746ddc View commit details
    Browse the repository at this point in the history

Commits on May 1, 2023

  1. fix: per_billed condition for Payment Entry (#34969)

    fix: per_billed condition for Payment Entry (#34969)
    
    fix: per_billed condition for Payment Entry (#34969)
    
    (cherry picked from commit d6bc8bb)
    
    Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
    (cherry picked from commit f9f42c7)
    
    Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
    mergify[bot] committed May 1, 2023
    Configuration menu
    Copy the full SHA
    563e5c0 View commit details
    Browse the repository at this point in the history
  2. fix: Naming series error in Journal Entry template (#35084)

    fix: Naming series error in Journal Entry template (#35084)
    
    (cherry picked from commit f3b3dab)
    
    Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
    mergify[bot] and deepeshgarg007 committed May 1, 2023
    Configuration menu
    Copy the full SHA
    d3c769c View commit details
    Browse the repository at this point in the history
  3. fix: allow user to set standard deductions in income tax slab without…

    … allowing other exemptions
    saurabh6790 committed May 1, 2023
    Configuration menu
    Copy the full SHA
    c5261cd View commit details
    Browse the repository at this point in the history
  4. feat: validate repost item valuation against accounts freeze date

    (cherry picked from commit 61f0513)
    
    # Conflicts:
    #	erpnext/stock/doctype/repost_item_valuation/test_repost_item_valuation.py
    rtdany10 authored and mergify[bot] committed May 1, 2023
    Configuration menu
    Copy the full SHA
    a852dc1 View commit details
    Browse the repository at this point in the history
  5. chore: pre-commit

    (cherry picked from commit be15419)
    
    # Conflicts:
    #	erpnext/stock/doctype/repost_item_valuation/test_repost_item_valuation.py
    rtdany10 authored and mergify[bot] committed May 1, 2023
    Configuration menu
    Copy the full SHA
    6992e72 View commit details
    Browse the repository at this point in the history
  6. fix: check for session user rather than owner

    (cherry picked from commit b482e38)
    rtdany10 authored and mergify[bot] committed May 1, 2023
    Configuration menu
    Copy the full SHA
    7d6e2f9 View commit details
    Browse the repository at this point in the history
  7. chore: pre-commit

    (cherry picked from commit 88a0aa4)
    rtdany10 authored and mergify[bot] committed May 1, 2023
    Configuration menu
    Copy the full SHA
    198a64d View commit details
    Browse the repository at this point in the history
  8. fix: conflicts

    rohitwaghchaure committed May 1, 2023
    Configuration menu
    Copy the full SHA
    6bdf143 View commit details
    Browse the repository at this point in the history
  9. fix: handle expected_value_after_useful_life properly in asset value …

    …adjustment (backport #35117) (#35120)
    
    fix: handle expected_value_after_useful_life properly in asset value adjustment (#35117)
    
    (cherry picked from commit 80230fe)
    
    Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com>
    mergify[bot] and anandbaburajan committed May 1, 2023
    Configuration menu
    Copy the full SHA
    635559d View commit details
    Browse the repository at this point in the history
  10. Merge pull request #35116 from frappe/mergify/bp/version-13-hotfix/pr…

    …-33013
    
    fix: validate repost item valuation against accounts freeze date (backport #33013)
    rohitwaghchaure committed May 1, 2023
    Configuration menu
    Copy the full SHA
    078161c View commit details
    Browse the repository at this point in the history
  11. fix: don't allow to make reposting for the closed period

    (cherry picked from commit f751727)
    
    # Conflicts:
    #	erpnext/accounts/doctype/period_closing_voucher/test_period_closing_voucher.py
    #	erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.py
    rohitwaghchaure authored and mergify[bot] committed May 1, 2023
    Configuration menu
    Copy the full SHA
    b31d8ee View commit details
    Browse the repository at this point in the history
  12. fix: conflicts

    rohitwaghchaure committed May 1, 2023
    Configuration menu
    Copy the full SHA
    b19b0a4 View commit details
    Browse the repository at this point in the history
  13. fix: conflicts

    rohitwaghchaure committed May 1, 2023
    Configuration menu
    Copy the full SHA
    778ba69 View commit details
    Browse the repository at this point in the history
  14. fix: test case

    rohitwaghchaure committed May 1, 2023
    Configuration menu
    Copy the full SHA
    db6d0e0 View commit details
    Browse the repository at this point in the history
  15. Merge pull request #35122 from frappe/mergify/bp/version-13-hotfix/pr…

    …-35118
    
    fix: don't allow to make reposting for the closed period (backport #35118)
    rohitwaghchaure committed May 1, 2023
    Configuration menu
    Copy the full SHA
    740313f View commit details
    Browse the repository at this point in the history

Commits on May 2, 2023

  1. Merge pull request #35114 from saurabh6790/consider-standard-exemption

    fix: allow user to set standard deductions in income tax slab without allowing other exemptions
    saurabh6790 committed May 2, 2023
    Configuration menu
    Copy the full SHA
    2f74026 View commit details
    Browse the repository at this point in the history

Commits on May 3, 2023

  1. fix: handle finance book properly in trial balance and general ledger (

    …#35136)
    
    fix: handle finance book properly in trial balance and general ledger [v14] (#35136)
    
    fix: handle FBs properly in general ledger and trial balance
    (cherry picked from commit 344c339)
    
    Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com>
    mergify[bot] and anandbaburajan committed May 3, 2023
    Configuration menu
    Copy the full SHA
    9a37603 View commit details
    Browse the repository at this point in the history