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 #45548

Merged
merged 7 commits into from
Jan 29, 2025

Conversation

Sanket322
Copy link
Contributor

@Sanket322 Sanket322 commented Jan 27, 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

@github-actions github-actions bot added the needs-tests This PR needs automated unit-tests. label Jan 27, 2025
@ljain112 ljain112 marked this pull request as draft January 27, 2025 13:52
@Sanket322 Sanket322 changed the title fix: Gross Profit Total fix: Gross Profit Gross Profit and Gross Percentage Jan 27, 2025
@Sanket322 Sanket322 marked this pull request as ready for review January 27, 2025 14:29
@Sanket322 Sanket322 changed the title fix: Gross Profit Gross Profit and Gross Percentage fix: Gross Profit Report with Correct Totals Jan 28, 2025
@ljain112 ljain112 added backport version-14-hotfix backport to version 14 backport version-15-hotfix and removed needs-tests This PR needs automated unit-tests. labels Jan 29, 2025
@vorasmit vorasmit marked this pull request as draft January 29, 2025 07:52
@Sanket322 Sanket322 marked this pull request as ready for review January 29, 2025 08:47
@ljain112 ljain112 requested a review from vorasmit January 29, 2025 10:13
@vorasmit vorasmit changed the title fix: Gross Profit Report with Correct Totals fix: Gross Profit Report with Correct Totals and Gross Margin Jan 29, 2025
@vorasmit vorasmit merged commit aaf720a into frappe:develop Jan 29, 2025
14 checks passed
mergify bot pushed a commit that referenced this pull request Jan 29, 2025
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 bot pushed a commit that referenced this pull request Jan 29, 2025
Co-authored-by: Sanket322 <shahsanket322003.com>
(cherry picked from commit aaf720a)
nabinhait pushed a commit that referenced this pull request Jan 30, 2025
#45548) (#45598)

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

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

Co-authored-by: Sanket Shah <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Gross Profit Report error
3 participants