mirror of
https://github.com/frappe/erpnext.git
synced 2026-06-08 15:42:52 +00:00
fix: update add_total_row_account to control blank row addition
This commit is contained in:
@@ -132,7 +132,14 @@ def execute(filters=None):
|
|||||||
)
|
)
|
||||||
|
|
||||||
net_change_in_cash = add_total_row_account(
|
net_change_in_cash = add_total_row_account(
|
||||||
data, data, _("Net Change in Cash"), period_list, company_currency, summary_data, filters
|
data,
|
||||||
|
data,
|
||||||
|
_("Net Change in Cash"),
|
||||||
|
period_list,
|
||||||
|
company_currency,
|
||||||
|
summary_data,
|
||||||
|
filters,
|
||||||
|
add_blank_row=False,
|
||||||
)
|
)
|
||||||
|
|
||||||
if filters.show_opening_and_closing_balance:
|
if filters.show_opening_and_closing_balance:
|
||||||
@@ -250,7 +257,17 @@ def get_start_date(period, accumulated_values, company):
|
|||||||
return start_date
|
return start_date
|
||||||
|
|
||||||
|
|
||||||
def add_total_row_account(out, data, label, period_list, currency, summary_data, filters, consolidated=False):
|
def add_total_row_account(
|
||||||
|
out,
|
||||||
|
data,
|
||||||
|
label,
|
||||||
|
period_list,
|
||||||
|
currency,
|
||||||
|
summary_data,
|
||||||
|
filters,
|
||||||
|
consolidated=False,
|
||||||
|
add_blank_row=True,
|
||||||
|
):
|
||||||
total_row = {
|
total_row = {
|
||||||
"section_name": "'" + _("{0}").format(label) + "'",
|
"section_name": "'" + _("{0}").format(label) + "'",
|
||||||
"section": "'" + _("{0}").format(label) + "'",
|
"section": "'" + _("{0}").format(label) + "'",
|
||||||
@@ -275,6 +292,8 @@ def add_total_row_account(out, data, label, period_list, currency, summary_data,
|
|||||||
total_row["total"] += row["total"]
|
total_row["total"] += row["total"]
|
||||||
|
|
||||||
out.append(total_row)
|
out.append(total_row)
|
||||||
|
|
||||||
|
if add_blank_row:
|
||||||
out.append({})
|
out.append({})
|
||||||
|
|
||||||
return total_row
|
return total_row
|
||||||
|
|||||||
Reference in New Issue
Block a user