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

chore: release v15 #43361

Merged
merged 51 commits into from
Sep 25, 2024
Merged

chore: release v15 #43361

merged 51 commits into from
Sep 25, 2024

Commits on Sep 13, 2024

  1. fix: Payment Ledger Report currency fieldtype fix

    @sameer55chauhan
    sameer55chauhan authored Sep 13, 2024
    Configuration menu
    Copy the full SHA
    ad2d6a1 View commit details
    Browse the repository at this point in the history

Commits on Sep 18, 2024

  1. fix: Translation for button SO to PO 

    (cherry picked from commit a5275e9)
    @Nihantra-Patel @mergify
    Nihantra-Patel authored and mergify[bot] committed Sep 18, 2024
    Configuration menu
    Copy the full SHA
    73d98ad View commit details
    Browse the repository at this point in the history

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

    …-43276

fix: Translation for button SO to PO (backport #43276)
    @Nihantra-Patel
    Nihantra-Patel authored Sep 18, 2024
    Configuration menu
    Copy the full SHA
    680354a View commit details
    Browse the repository at this point in the history

  3. fix: create_address is failing 

    (cherry picked from commit acc1d52)
    @shariquerik @mergify
    shariquerik authored and mergify[bot] committed Sep 18, 2024
    Configuration menu
    Copy the full SHA
    557ef5d View commit details
    Browse the repository at this point in the history

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

    …-43279

fix: create_address is failing while creating customer (backport #43279)
    @shariquerik
    shariquerik authored Sep 18, 2024
    Configuration menu
    Copy the full SHA
    953b579 View commit details
    Browse the repository at this point in the history

Commits on Sep 19, 2024

  1. Merge pull request #43213 from sameer55chauhan/patch-4 

    fix: Payment Ledger Report currency fieldtype fix
    @ruthra-kumar
    ruthra-kumar authored Sep 19, 2024
    Configuration menu
    Copy the full SHA
    34d159b View commit details
    Browse the repository at this point in the history

  2. fix: translate in js 

    (cherry picked from commit 25faec5)
    @doancan @mergify
    doancan authored and mergify[bot] committed Sep 19, 2024
    Configuration menu
    Copy the full SHA
    84e26e2 View commit details
    Browse the repository at this point in the history

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

    …-43274

fix: translate in js (backport #43274)
    @ruthra-kumar
    ruthra-kumar authored Sep 19, 2024
    Configuration menu
    Copy the full SHA
    e90532e View commit details
    Browse the repository at this point in the history

  4. fix: incorrect stock balance for inventory dimension (backport #43284) ( 

    #43290)

fix: incorrect stock balance for inventory dimension (#43284)

(cherry picked from commit 3e7a7a5)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
    @mergify @rohitwaghchaure
    mergify[bot] and rohitwaghchaure authored Sep 19, 2024
    Configuration menu
    Copy the full SHA
    f6725e2 View commit details
    Browse the repository at this point in the history

Commits on Sep 21, 2024

  1. refactor: use common functionality to validate account number (#42842) 

    feat: Allow unique Account number by root type (not unique for accros all Accounts)
(cherry picked from commit 40d97f4)
    @FHenry @mergify
    FHenry authored and mergify[bot] committed Sep 21, 2024
    Configuration menu
    Copy the full SHA
    86ae644 View commit details
    Browse the repository at this point in the history

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

    …-42842

refactor: use common functionality to validate account number (backport #42842)
    @vorasmit
    vorasmit authored Sep 21, 2024
    Configuration menu
    Copy the full SHA
    d1c72dc View commit details
    Browse the repository at this point in the history

Commits on Sep 22, 2024

  1. fix: ui clean-up (backport #43305) (#43312) 

    * fix: ui clean-up (#43305)

fix: ui cleanup
(cherry picked from commit b127a0c)

# Conflicts:
#	erpnext/manufacturing/doctype/bom_creator/bom_creator.json
#	erpnext/manufacturing/doctype/plant_floor/plant_floor.json
#	erpnext/public/js/templates/visual_plant_floor_template.html

* chore: fix conflicts

* chore: fix conflicts

* chore: fix conflicts

---------

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
    @mergify @rohitwaghchaure
    mergify[bot] and rohitwaghchaure authored Sep 22, 2024
    Configuration menu
    Copy the full SHA
    7e6d6f0 View commit details
    Browse the repository at this point in the history

Commits on Sep 23, 2024

  1. fix: make to tax category on tax rule to filter with percent 

    (cherry picked from commit 3aaa13c)
    @venkat102 @mergify
    venkat102 authored and mergify[bot] committed Sep 23, 2024
    Configuration menu
    Copy the full SHA
    63d4fdd View commit details
    Browse the repository at this point in the history

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

    …-43328

fix: allow tax rule filter on tax category name with % (backport #43328)
    @ruthra-kumar
    ruthra-kumar authored Sep 23, 2024
    Configuration menu
    Copy the full SHA
    250a1c9 View commit details
    Browse the repository at this point in the history

  3. fix: handle missing liability account scenario in `set_liability_acco… 

    …unt`

(cherry picked from commit ee7ab4b)
    @ljain112 @mergify
    ljain112 authored and mergify[bot] committed Sep 23, 2024
    Configuration menu
    Copy the full SHA
    4045928 View commit details
    Browse the repository at this point in the history

  4. fix: transaction exchange rate on GL's for Multi currency Journals 

    (cherry picked from commit 8cd9ad5)
    @ruthra-kumar @mergify
    ruthra-kumar authored and mergify[bot] committed Sep 23, 2024
    Configuration menu
    Copy the full SHA
    a7ccc94 View commit details
    Browse the repository at this point in the history

  5. test: transaction exchange rate on multi-currency journals 

    (cherry picked from commit c524825)
    @ruthra-kumar @mergify
    ruthra-kumar authored and mergify[bot] committed Sep 23, 2024
    Configuration menu
    Copy the full SHA
    2d91428 View commit details
    Browse the repository at this point in the history

  6. fix: incorrect outstanding on non-pos invoice with write_off_account 

    (cherry picked from commit d5e2906)
    @ruthra-kumar @mergify
    ruthra-kumar authored and mergify[bot] committed Sep 23, 2024
    Configuration menu
    Copy the full SHA
    f89a3db View commit details
    Browse the repository at this point in the history

  7. fix: show chart tool tip in report currency 

    (cherry picked from commit 827b3f4)
    @venkat102 @mergify
    venkat102 authored and mergify[bot] committed Sep 23, 2024
    Configuration menu
    Copy the full SHA
    e5ae828 View commit details
    Browse the repository at this point in the history

  8. fix: add currency in financial statement 

    (cherry picked from commit 91a27bd)
    @venkat102 @mergify
    venkat102 authored and mergify[bot] committed Sep 23, 2024
    Configuration menu
    Copy the full SHA
    927f800 View commit details
    Browse the repository at this point in the history

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

    …-43321

fix: handle missing liability account scenario in `set_liability_account` (backport #43321)
    @ruthra-kumar
    ruthra-kumar authored Sep 23, 2024
    Configuration menu
    Copy the full SHA
    e8c174c View commit details
    Browse the repository at this point in the history

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

    …-43331

fix: transaction exchange rate on GL's for Multi currency Journals (backport #43331)
    @ruthra-kumar
    ruthra-kumar authored Sep 23, 2024
    Configuration menu
    Copy the full SHA
    a0f01da View commit details
    Browse the repository at this point in the history

  11. fix: change dynamic link doctype fieldtype to data 

    (cherry picked from commit 1e46f73)
    @venkat102 @mergify
    venkat102 authored and mergify[bot] committed Sep 23, 2024
    Configuration menu
    Copy the full SHA
    05c92cc View commit details
    Browse the repository at this point in the history

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

    …-43307

fix: change dynamic link doctype fieldtype to data (backport #43307)
    @ruthra-kumar
    ruthra-kumar authored Sep 23, 2024
    Configuration menu
    Copy the full SHA
    5920525 View commit details
    Browse the repository at this point in the history

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

    …-43308

fix: show chart tool tip in report currency (backport #43308)
    @ruthra-kumar
    ruthra-kumar authored Sep 23, 2024
    Configuration menu
    Copy the full SHA
    15baa3f View commit details
    Browse the repository at this point in the history

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

    …-43316

fix: incorrect outstanding on non-pos invoice with write_off_account (backport #43316)
    @ruthra-kumar
    ruthra-kumar authored Sep 23, 2024
    Configuration menu
    Copy the full SHA
    0fd2964 View commit details
    Browse the repository at this point in the history

  15. fix: partial return on POS invoice 

    (cherry picked from commit 76289fa)
    @Nihantra-Patel @mergify
    Nihantra-Patel authored and mergify[bot] committed Sep 23, 2024
    Configuration menu
    Copy the full SHA
    b99ca7d View commit details
    Browse the repository at this point in the history

  16. fix: partial return on POS invoice 

    (cherry picked from commit 18bdd06)
    @Nihantra-Patel @mergify
    Nihantra-Patel authored and mergify[bot] committed Sep 23, 2024
    Configuration menu
    Copy the full SHA
    998fef7 View commit details
    Browse the repository at this point in the history

  17. fix(Payment Reconciliation): German translations 

    (cherry picked from commit 32d4f96)
    @barredterra @mergify
    barredterra authored and mergify[bot] committed Sep 23, 2024
    Configuration menu
    Copy the full SHA
    e06a01f View commit details
    Browse the repository at this point in the history

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

    …-43299

fix(Payment Reconciliation): German translations (backport #43299)
    @ruthra-kumar
    ruthra-kumar authored Sep 23, 2024
    Configuration menu
    Copy the full SHA
    5f08ef5 View commit details
    Browse the repository at this point in the history

  19. fix: shipping rule must match the company 

    (cherry picked from commit df8f408)
    @barredterra @mergify
    barredterra authored and mergify[bot] committed Sep 23, 2024
    Configuration menu
    Copy the full SHA
    085a4c6 View commit details
    Browse the repository at this point in the history

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

    …-43253

fix: partial return on POS invoice (backport #43253)
    @Nihantra-Patel
    Nihantra-Patel authored Sep 23, 2024
    Configuration menu
    Copy the full SHA
    4cec68c View commit details
    Browse the repository at this point in the history

Commits on Sep 24, 2024

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

    …-43283

fix: shipping rule must match the company (backport #43283)
    @ruthra-kumar
    ruthra-kumar authored Sep 24, 2024
    Configuration menu
    Copy the full SHA
    b415e85 View commit details
    Browse the repository at this point in the history

  2. fix: item_query in pos_invoice 

    (cherry picked from commit 7f82a06)
    @ljain112 @mergify
    ljain112 authored and mergify[bot] committed Sep 24, 2024
    Configuration menu
    Copy the full SHA
    99e004b View commit details
    Browse the repository at this point in the history

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

    …-43257

fix: item_query in pos_invoice (backport #43257)
    @ruthra-kumar
    ruthra-kumar authored Sep 24, 2024
    Configuration menu
    Copy the full SHA
    2aa1380 View commit details
    Browse the repository at this point in the history

  4. fix: update clearance date in invoice payment table 

    (cherry picked from commit 487c2a2)
    @kavin-114 @mergify
    kavin-114 authored and mergify[bot] committed Sep 24, 2024
    Configuration menu
    Copy the full SHA
    10ecdb9 View commit details
    Browse the repository at this point in the history

  5. test: add test case for updating clearance date on pos invoice 

    (cherry picked from commit ce86005)
    @kavin-114 @mergify
    kavin-114 authored and mergify[bot] committed Sep 24, 2024
    Configuration menu
    Copy the full SHA
    9d2cbcc View commit details
    Browse the repository at this point in the history

  6. refactor: update clearance date in payment entry 

    (cherry picked from commit c218f75)
    @kavin-114 @mergify
    kavin-114 authored and mergify[bot] committed Sep 24, 2024
    Configuration menu
    Copy the full SHA
    8bc76ba View commit details
    Browse the repository at this point in the history

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

    …-43310

fix: update clearance date in invoice payment table (backport #43310)
    @ruthra-kumar
    ruthra-kumar authored Sep 24, 2024
    Configuration menu
    Copy the full SHA
    7db135d View commit details
    Browse the repository at this point in the history

  8. fix: set group_by condition if empty and voucher_no is set 

    (cherry picked from commit a6b0cb6)
    @vishakhdesai @mergify
    vishakhdesai authored and mergify[bot] committed Sep 24, 2024
    Configuration menu
    Copy the full SHA
    ec27077 View commit details
    Browse the repository at this point in the history

  9. fix: stock dashboard (backport #43347) (#43349) 

    fix: stock dashboard (#43347)

(cherry picked from commit 9e8be8d)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
    @mergify @rohitwaghchaure
    mergify[bot] and rohitwaghchaure authored Sep 24, 2024
    Configuration menu
    Copy the full SHA
    176feb2 View commit details
    Browse the repository at this point in the history

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

    …-43235

fix: set group_by condition to "Group by Voucher (Consolidated)" if `None` and voucher_no is set (backport #43235)
    @ruthra-kumar
    ruthra-kumar authored Sep 24, 2024
    Configuration menu
    Copy the full SHA
    49d5b7c View commit details
    Browse the repository at this point in the history

  11. fix: AR / AP report to ignore 0.0 outstanding 

    (cherry picked from commit 6e2cf79)
    @ruthra-kumar @mergify
    ruthra-kumar authored and mergify[bot] committed Sep 24, 2024
    Configuration menu
    Copy the full SHA
    979d801 View commit details
    Browse the repository at this point in the history

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

    …-43356

fix: AR / AP report to ignore 0.0 outstanding (backport #43356)
    @ruthra-kumar
    ruthra-kumar authored Sep 24, 2024
    Configuration menu
    Copy the full SHA
    b17a811 View commit details
    Browse the repository at this point in the history

  13. fix: added date condition

    @khushi8112
    khushi8112 committed Sep 24, 2024
    Configuration menu
    Copy the full SHA
    0e18845 View commit details
    Browse the repository at this point in the history

  14. fix(minor): include condition to check docstatus

    @khushi8112
    khushi8112 committed Sep 24, 2024
    Configuration menu
    Copy the full SHA
    1f42302 View commit details
    Browse the repository at this point in the history

  15. style: added comment

    @khushi8112
    khushi8112 committed Sep 24, 2024
    Configuration menu
    Copy the full SHA
    4e621b0 View commit details
    Browse the repository at this point in the history

  16. Merge pull request #43370 from khushi8112/manual-backport-for-asset-d… 

    …epreciation-and-balances-report-fix

fix: Manual backport for asset depreciation and balances report fix
    @khushi8112
    khushi8112 authored Sep 24, 2024
    Configuration menu
    Copy the full SHA
    fe206b0 View commit details
    Browse the repository at this point in the history

  17. fix(Bank Account): dashboard connections (backport #43365) (#43367) 

    Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
fix(Bank Account): dashboard connections (#43365)
    @mergify
    mergify[bot] authored Sep 24, 2024
    Configuration menu
    Copy the full SHA
    cfea2de View commit details
    Browse the repository at this point in the history

  18. fix: closing amount reset to expected amount on save (backport #43358) ( 

    #43368)

fix: closing amount reset to expected amount on save (#43358)

(cherry picked from commit 9974b7c)

Co-authored-by: jabir-elat <44110258+jabir-elat@users.noreply.github.com>
    @mergify @jabir-elat
    mergify[bot] and jabir-elat authored Sep 24, 2024
    Configuration menu
    Copy the full SHA
    0722aa5 View commit details
    Browse the repository at this point in the history

  19. fix: not able to cancel Quality Inspection (backport #43374) (#43375) 

    fix: not able to cancel Quality Inspection (#43374)

(cherry picked from commit 8c32ebe)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
    @mergify @rohitwaghchaure
    mergify[bot] and rohitwaghchaure authored Sep 24, 2024
    Configuration menu
    Copy the full SHA
    40fbb1d View commit details
    Browse the repository at this point in the history