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: incorrect valuation rate for items from different warehouses in Gross Profit (backport #42330) #42336

Merged
merged 3 commits into from
Jul 15, 2024
Merged

fix: incorrect valuation rate for items from different warehouses in Gross Profit (backport #42330) #42336

merged 3 commits into from
Jul 15, 2024

Commits on Jul 15, 2024

  1. fix(gross profit): incorrect valuation rate on different warehouses 

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

  2. test(gross profit): valuation rate from different warehouse 

    (cherry picked from commit 577ce5c)

# Conflicts:
#	erpnext/accounts/report/gross_profit/test_gross_profit.py
    @ruthra-kumar @mergify
    ruthra-kumar authored and mergify[bot] committed Jul 15, 2024
    Configuration menu
    Copy the full SHA
    43eec00 View commit details
    Browse the repository at this point in the history

  3. chore: resolve conflict

    @ruthra-kumar
    ruthra-kumar committed Jul 15, 2024
    Configuration menu
    Copy the full SHA
    cc09d0d View commit details
    Browse the repository at this point in the history