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: Add extra column to display Invoice or Item when grouped by Invoice #28380

Merged
merged 3 commits into from
Nov 22, 2021

Conversation

GangaManoj
Copy link
Contributor

Problem:

The Gross Profit report uses a variable called parent to represent Sales Invoices. While modifying the report to accommodate Product Bundles in #27124, I'd modified the parent variable to represent either the name of the Invoice or the Item Code. However, this seems to have caused a problem with the calculation of Buying Amounts.

Fix:

  • Undo the changes made to parent
  • Replace the parent column with a new column called invoice_or_item to display the items included in an Invoice in tree form.
Testing Info
  1. Open the Gross Profit Report.
  2. Group by Invoice.
  3. Check if the Sales Invoice column still displays all the Invoices and their Items in tree form.

@codecov
Copy link

codecov bot commented Nov 16, 2021

Codecov Report

Merging #28380 (ecc2e79) into develop (293f6cb) will increase coverage by 0.04%.
The diff coverage is 48.50%.

@@             Coverage Diff             @@
##           develop   #28380      +/-   ##
===========================================
+ Coverage    55.24%   55.28%   +0.04%     
===========================================
  Files         1119     1119              
  Lines        66568    66598      +30     
===========================================
+ Hits         36775    36819      +44     
+ Misses       29793    29779      -14     
Impacted Files Coverage Δ
...nk_reconciliation_tool/bank_reconciliation_tool.py 44.11% <0.00%> (ø)
...xt/accounts/doctype/sales_invoice/sales_invoice.py 78.81% <ø> (ø)
erpnext/accounts/report/financial_statements.py 29.65% <ø> (ø)
...pnext/accounts/report/gross_profit/gross_profit.py 0.00% <0.00%> (ø)
erpnext/crm/doctype/competitor/competitor.py 0.00% <0.00%> (ø)
..._integrations/connectors/woocommerce_connection.py 76.92% <ø> (ø)
...rations/doctype/taxjar_settings/taxjar_settings.py 28.33% <ø> (ø)
erpnext/erpnext_integrations/utils.py 42.22% <ø> (ø)
.../payroll/report/salary_register/salary_register.py 0.00% <0.00%> (ø)
erpnext/regional/report/gstr_1/gstr_1.py 0.00% <0.00%> (ø)
... and 83 more

@nextchamp-saqib
Copy link
Member

@Mergifyio backport version-13-hotfix

@mergify
Copy link
Contributor

mergify bot commented Nov 22, 2021

backport version-13-hotfix

🟠 Waiting for conditions to match

  • merged [:pushpin: backport requirement]

@mergify
Copy link
Contributor

mergify bot commented Nov 22, 2021

backport version-13-hotfix

✅ Backports have been created

mergify bot pushed a commit that referenced this pull request Nov 22, 2021
conncampbell pushed a commit to conncampbell/erpnext that referenced this pull request Jan 9, 2022
conncampbell pushed a commit to conncampbell/erpnext that referenced this pull request Jan 9, 2022
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.

None yet

2 participants