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 #41355

Merged
merged 39 commits into from
May 9, 2024
Merged

chore: release v15 #41355

merged 39 commits into from
May 9, 2024

Commits on May 3, 2024

  1. fix: Purchase Invoice gain loss gl entry for periodic inventory

    (cherry picked from commit 2402447)
    deepeshgarg007 authored and mergify[bot] committed May 3, 2024
    Configuration menu
    Copy the full SHA
    0513481 View commit details
    Browse the repository at this point in the history
  2. Merge pull request #41310 from frappe/mergify/bp/version-15-hotfix/pr…

    …-41260
    
    fix: Purchase Invoice gain loss gl entry for periodic inventory (#41260)
    deepeshgarg007 committed May 3, 2024
    Configuration menu
    Copy the full SHA
    66b85c9 View commit details
    Browse the repository at this point in the history
  3. fix: search for item price in stock UOM (backport #41075) (#41313)

    fix: search for item price in stock UOM (#41075)
    
    (cherry picked from commit e4db056)
    
    Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
    mergify[bot] and barredterra committed May 3, 2024
    Configuration menu
    Copy the full SHA
    112f96b View commit details
    Browse the repository at this point in the history
  4. feat(Item Price): make UOM mandatory (backport #40588) (#41312)

    * feat(Item Price): make UOM mandatory (#40588)
    
    (cherry picked from commit a61148c)
    
    # Conflicts:
    #	erpnext/stock/doctype/item_price/item_price.json
    
    * chore: `conflicts`
    
    ---------
    
    Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
    Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
    3 people committed May 3, 2024
    Configuration menu
    Copy the full SHA
    cab0e30 View commit details
    Browse the repository at this point in the history
  5. fix: future subscripition updates

    (cherry picked from commit 8e30deb)
    deepeshgarg007 authored and mergify[bot] committed May 3, 2024
    Configuration menu
    Copy the full SHA
    b27a55e View commit details
    Browse the repository at this point in the history
  6. test: Add posting dates

    (cherry picked from commit 7fa2206)
    deepeshgarg007 authored and mergify[bot] committed May 3, 2024
    Configuration menu
    Copy the full SHA
    3125400 View commit details
    Browse the repository at this point in the history
  7. Merge pull request #41315 from frappe/mergify/bp/version-15-hotfix/pr…

    …-41311
    
    fix: future subscription updates (#41311)
    deepeshgarg007 committed May 3, 2024
    Configuration menu
    Copy the full SHA
    6bac561 View commit details
    Browse the repository at this point in the history
  8. fix: GL Entries against orders as an advance

    (cherry picked from commit 8289f3c)
    deepeshgarg007 authored and mergify[bot] committed May 3, 2024
    Configuration menu
    Copy the full SHA
    e49a401 View commit details
    Browse the repository at this point in the history
  9. fix: Add PO reference

    (cherry picked from commit eb31017)
    deepeshgarg007 authored and mergify[bot] committed May 3, 2024
    Configuration menu
    Copy the full SHA
    c417b0c View commit details
    Browse the repository at this point in the history
  10. test: Update failing tests

    (cherry picked from commit 42ef957)
    deepeshgarg007 authored and mergify[bot] committed May 3, 2024
    Configuration menu
    Copy the full SHA
    d384860 View commit details
    Browse the repository at this point in the history
  11. test: Add bank account

    (cherry picked from commit eac7be2)
    deepeshgarg007 authored and mergify[bot] committed May 3, 2024
    Configuration menu
    Copy the full SHA
    2faeefb View commit details
    Browse the repository at this point in the history
  12. Merge pull request #41321 from frappe/mergify/bp/version-15-hotfix/pr…

    …-41279
    
    fix: GL Entries against orders as an advance (#41279)
    deepeshgarg007 committed May 3, 2024
    Configuration menu
    Copy the full SHA
    b3736d6 View commit details
    Browse the repository at this point in the history

Commits on May 4, 2024

  1. fix: Do not deduct TCS for opening invoices

    (cherry picked from commit eb9f579)
    deepeshgarg007 authored and mergify[bot] committed May 4, 2024
    Configuration menu
    Copy the full SHA
    1999b7a View commit details
    Browse the repository at this point in the history
  2. fix: Cost center not getting saved in PSOA

    (cherry picked from commit 58f7039)
    
    # Conflicts:
    #	erpnext/accounts/doctype/psoa_cost_center/psoa_cost_center.json
    deepeshgarg007 authored and mergify[bot] committed May 4, 2024
    Configuration menu
    Copy the full SHA
    fbbc0af View commit details
    Browse the repository at this point in the history

Commits on May 5, 2024

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

    …-41314
    
    fix: Do not deduct TCS for opening invoices (#41314)
    deepeshgarg007 committed May 5, 2024
    Configuration menu
    Copy the full SHA
    21ab8fe View commit details
    Browse the repository at this point in the history

Commits on May 6, 2024

  1. Configuration menu
    Copy the full SHA
    0b44ceb View commit details
    Browse the repository at this point in the history
  2. Merge pull request #41325 from frappe/mergify/bp/version-15-hotfix/pr…

    …-41318
    
    fix: Cost center not getting saved in PSOA (#41318)
    deepeshgarg007 committed May 6, 2024
    Configuration menu
    Copy the full SHA
    67954a9 View commit details
    Browse the repository at this point in the history
  3. fix: update project URLs (backport #41331) (#41332)

    fix: update project URLs (#41331)
    
    (cherry picked from commit 6142d07)
    
    Co-authored-by: Ankush Menat <ankush@frappe.io>
    mergify[bot] and ankush committed May 6, 2024
    Configuration menu
    Copy the full SHA
    bb619a6 View commit details
    Browse the repository at this point in the history
  4. fix: incorrect query for Purchase Invoice rate in GP

    (cherry picked from commit bd8382c)
    ruthra-kumar authored and mergify[bot] committed May 6, 2024
    Configuration menu
    Copy the full SHA
    20daae4 View commit details
    Browse the repository at this point in the history
  5. Merge pull request #41337 from frappe/mergify/bp/version-15-hotfix/pr…

    …-41334
    
    fix: incorrect query for Purchase Invoice rate in GP (backport #41334)
    ruthra-kumar committed May 6, 2024
    Configuration menu
    Copy the full SHA
    a482ee1 View commit details
    Browse the repository at this point in the history
  6. fix: pick list with multiple batch issue (backport #41335) (#41338)

    fix: pick list with multiple batch issue (#41335)
    
    fix: pick list with batchb issue
    (cherry picked from commit ebfbe94)
    
    Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
    mergify[bot] and rohitwaghchaure committed May 6, 2024
    Configuration menu
    Copy the full SHA
    1b1dfa8 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    5c1043f View commit details
    Browse the repository at this point in the history
  8. fix: missing Item Name on Save for Quotation created from Item (backp…

    …ort #41233) (#41304)
    
    fix: missing Item Name on Save for Quotation created from Item (#41233)
    
    * fix: missing Item Name on Save for Quotation created from Item
    
    * fix: missing Item Name on Save for Quotation created from Item
    
    (cherry picked from commit c8e92cb)
    
    Co-authored-by: HENRY Florian <florian.henry@open-concept.pro>
    mergify[bot] and FHenry committed May 6, 2024
    Configuration menu
    Copy the full SHA
    6491577 View commit details
    Browse the repository at this point in the history
  9. fix(Item): allow UOM conversion for non-stock items (backport #41267) (

    …#41346)
    
    Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
    fix(Item): allow UOM conversion for non-stock items (#41267)
    mergify[bot] and barredterra committed May 6, 2024
    Configuration menu
    Copy the full SHA
    cd3ca1e View commit details
    Browse the repository at this point in the history

Commits on May 7, 2024

  1. fix: pricing rule rounding

    Consider a pricing rule of 20:1 with recursion enabled, free items
    should follow the below progression
    
    |   Qty | Free item qty |
    |-------+---------------|
    |  0-19 |             0 |
    | 20-39 |             1 |
    | 40-59 |             2 |
    
    (cherry picked from commit 9bf3742)
    ruthra-kumar authored and mergify[bot] committed May 7, 2024
    Configuration menu
    Copy the full SHA
    b93828c View commit details
    Browse the repository at this point in the history
  2. refactor(test): test floor based rounding

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

    …-41288
    
    fix: pricing rule rounding (backport #41288)
    ruthra-kumar committed May 7, 2024
    Configuration menu
    Copy the full SHA
    6602ce9 View commit details
    Browse the repository at this point in the history
  4. fix: filter validation for batch-wise balance history report (backport

    …#41356) (#41361)
    
    fix: filter validation for batch-wise balance history report (#41356)
    
    fix: filter validation for batchwise balance history report
    (cherry picked from commit 544fc60)
    
    Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
    mergify[bot] and rohitwaghchaure committed May 7, 2024
    Configuration menu
    Copy the full SHA
    913cea0 View commit details
    Browse the repository at this point in the history

Commits on May 8, 2024

  1. perf: index on item code for the Pick List Item doctype (backport #41357

    ) (#41364)
    
    * perf: index on item code for the Pick List Item doctype (#41357)
    
    (cherry picked from commit 0887161)
    
    # Conflicts:
    #	erpnext/stock/doctype/pick_list_item/pick_list_item.json
    
    * chore: fix conflicts
    
    ---------
    
    Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
    mergify[bot] and rohitwaghchaure committed May 8, 2024
    Configuration menu
    Copy the full SHA
    bba738f View commit details
    Browse the repository at this point in the history
  2. fix: Merge debit and credit in transaction currency while merging gle…

    … with similar head
    
    (cherry picked from commit e43697d)
    nabinhait authored and mergify[bot] committed May 8, 2024
    Configuration menu
    Copy the full SHA
    9a58823 View commit details
    Browse the repository at this point in the history
  3. fix: Patch to fix the incorrect debit and credit in transaction currency

    (cherry picked from commit e0d12ba)
    
    # Conflicts:
    #	erpnext/patches.txt
    nabinhait authored and mergify[bot] committed May 8, 2024
    Configuration menu
    Copy the full SHA
    f7e165b View commit details
    Browse the repository at this point in the history
  4. fix: resolved conflict

    nabinhait committed May 8, 2024
    Configuration menu
    Copy the full SHA
    81afdcf View commit details
    Browse the repository at this point in the history
  5. fix: Patch to remove cancelled asset capitalization from asset

    (cherry picked from commit 1951f71)
    nabinhait authored and mergify[bot] committed May 8, 2024
    Configuration menu
    Copy the full SHA
    a755540 View commit details
    Browse the repository at this point in the history
  6. fix: resolved conflict

    nabinhait committed May 8, 2024
    Configuration menu
    Copy the full SHA
    5039f45 View commit details
    Browse the repository at this point in the history
  7. Merge pull request #41383 from frappe/mergify/bp/version-15-hotfix/pr…

    …-40121
    
    fix: Patch to remove cancelled asset capitalization from asset (backport #40121)
    nabinhait committed May 8, 2024
    Configuration menu
    Copy the full SHA
    0b20a5d View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    4dd58ab View commit details
    Browse the repository at this point in the history
  9. Merge pull request #41380 from frappe/mergify/bp/version-15-hotfix/pr…

    …-41236
    
    fix: Merge debit and credit in transaction currency while merging gle with similar head (backport #41236)
    nabinhait committed May 8, 2024
    Configuration menu
    Copy the full SHA
    d4aae4f View commit details
    Browse the repository at this point in the history
  10. fix: incorrect qty picked in the pick list (backport #41378) (#41381)

    fix: incorrect qty picked in the pick list (#41378)
    
    (cherry picked from commit 5ed1b6b)
    
    Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
    mergify[bot] and rohitwaghchaure committed May 8, 2024
    Configuration menu
    Copy the full SHA
    a293ec0 View commit details
    Browse the repository at this point in the history

Commits on May 9, 2024

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