nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-31 10:49:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: Add totals row when Grouped By Invoice

Browse Source 
(cherry picked from commit 582a7ae964)
This commit is contained in:
GangaManoj
2021-11-16 02:33:51 +05:30
committed by mergify-bot
parent 826d4051a8
commit 85bf2574be
1 changed files with 21 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
erpnext/accounts/report/gross_profit/gross_profit.py
View File

@@ -246,6 +246,7 @@ class GrossProfitGenerator(object):
self.add_to_totals(new_row) self.add_to_totals(new_row)
else: else:
for i, row in enumerate(self.grouped[key]): for i, row in enumerate(self.grouped[key]):
if row.indent == 1.0:
if row.parent in self.returned_invoices \ if row.parent in self.returned_invoices \
and row.item_code in self.returned_invoices[row.parent]: and row.item_code in self.returned_invoices[row.parent]:
returned_item_rows = self.returned_invoices[row.parent][row.item_code] returned_item_rows = self.returned_invoices[row.parent][row.item_code]
@@ -257,7 +258,15 @@ class GrossProfitGenerator(object):
row = self.set_average_rate(row) row = self.set_average_rate(row)
self.grouped_data.append(row) self.grouped_data.append(row)
self.add_to_totals(row) self.add_to_totals(row)
self.set_average_gross_profit(self.totals) self.set_average_gross_profit(self.totals)
if self.filters.get("group_by") == "Invoice":
self.totals.indent = 0.0
self.totals.parent_invoice = ""
self.totals.parent = "Totals"
self.si_list.append(self.totals)
else:
self.grouped_data.append(self.totals) self.grouped_data.append(self.totals)
def is_not_invoice_row(self, row): def is_not_invoice_row(self, row):