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

fix: Gross Profit Report with Correct Totals and Gross Margin (backport #45548) #45597

Open
wants to merge 2 commits into
base: version-14-hotfix
Choose a base branch
from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jan 29, 2025

Support ticket: Support Ticket - 30225

Before :
The add_total_row option was checked, causing the subtotals to combine, which resulted in an incorrect Selling Amount, Buying Amount, Gross Profit, Gross Profit Percentage.

Screenshot 2025-01-27 at 6 55 10 PM

After :
The total Selling Amount and Buying Amount are now calculated correctly.
The total Gross Profit and Gross Profit Percentage is calculated using a formula.
The add_total_row option was disabled using a patch.

Screenshot 2025-01-27 at 9 58 45 PM
This is an automatic backport of pull request #45548 done by [Mergify](https://mergify.com).

Co-authored-by: Sanket322 <shahsanket322003.com>
(cherry picked from commit aaf720a)

# Conflicts:
#	erpnext/accounts/report/gross_profit/test_gross_profit.py
#	erpnext/patches.txt
@mergify mergify bot requested a review from deepeshgarg007 as a code owner January 29, 2025 11:14
@mergify mergify bot added the conflicts label Jan 29, 2025
@mergify mergify bot requested a review from ruthra-kumar as a code owner January 29, 2025 11:14
Copy link
Contributor Author

mergify bot commented Jan 29, 2025

Cherry-pick of aaf720a has failed:

On branch mergify/bp/version-14-hotfix/pr-45548
Your branch is up to date with 'origin/version-14-hotfix'.

You are currently cherry-picking commit aaf720ab61.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   erpnext/accounts/report/gross_profit/gross_profit.json
	modified:   erpnext/accounts/report/gross_profit/gross_profit.py
	new file:   erpnext/patches/v14_0/disable_add_row_in_gross_profit.py

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   erpnext/accounts/report/gross_profit/test_gross_profit.py
	both modified:   erpnext/patches.txt

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants