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 v14 #42254

Merged
merged 31 commits into from
Jul 10, 2024
Merged

chore: release v14 #42254

merged 31 commits into from
Jul 10, 2024

Commits on Jul 3, 2024

  1. refactor: remove obsolete function call (#42162)

    (cherry picked from commit 4512432)
    Mutantpenguin authored and mergify[bot] committed Jul 3, 2024
    Configuration menu
    Copy the full SHA
    2cf8256 View commit details
    Browse the repository at this point in the history
  2. fix: multiple free items on same Item Group

    (cherry picked from commit c4ae0d2)
    ruthra-kumar authored and mergify[bot] committed Jul 3, 2024
    Configuration menu
    Copy the full SHA
    701dd9e View commit details
    Browse the repository at this point in the history
  3. fix: manual pick allow to pick more than available stock (backport #4…

    …2155) (#42158)
    
    * fix: manual pick allow to pick more than available stock (#42155)
    
    (cherry picked from commit 938dd4b)
    
    # Conflicts:
    #	erpnext/stock/doctype/pick_list/test_pick_list.py
    
    * chore: fix conflicts
    
    ---------
    
    Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
    mergify[bot] and rohitwaghchaure authored Jul 3, 2024
    Configuration menu
    Copy the full SHA
    454e147 View commit details
    Browse the repository at this point in the history
  4. Merge pull request #42169 from frappe/mergify/bp/version-14-hotfix/pr…

    …-42165
    
    fix: multiple free items on same Item Group (backport #42165)
    ruthra-kumar authored Jul 3, 2024
    Configuration menu
    Copy the full SHA
    0f1f5b6 View commit details
    Browse the repository at this point in the history
  5. refactor: validation to prevent recursion with mixed conditions

    (cherry picked from commit 406dfd5)
    ruthra-kumar authored and mergify[bot] committed Jul 3, 2024
    Configuration menu
    Copy the full SHA
    49fb6be View commit details
    Browse the repository at this point in the history
  6. fix: use standard method to get _doc_before_save

    (cherry picked from commit 9d7be29)
    ruthra-kumar authored and mergify[bot] committed Jul 3, 2024
    Configuration menu
    Copy the full SHA
    9fde733 View commit details
    Browse the repository at this point in the history
  7. test: validation on mixed condition with recursion

    (cherry picked from commit 9bd4e7b)
    
    # Conflicts:
    #	erpnext/accounts/doctype/promotional_scheme/test_promotional_scheme.py
    ruthra-kumar authored and mergify[bot] committed Jul 3, 2024
    Configuration menu
    Copy the full SHA
    9931776 View commit details
    Browse the repository at this point in the history
  8. test: validation on mixed condition and recursion on pricing rule

    (cherry picked from commit eb4af58)
    
    # Conflicts:
    #	erpnext/accounts/doctype/pricing_rule/test_pricing_rule.py
    ruthra-kumar authored and mergify[bot] committed Jul 3, 2024
    Configuration menu
    Copy the full SHA
    71cbebd View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    d5fa968 View commit details
    Browse the repository at this point in the history
  10. Configuration menu
    Copy the full SHA
    4d6a71a View commit details
    Browse the repository at this point in the history

Commits on Jul 4, 2024

  1. Merge pull request #42172 from frappe/mergify/bp/version-14-hotfix/pr…

    …-42143
    
    refactor: validation to prevent recursion with mixed conditions (backport #42143)
    ruthra-kumar authored Jul 4, 2024
    Configuration menu
    Copy the full SHA
    d92a042 View commit details
    Browse the repository at this point in the history
  2. Merge pull request #42174 from khushi8112/fetch-expence-account-from-…

    …asset-category
    
    fix: fetch expense account from asset category
    khushi8112 authored Jul 4, 2024
    Configuration menu
    Copy the full SHA
    45899b3 View commit details
    Browse the repository at this point in the history
  3. fix: group by in item-wise purchase register

    (cherry picked from commit 3fab001)
    Nihantra-Patel authored and mergify[bot] committed Jul 4, 2024
    Configuration menu
    Copy the full SHA
    62ad466 View commit details
    Browse the repository at this point in the history
  4. Merge pull request #42180 from frappe/mergify/bp/version-14-hotfix/pr…

    …-41975
    
    fix: group by in item-wise purchase register (backport #41975)
    ruthra-kumar authored Jul 4, 2024
    Configuration menu
    Copy the full SHA
    64f8498 View commit details
    Browse the repository at this point in the history
  5. fix: empty item-wise sales/purchase register reports on initial load

    (cherry picked from commit ee86212)
    ruthra-kumar authored and mergify[bot] committed Jul 4, 2024
    Configuration menu
    Copy the full SHA
    13895fa View commit details
    Browse the repository at this point in the history
  6. Merge pull request #42184 from frappe/mergify/bp/version-14-hotfix/pr…

    …-42183
    
    fix: empty item-wise sales/purchase register reports on initial load (backport #42183)
    ruthra-kumar authored Jul 4, 2024
    Configuration menu
    Copy the full SHA
    e9357c1 View commit details
    Browse the repository at this point in the history

Commits on Jul 8, 2024

  1. fix: stock qty validation in SCR (backport #42124) (#42224)

    * fix: stock qty validation in SCR (#42124)
    
    (cherry picked from commit 99f2735)
    
    # Conflicts:
    #	erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py
    
    * chore: fix conflicts
    
    ---------
    
    Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
    mergify[bot] and rohitwaghchaure authored Jul 8, 2024
    Configuration menu
    Copy the full SHA
    e2f8e02 View commit details
    Browse the repository at this point in the history
  2. fix: add missing german translations

    (cherry picked from commit 2f89461)
    barredterra authored and mergify[bot] committed Jul 8, 2024
    Configuration menu
    Copy the full SHA
    d5c1c62 View commit details
    Browse the repository at this point in the history
  3. Merge pull request #42237 from frappe/mergify/bp/version-14-hotfix/pr…

    …-42235
    
    fix: add missing german translations (backport #42235)
    barredterra authored Jul 8, 2024
    Configuration menu
    Copy the full SHA
    f2d5a69 View commit details
    Browse the repository at this point in the history

Commits on Jul 9, 2024

  1. fix(Holiday List): sort holidays on save to avoid disorienting the us…

    …er (backport #42236) (#42251)
    
    * fix(Holiday List): sort holidays on save to avoid disorienting the user (#42236)
    
    fix: sort holidays on save to avoid disorienting the user
    (cherry picked from commit ad13725)
    
    # Conflicts:
    #	erpnext/setup/doctype/holiday_list/holiday_list.py
    
    * chore: fix conflicts
    
    ---------
    
    Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
    mergify[bot] and ruchamahabal authored Jul 9, 2024
    Configuration menu
    Copy the full SHA
    fcf6500 View commit details
    Browse the repository at this point in the history

Commits on Jul 10, 2024

  1. Merge pull request #42163 from frappe/mergify/bp/version-14-hotfix/pr…

    …-42162
    
    refactor: remove obsolete function call (backport #42162)
    ruthra-kumar authored Jul 10, 2024
    Configuration menu
    Copy the full SHA
    f2f1f32 View commit details
    Browse the repository at this point in the history
  2. fix: updated logic for calculating tax_withholding_net_total in payme…

    …nt entry
    
    (cherry picked from commit c8a34cd)
    ljain112 authored and mergify[bot] committed Jul 10, 2024
    Configuration menu
    Copy the full SHA
    49e5066 View commit details
    Browse the repository at this point in the history
  3. Merge pull request #42261 from frappe/mergify/bp/version-14-hotfix/pr…

    …-42060
    
    fix: updated logic for calculating tax_withholding_net_total in payment entry (backport #42060)
    sagarvora authored Jul 10, 2024
    Configuration menu
    Copy the full SHA
    5000c09 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    51cbbee View commit details
    Browse the repository at this point in the history
  5. Merge pull request #42262 from ljain112/fix-tds-backport

    fix(tds): use doctype reference when mapping keys across multiple doctype (backport #42258)
    vorasmit authored Jul 10, 2024
    Configuration menu
    Copy the full SHA
    fdb8e5b View commit details
    Browse the repository at this point in the history
  6. fix: removed max discount validation for sales return

    (cherry picked from commit db807d4)
    ljain112 authored and mergify[bot] committed Jul 10, 2024
    Configuration menu
    Copy the full SHA
    4195c50 View commit details
    Browse the repository at this point in the history
  7. Merge pull request #42264 from frappe/mergify/bp/version-14-hotfix/pr…

    …-42127
    
    fix: removed max discount validation for sales return (backport #42127)
    vorasmit authored Jul 10, 2024
    Configuration menu
    Copy the full SHA
    00e8b86 View commit details
    Browse the repository at this point in the history
  8. fix: tax on stock_rbnb on repost of Purchase Receipt

    (cherry picked from commit 8633080)
    ruthra-kumar authored and mergify[bot] committed Jul 10, 2024
    Configuration menu
    Copy the full SHA
    106c154 View commit details
    Browse the repository at this point in the history
  9. test: tax account heads on PR report without LCV

    (cherry picked from commit 9562628)
    
    # Conflicts:
    #	erpnext/stock/doctype/purchase_receipt/test_purchase_receipt.py
    ruthra-kumar authored and mergify[bot] committed Jul 10, 2024
    Configuration menu
    Copy the full SHA
    fdf1dfe View commit details
    Browse the repository at this point in the history
  10. chore: resolve conflict

    ruthra-kumar committed Jul 10, 2024
    Configuration menu
    Copy the full SHA
    115a012 View commit details
    Browse the repository at this point in the history
  11. Merge pull request #42271 from frappe/mergify/bp/version-14-hotfix/pr…

    …-42247
    
    fix: don't merge tax into stock account on purchase receipt repost (backport #42247)
    ruthra-kumar authored Jul 10, 2024
    Configuration menu
    Copy the full SHA
    5c75bb8 View commit details
    Browse the repository at this point in the history