Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed merge conflict

Browse Source
This commit is contained in:
Nabin Hait 2018-04-18 11:54:46 +05:30
parent ee09408dcc
commit f164203520
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py
View File

@ -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") + "'",