From 1f51e718278008fb201eae66a7ea47bdf9398fed Mon Sep 17 00:00:00 2001 From: ShashaQin Date: Mon, 1 Feb 2016 09:32:44 +0800 Subject: [PATCH] Update profit_and_loss_statement.py --- .../profit_and_loss_statement.py | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py b/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py index d26a3fcf9f9..42dead4ee07 100644 --- a/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py +++ b/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py @@ -10,8 +10,8 @@ from erpnext.accounts.report.financial_statements import (get_period_list, get_c def execute(filters=None): period_list = get_period_list(filters.fiscal_year, filters.periodicity) - income = get_data(filters.company, "Income", "Credit", period_list, ignore_closing_entries=True) - expense = get_data(filters.company, "Expense", "Debit", period_list, ignore_closing_entries=True) + income = get_data(filters.company, "Income", "Credit", period_list, filters.accumulated_value, ignore_closing_entries=True) + expense = get_data(filters.company, "Expense", "Debit", period_list, filters.accumulated_value, ignore_closing_entries=True) net_profit_loss = get_net_profit_loss(income, expense, period_list, filters.company) data = [] @@ -20,7 +20,7 @@ def execute(filters=None): if net_profit_loss: data.append(net_profit_loss) - columns = get_columns(period_list, filters.company) + columns = get_columns(filters.periodicity,period_list,filters.accumulated_value) return columns, data @@ -33,7 +33,17 @@ def get_net_profit_loss(income, expense, period_list, company): "currency": frappe.db.get_value("Company", company, "default_currency") } + has_value = False + for period in period_list: net_profit_loss[period.key] = flt(income[-2][period.key] - expense[-2][period.key], 3) + + if net_profit_loss[period.key]: + has_value=True + + total_column=total_column+net_profit_loss[period.key] + net_profit_loss["total"]=total_column + + if has_value: - return net_profit_loss + return net_profit_loss