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 v15 #42024

Merged
merged 56 commits into from
Jun 26, 2024
Merged

chore: release v15 #42024

merged 56 commits into from
Jun 26, 2024

Commits on May 13, 2024

  1. fix(Sales Order): only show permitted actions

    (cherry picked from commit c29d955)
    barredterra authored and mergify[bot] committed May 13, 2024
    Configuration menu
    Copy the full SHA
    a0011c5 View commit details
    Browse the repository at this point in the history
  2. fix(Delivery Note): only show permitted actions

    (cherry picked from commit 418bdc1)
    barredterra authored and mergify[bot] committed May 13, 2024
    Configuration menu
    Copy the full SHA
    cef6d0d View commit details
    Browse the repository at this point in the history

Commits on Jun 17, 2024

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

Commits on Jun 20, 2024

  1. fix: do not show zero balance stock items in stock balance report (ba…

    …ckport #41958) (#41961)
    
    fix: do not show zero balance stock in stock balance
    
    (cherry picked from commit 7f7b363)
    
    Co-authored-by: Rohit Waghchaure <rohitw1991@gmail.com>
    mergify[bot] and rohitwaghchaure committed Jun 20, 2024
    Configuration menu
    Copy the full SHA
    c10b123 View commit details
    Browse the repository at this point in the history
  2. fix: add string for translation (backport #41903) (#41963)

    fix: add string for translation (#41903)
    
    fix: add string for translation
    (cherry picked from commit f28c692)
    
    Co-authored-by: mahsem <137205921+mahsem@users.noreply.github.com>
    mergify[bot] and mahsem committed Jun 20, 2024
    Configuration menu
    Copy the full SHA
    48dc24b View commit details
    Browse the repository at this point in the history
  3. Merge remote-tracking branch 'upstream/version-15-hotfix' into mergif…

    …y/bp/version-15-hotfix/pr-41384
    barredterra committed Jun 20, 2024
    Configuration menu
    Copy the full SHA
    ddbf931 View commit details
    Browse the repository at this point in the history
  4. refactor: remove use of can_create for Payment Request (#41647)

    (cherry picked from commit 47bc569)
    barredterra committed Jun 20, 2024
    Configuration menu
    Copy the full SHA
    9bad219 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    2180239 View commit details
    Browse the repository at this point in the history
  6. Merge pull request #41441 from frappe/mergify/bp/version-15-hotfix/pr…

    …-41384
    
    fix(SO, DN): only show permitted actions (backport #41384)
    barredterra committed Jun 20, 2024
    Configuration menu
    Copy the full SHA
    7b322e7 View commit details
    Browse the repository at this point in the history

Commits on Jun 21, 2024

  1. fix: incorrect discount on other item

    When discount is applied on other item, don't update `discount_amount`
    as the amount is calculated for current item
    
    (cherry picked from commit 654764e)
    ruthra-kumar authored and mergify[bot] committed Jun 21, 2024
    Configuration menu
    Copy the full SHA
    77f4199 View commit details
    Browse the repository at this point in the history
  2. Merge pull request #41977 from frappe/mergify/bp/version-15-hotfix/pr…

    …-41956
    
    fix: incorrect discount on other item (backport #41956)
    ruthra-kumar committed Jun 21, 2024
    Configuration menu
    Copy the full SHA
    657daf9 View commit details
    Browse the repository at this point in the history
  3. fix: incorrect against_account upon reposting

    (cherry picked from commit 20c4098)
    ruthra-kumar authored and mergify[bot] committed Jun 21, 2024
    Configuration menu
    Copy the full SHA
    a41577a View commit details
    Browse the repository at this point in the history
  4. fix: decimal issue in pick list (backport #41972) (#41982)

    fix: decimal issue in pick list (#41972)
    
    (cherry picked from commit 21adc7b)
    
    Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
    mergify[bot] and rohitwaghchaure committed Jun 21, 2024
    Configuration menu
    Copy the full SHA
    9945a90 View commit details
    Browse the repository at this point in the history
  5. Merge pull request #41984 from frappe/mergify/bp/version-15-hotfix/pr…

    …-41981
    
    fix: incorrect against_account upon reposting (backport #41981)
    ruthra-kumar committed Jun 21, 2024
    Configuration menu
    Copy the full SHA
    9515b96 View commit details
    Browse the repository at this point in the history
  6. refactor: renamed number of depreciations booked to opening booked de… (

    #41515)
    
    * refactor: renamed number of depreciations booked to opening booked depreciations
    
    * feat: introduced new field for showing total number of booked depreciations
    khushi8112 committed Jun 21, 2024
    Configuration menu
    Copy the full SHA
    ca343f1 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    7b5d504 View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    f957436 View commit details
    Browse the repository at this point in the history
  9. Merge pull request #41989 from khushi8112/rename-number-of-depreciati…

    …on-v15-hotfix
    
    refactor: renamed number of depreciations booked to opening booked depreciations
    khushi8112 committed Jun 21, 2024
    Configuration menu
    Copy the full SHA
    8d299d1 View commit details
    Browse the repository at this point in the history

Commits on Jun 22, 2024

  1. feat: default account head for operating cost (backport #41985) (#41987)

    * feat: default account head for operating cost (#41985)
    
    (cherry picked from commit fd7666a)
    
    # Conflicts:
    #	erpnext/manufacturing/doctype/bom/bom.py
    #	erpnext/setup/doctype/company/company.json
    
    * chore: fix conflicts
    
    * chore: fix conflicts
    
    * chore: fix conflicts
    
    * chore: fix conflicts
    
    ---------
    
    Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
    mergify[bot] and rohitwaghchaure committed Jun 22, 2024
    Configuration menu
    Copy the full SHA
    44c1671 View commit details
    Browse the repository at this point in the history
  2. perf: dont run queries unnecessarily, improved filters (#41993)

    * perf: dont run queries unnecessarily, improved filters
    
    * perf: dont run query if `in` filter is empty
    
    (cherry picked from commit ac6d85a)
    sagarvora authored and mergify[bot] committed Jun 22, 2024
    Configuration menu
    Copy the full SHA
    b59c91a View commit details
    Browse the repository at this point in the history
  3. Merge pull request #41995 from frappe/mergify/bp/version-15-hotfix/pr…

    …-41993
    
    perf: dont run queries unnecessarily, improved filters (backport #41993)
    sagarvora committed Jun 22, 2024
    Configuration menu
    Copy the full SHA
    a535933 View commit details
    Browse the repository at this point in the history
  4. chore: remove validation on payment entry

    (cherry picked from commit e774003)
    ruthra-kumar authored and mergify[bot] committed Jun 22, 2024
    Configuration menu
    Copy the full SHA
    199a649 View commit details
    Browse the repository at this point in the history
  5. refactor: convert amount to base currency for advances

    (cherry picked from commit c9ede1f)
    ruthra-kumar authored and mergify[bot] committed Jun 22, 2024
    Configuration menu
    Copy the full SHA
    5d2f296 View commit details
    Browse the repository at this point in the history
  6. refactor: for advances uses the party account in references table

    (cherry picked from commit 7dce6e0)
    ruthra-kumar authored and mergify[bot] committed Jun 22, 2024
    Configuration menu
    Copy the full SHA
    47071ce View commit details
    Browse the repository at this point in the history
  7. refactor(test): simpler create_account helper method

    (cherry picked from commit 475e0dd)
    ruthra-kumar authored and mergify[bot] committed Jun 22, 2024
    Configuration menu
    Copy the full SHA
    6ebd4ba View commit details
    Browse the repository at this point in the history
  8. test: exc gain/loss booking on advances under asset/liability

    (cherry picked from commit 827d67d)
    ruthra-kumar authored and mergify[bot] committed Jun 22, 2024
    Configuration menu
    Copy the full SHA
    259d7cd View commit details
    Browse the repository at this point in the history
  9. test: advance against purchase invoice

    (cherry picked from commit 90c8482)
    ruthra-kumar authored and mergify[bot] committed Jun 22, 2024
    Configuration menu
    Copy the full SHA
    88e1c28 View commit details
    Browse the repository at this point in the history
  10. refactor: validation to force accounts to be on same currency

    (cherry picked from commit 0f0b4d8)
    ruthra-kumar authored and mergify[bot] committed Jun 22, 2024
    Configuration menu
    Copy the full SHA
    78ad3f6 View commit details
    Browse the repository at this point in the history
  11. refactor: validation in customer group

    (cherry picked from commit 4f9a228)
    ruthra-kumar authored and mergify[bot] committed Jun 22, 2024
    Configuration menu
    Copy the full SHA
    4bde345 View commit details
    Browse the repository at this point in the history
  12. refactor: validation in Supplier Group

    (cherry picked from commit 107b614)
    ruthra-kumar authored and mergify[bot] committed Jun 22, 2024
    Configuration menu
    Copy the full SHA
    545d0b9 View commit details
    Browse the repository at this point in the history
  13. refactor: better error messages

    (cherry picked from commit 83ff94b)
    ruthra-kumar authored and mergify[bot] committed Jun 22, 2024
    Configuration menu
    Copy the full SHA
    2bd10d3 View commit details
    Browse the repository at this point in the history
  14. chore: fix test data

    (cherry picked from commit 07d5944)
    ruthra-kumar authored and mergify[bot] committed Jun 22, 2024
    Configuration menu
    Copy the full SHA
    d1679d4 View commit details
    Browse the repository at this point in the history
  15. chore: remove dead code

    (cherry picked from commit 7e318c0)
    ruthra-kumar authored and mergify[bot] committed Jun 22, 2024
    Configuration menu
    Copy the full SHA
    a1ebd16 View commit details
    Browse the repository at this point in the history
  16. fix(test): incorrect field for customer default billing currency

    (cherry picked from commit c696d13)
    ruthra-kumar authored and mergify[bot] committed Jun 22, 2024
    Configuration menu
    Copy the full SHA
    3b15708 View commit details
    Browse the repository at this point in the history
  17. refactor(test): enfore use of customer/supplier master

    While using advance accounts in foreign currency, always use
    Customer/Supplier master to maintain them
    
    (cherry picked from commit 64e6388)
    ruthra-kumar authored and mergify[bot] committed Jun 22, 2024
    Configuration menu
    Copy the full SHA
    6dbe820 View commit details
    Browse the repository at this point in the history
  18. refactor(test): make and use a different party for subscription

    (cherry picked from commit 3fabf4a)
    ruthra-kumar authored and mergify[bot] committed Jun 22, 2024
    Configuration menu
    Copy the full SHA
    c45ce75 View commit details
    Browse the repository at this point in the history

Commits on Jun 23, 2024

  1. fix: pricing rule with and without 'apply multiple' and priority

    Either all of the pricing rules identified for an item should have
    'apply multiple' enabled. If not, Priority is applied and only the
    highest priority is applied
    
    (cherry picked from commit 5e875b2)
    ruthra-kumar authored and mergify[bot] committed Jun 23, 2024
    Configuration menu
    Copy the full SHA
    f3aa885 View commit details
    Browse the repository at this point in the history
  2. test: priority takes effect on with and without apply multiple

    (cherry picked from commit efebc36)
    ruthra-kumar authored and mergify[bot] committed Jun 23, 2024
    Configuration menu
    Copy the full SHA
    f52f726 View commit details
    Browse the repository at this point in the history
  3. Merge pull request #41997 from frappe/mergify/bp/version-15-hotfix/pr…

    …-41844
    
    refactor: allow foreign currency advance accounts (backport #41844)
    ruthra-kumar committed Jun 23, 2024
    Configuration menu
    Copy the full SHA
    bc6cbb2 View commit details
    Browse the repository at this point in the history
  4. Merge pull request #41998 from frappe/mergify/bp/version-15-hotfix/pr…

    …-41976
    
    fix: pricing rule with and without 'apply multiple' and priority (backport #41976)
    ruthra-kumar committed Jun 23, 2024
    Configuration menu
    Copy the full SHA
    521cfb3 View commit details
    Browse the repository at this point in the history

Commits on Jun 24, 2024

  1. feat: accounting dimension filters in gp report

    (cherry picked from commit d165638)
    rtdany10 authored and mergify[bot] committed Jun 24, 2024
    Configuration menu
    Copy the full SHA
    fe9dffb View commit details
    Browse the repository at this point in the history
  2. feat(gp): group by cost center

    (cherry picked from commit e26bc17)
    rtdany10 authored and mergify[bot] committed Jun 24, 2024
    Configuration menu
    Copy the full SHA
    068ae87 View commit details
    Browse the repository at this point in the history
  3. Merge pull request #42006 from frappe/mergify/bp/version-15-hotfix/pr…

    …-41751
    
    feat: accounting dimension filters in gp report (#41751)
    deepeshgarg007 committed Jun 24, 2024
    Configuration menu
    Copy the full SHA
    6a0ab23 View commit details
    Browse the repository at this point in the history
  4. fix: Wrong Delete Batch on Purchase Receipt (backport #42007) (#42012)

    fix: Wrong Delete Batch on Purchase Receipt (#42007)
    
    (cherry picked from commit d50487c)
    
    Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
    mergify[bot] and rohitwaghchaure committed Jun 24, 2024
    Configuration menu
    Copy the full SHA
    68b318a View commit details
    Browse the repository at this point in the history
  5. fix: incorrect Difference Amount (backport #42008) (#42013)

    fix: incorrect Difference Amount (#42008)
    
    (cherry picked from commit 7d91c6c)
    
    Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
    mergify[bot] and rohitwaghchaure committed Jun 24, 2024
    Configuration menu
    Copy the full SHA
    838cc5b View commit details
    Browse the repository at this point in the history

Commits on Jun 25, 2024

  1. fix: valuation rate for the legacy batches (backport #42011) (#42020)

    fix: valuation rate for the legacy batches (#42011)
    
    (cherry picked from commit 9ab333d)
    
    Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
    mergify[bot] and rohitwaghchaure committed Jun 25, 2024
    Configuration menu
    Copy the full SHA
    f6be19c View commit details
    Browse the repository at this point in the history
  2. fix: timeout while cancelling LCV (backport #42030) (backport #42031) (

    …#42032)
    
    fix: timeout while cancelling LCV (backport #42030) (#42031)
    
    fix: timeout while cancelling LCV (#42030)
    
    fix: timeout while canelling LCV
    (cherry picked from commit 21bf7fd)
    
    Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
    (cherry picked from commit 2e76b9f)
    
    Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
    mergify[bot] committed Jun 25, 2024
    Configuration menu
    Copy the full SHA
    068de08 View commit details
    Browse the repository at this point in the history

Commits on Jun 26, 2024

  1. fix: Stock Reservation Entry was not getting created (backport #42033) (

    #42035)
    
    fix: Stock Reservation Entry was not getting created (#42033)
    
    (cherry picked from commit 1a9899b)
    
    Co-authored-by: Poorvi-R-Bhat <poorvi.r.bhat@gmail.com>
    mergify[bot] and Poorvi-R-Bhat committed Jun 26, 2024
    Configuration menu
    Copy the full SHA
    e278fc6 View commit details
    Browse the repository at this point in the history
  2. fix: manufacturing date issue in the batch (backport #42034) (#42037)

    * fix: manufacturing date issue in the batch (#42034)
    
    (cherry picked from commit eca3e02)
    
    # Conflicts:
    #	erpnext/stock/doctype/purchase_receipt/test_purchase_receipt.py
    
    * chore: fix conflicts
    
    ---------
    
    Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
    mergify[bot] and rohitwaghchaure committed Jun 26, 2024
    Configuration menu
    Copy the full SHA
    a981633 View commit details
    Browse the repository at this point in the history
  3. fix: fixed asset value in Fixed Asset Register (backport #41930) (#42027

    )
    
    fix: fixed asset value in Fixed Asset Register (#41930)
    
    (cherry picked from commit 1c643a0)
    
    Co-authored-by: Khushi Rawat <142375893+khushi8112@users.noreply.github.com>
    mergify[bot] and khushi8112 committed Jun 26, 2024
    Configuration menu
    Copy the full SHA
    f2feeaf View commit details
    Browse the repository at this point in the history
  4. feat: Turkish Chart Of Accounts (backport #41756) (#42028)

    * feat: Create Turkish Chart Of Accounts
    
    (cherry picked from commit 5c8ea86)
    
    * feat: Create Turkish Chart Of Accounts
    
    (cherry picked from commit b401ba2)
    
    ---------
    
    Co-authored-by: fzozyurt <fzozyurt@outlook.com>
    mergify[bot] and fzozyurt committed Jun 26, 2024
    Configuration menu
    Copy the full SHA
    63b26e6 View commit details
    Browse the repository at this point in the history
  5. perf: code optimization to handle large asset creation (backport #42018

    …) (#42025)
    
    perf: code optimization to handle large asset creation (#42018)
    
    (cherry picked from commit 5738d93)
    
    Co-authored-by: Khushi Rawat <142375893+khushi8112@users.noreply.github.com>
    mergify[bot] and khushi8112 committed Jun 26, 2024
    Configuration menu
    Copy the full SHA
    c27f272 View commit details
    Browse the repository at this point in the history
  6. fix: incorrect time period in asset depreciation schedule (backport #…

    …41805) (#42043)
    
    fix: incorrect time period in asset depreciation schedule (#41805)
    
    * fix(wip): depreciation calculation for existing asset
    
    * fix(wip): added validation for incorrect depreciation period
    
    * fix: depreciation schedule time period issue for existing asset
    
    * chore: run pre-commit checks and apply fixes
    
    * style: apply formatting changes
    
    * style: made some necessary changes
    
    * chore: modified test
    
    (cherry picked from commit 625f16d)
    
    Co-authored-by: Khushi Rawat <142375893+khushi8112@users.noreply.github.com>
    mergify[bot] and khushi8112 committed Jun 26, 2024
    Configuration menu
    Copy the full SHA
    cf4d4ba View commit details
    Browse the repository at this point in the history
  7. chore: patch to enable total number of booked depreciations field (ba…

    …ckport #41940) (#42042)
    
    * chore: patch to enable total number of booked depreciations field (#41940)
    
    * chore: patch to enable total number of booked depreciations field
    
    * fix: conflict resolved
    
    * refactor: replaced fb_row.db_set with set_value
    
    (cherry picked from commit 5fdd1d3)
    
    # Conflicts:
    #	erpnext/patches.txt
    
    * fix: resolved conflicts
    
    * fix: removed unmerged patches
    
    ---------
    
    Co-authored-by: Khushi Rawat <142375893+khushi8112@users.noreply.github.com>
    mergify[bot] and khushi8112 committed Jun 26, 2024
    Configuration menu
    Copy the full SHA
    b294357 View commit details
    Browse the repository at this point in the history
  8. fix: lead status filter (backport #41816) (#42046)

    fix: lead status filter (#41816)
    
    (cherry picked from commit 8ae2b8f)
    
    Co-authored-by: Nihantra C. Patel <141945075+Nihantra-Patel@users.noreply.github.com>
    mergify[bot] and Nihantra-Patel committed Jun 26, 2024
    Configuration menu
    Copy the full SHA
    3536a75 View commit details
    Browse the repository at this point in the history
  9. fix: unhide serial no field (backport #42045) (#42047)

    * fix: unhide serial no field (#42045)
    
    (cherry picked from commit 80c6981)
    
    # Conflicts:
    #	erpnext/assets/doctype/asset_capitalization_stock_item/asset_capitalization_stock_item.json
    
    * fix: resolved conflicts
    
    ---------
    
    Co-authored-by: Khushi Rawat <142375893+khushi8112@users.noreply.github.com>
    mergify[bot] and khushi8112 committed Jun 26, 2024
    Configuration menu
    Copy the full SHA
    482832f View commit details
    Browse the repository at this point in the history