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

Merged
merged 18 commits into from
Sep 18, 2024
Merged

chore: release v14 #43255

merged 18 commits into from
Sep 18, 2024

Commits on Sep 11, 2024

  1. refactor: enable no-copy on Purchase Invoice status 

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

  2. Merge pull request #43170 from frappe/mergify/copy/version-14-hotfix/… 

    …pr-43169

refactor: enable no-copy on Purchase Invoice status (copy #43169)
    @ruthra-kumar
    ruthra-kumar committed Sep 11, 2024
    Configuration menu
    Copy the full SHA
    77bdf18 View commit details
    Browse the repository at this point in the history

Commits on Sep 13, 2024

  1. fix: delete exchange gain loss journal entry while deleting payment e… 

    …ntry

(cherry picked from commit 9886cf0)
    @Navin-S-R @mergify
    Navin-S-R authored and mergify[bot] committed Sep 13, 2024
    Configuration menu
    Copy the full SHA
    62f1286 View commit details
    Browse the repository at this point in the history

  2. test: add unit test for deletion of gain loss jv while deleting payme… 

    …nt entry

(cherry picked from commit 7855d30)
    @Navin-S-R @mergify
    Navin-S-R authored and mergify[bot] committed Sep 13, 2024
    Configuration menu
    Copy the full SHA
    95a66b8 View commit details
    Browse the repository at this point in the history

  3. refactor(test): use test fixture on pricing rule test suite 

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

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

    …-43192

refactor(test): use test fixture on pricing rule test suite (backport #43192)
    @ruthra-kumar
    ruthra-kumar committed Sep 13, 2024
    Configuration menu
    Copy the full SHA
    73821ac View commit details
    Browse the repository at this point in the history

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

    …-43191

fix: delete exchange gain loss journal entry while deleting payment entry (backport #43191)
    @ruthra-kumar
    ruthra-kumar committed Sep 13, 2024
    Configuration menu
    Copy the full SHA
    2193395 View commit details
    Browse the repository at this point in the history

Commits on Sep 16, 2024

  1. fix: hide and reset discount control on new POS order 

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

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

    …-43176

fix: hide and reset discount control on new POS order (backport #43176)
    @vorasmit
    vorasmit committed Sep 16, 2024
    Configuration menu
    Copy the full SHA
    84447ca View commit details
    Browse the repository at this point in the history

Commits on Sep 17, 2024

  1. fix: invalid gp calculation 

    (cherry picked from commit c798512)
    @rtdany10 @mergify
    rtdany10 authored and mergify[bot] committed Sep 17, 2024
    Configuration menu
    Copy the full SHA
    9af2df3 View commit details
    Browse the repository at this point in the history

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

    …-43188

fix: invalid gp calculation (backport #43188)
    @ruthra-kumar
    ruthra-kumar committed Sep 17, 2024
    Configuration menu
    Copy the full SHA
    dc6d3cc View commit details
    Browse the repository at this point in the history

Commits on Sep 18, 2024

  1. fix: fetch cost center allocation percentage only from the applicable… 

    … allocation

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

  2. test: add unit test for validating multiple cost center allocation wi… 

    …th different child cost center

(cherry picked from commit 4d5d615)
    @venkat102 @mergify
    venkat102 authored and mergify[bot] committed Sep 18, 2024
    Configuration menu
    Copy the full SHA
    872c150 View commit details
    Browse the repository at this point in the history

  3. fix: cancel cost center allocation and journal entry after test 

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

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

    …-43216

fix: get cost center allocation percentage only from the applicable allocation (backport #43216)
    @ruthra-kumar
    ruthra-kumar committed Sep 18, 2024
    Configuration menu
    Copy the full SHA
    eed7eba View commit details
    Browse the repository at this point in the history

  5. fix: add currency in options for rate field in pricing rule 

    (cherry picked from commit 636c013)

# Conflicts:
#	erpnext/accounts/doctype/pricing_rule/pricing_rule.json
    @Yesha-Krishna @mergify
    Yesha-Krishna authored and mergify[bot] committed Sep 18, 2024
    Configuration menu
    Copy the full SHA
    c9467f4 View commit details
    Browse the repository at this point in the history

  6. chore: resolve conflict

    @ruthra-kumar
    ruthra-kumar committed Sep 18, 2024
    Configuration menu
    Copy the full SHA
    fff8f8b View commit details
    Browse the repository at this point in the history

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

    …-43239

fix: add currency in options for rate field in pricing rule (backport #43239)
    @ruthra-kumar
    ruthra-kumar committed Sep 18, 2024
    Configuration menu
    Copy the full SHA
    c442dc6 View commit details
    Browse the repository at this point in the history