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

[fix] Added total closing in general ledger (#11961)

Browse Source
This commit is contained in:
rohitwaghchaure 2017-12-13 18:57:37 +05:30 committed by Nabin Hait
parent 40f5d8edd4
commit 5759258dcf
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
erpnext/accounts/report/general_ledger/general_ledger.py
View File

@ -193,6 +193,17 @@ def get_data_with_opening_closing(filters, account_details, gl_entries):
# closing # closing
data.append(totals.closing) data.append(totals.closing)
#total closing
total_closing = totals.total_closing
total_debit = totals.closing.get('debit', 0)
total_credit = totals.closing.get('credit', 0)
debit_in_account_currency = totals.closing.get('debit_in_account_currency', 0)
credit_in_account_currency = totals.closing.get('credit_in_account_currency', 0)
total_closing['debit'] = total_debit - total_credit
total_closing['debit_in_account_currency'] = debit_in_account_currency - credit_in_account_currency
data.append(totals.total_closing)
return data return data
def get_totals_dict(): def get_totals_dict():
@ -207,7 +218,8 @@ def get_totals_dict():
return _dict( return _dict(
opening = _get_debit_credit_dict(_('Opening')), opening = _get_debit_credit_dict(_('Opening')),
total = _get_debit_credit_dict(_('Total')), total = _get_debit_credit_dict(_('Total')),
closing = _get_debit_credit_dict(_('Closing (Opening + Total)')) closing = _get_debit_credit_dict(_('Closing (Opening + Total)')),
total_closing = _get_debit_credit_dict(_('Closing Balance (Dr - Cr)'))
) )
def initialize_gle_map(gl_entries): def initialize_gle_map(gl_entries):