From f1642035209b0b4d41bb2b0139573d43cc9e1e43 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Wed, 18 Apr 2018 11:54:46 +0530 Subject: [PATCH] Fixed merge conflict --- .../profit_and_loss_statement/profit_and_loss_statement.py | 6 +----- 1 file changed, 1 insertion(+), 5 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 249d9d301c5..8687dce1a44 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 @@ -33,11 +33,7 @@ def execute(filters=None): return columns, data, None, chart -<<<<<<< HEAD -def get_net_profit_loss(income, expense, period_list, company, currency=None): -======= -def get_net_profit_loss(income, expense, period_list, company, consolidated=False): ->>>>>>> Consolidated financial statement (#13678) +def get_net_profit_loss(income, expense, period_list, company, currency=None, consolidated=False): total = 0 net_profit_loss = { "account_name": "'" + _("Profit for the year") + "'",