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

fix: Discount and taxes in return document should follow the reference document (backport #41911) #42573

Merged
merged 2 commits into from
Sep 2, 2024
Merged

fix: Discount and taxes in return document should follow the reference document (backport #41911) #42573

merged 2 commits into from
Sep 2, 2024

Commits on Aug 1, 2024

  1. fix: Discount and taxes in return document should follow the referenc… 

    …e document (#41911)

* fix: Discount and taxes in return document should follow the reference document

* fix: Ignore Pricing rule on debit/credit note if created against PI/SI with test cases

* fix: linter issue

(cherry picked from commit 2811984)

# Conflicts:
#	erpnext/controllers/sales_and_purchase_return.py
    @nabinhait @mergify
    nabinhait authored and mergify[bot] committed Aug 1, 2024
    Configuration menu
    Copy the full SHA
    a170bdd View commit details
    Browse the repository at this point in the history

  2. fix: resolved conflict

    @nabinhait
    nabinhait committed Aug 1, 2024
    Configuration menu
    Copy the full SHA
    8c584ec View commit details
    Browse the repository at this point in the history