File tree Expand file tree Collapse file tree 1 file changed +9
-4
lines changed
erpnext/accounts/report/gross_and_net_profit_report Expand file tree Collapse file tree 1 file changed +9
-4
lines changed Original file line number Diff line number Diff line change @@ -219,13 +219,18 @@ def get_net_profit(
219219
220220 has_value = False
221221
222+ gross_income_roots = [row for row in (gross_income or []) if not flt (row .get ("indent" ))]
223+ non_gross_income_roots = [row for row in (non_gross_income or []) if not flt (row .get ("indent" ))]
224+ gross_expense_roots = [row for row in (gross_expense or []) if not flt (row .get ("indent" ))]
225+ non_gross_expense_roots = [row for row in (non_gross_expense or []) if not flt (row .get ("indent" ))]
226+
222227 for period in period_list :
223228 key = period if consolidated else period .key
224- gross_income_for_period = flt (gross_income [0 ].get (key , 0 )) if gross_income else 0
225- non_gross_income_for_period = flt (non_gross_income [0 ].get (key , 0 )) if non_gross_income else 0
226229
227- gross_expense_for_period = flt (gross_expense [0 ].get (key , 0 )) if gross_expense else 0
228- non_gross_expense_for_period = flt (non_gross_expense [0 ].get (key , 0 )) if non_gross_expense else 0
230+ gross_income_for_period = sum (flt (row .get (key , 0 )) for row in gross_income_roots )
231+ non_gross_income_for_period = sum (flt (row .get (key , 0 )) for row in non_gross_income_roots )
232+ gross_expense_for_period = sum (flt (row .get (key , 0 )) for row in gross_expense_roots )
233+ non_gross_expense_for_period = sum (flt (row .get (key , 0 )) for row in non_gross_expense_roots )
229234
230235 total_income = gross_income_for_period + non_gross_income_for_period
231236 total_expense = gross_expense_for_period + non_gross_expense_for_period
You can’t perform that action at this time.
0 commit comments