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

Update bank_reconciliation_statement.py

Browse Source
This commit is contained in:
RicardoJohann 2016-01-20 13:36:36 +08:00
parent 6f9afffd8a
commit e095eeb084
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -39,18 +39,18 @@ def execute(filters=None):
+ amounts_not_reflected_in_system + amounts_not_reflected_in_system
data += [ data += [
get_balance_row(_("System Balance"), balance_as_per_system, account_currency), get_balance_row(_("Bank Statement balance as per General Ledger"), balance_as_per_system, account_currency),
{}, {},
{ {
"journal_entry": '"' + _("Amounts not reflected in bank") + '"', "journal_entry": _("Outstanding Cheques and Deposits to clear"),
"debit": total_debit, "debit": total_debit,
"credit": total_credit, "credit": total_credit,
"account_currency": account_currency "account_currency": account_currency
}, },
get_balance_row(_("Amounts not reflected in system"), amounts_not_reflected_in_system, get_balance_row(_("Cheques and Deposits incorrectly cleared"), amounts_not_reflected_in_system,
account_currency), account_currency),
{}, {},
get_balance_row(_("Expected balance as per bank"), bank_bal, account_currency) get_balance_row(_("Calculated Bank Statement balance"), bank_bal, account_currency)
] ]
return columns, data return columns, data
@ -129,21 +129,21 @@ def get_entries(filters):
and jvd.account = %(account)s and jv.posting_date <= %(report_date)s and jvd.account = %(account)s and jv.posting_date <= %(report_date)s
and ifnull(jv.clearance_date, '4000-01-01') > %(report_date)s and ifnull(jv.clearance_date, '4000-01-01') > %(report_date)s
and ifnull(jv.is_opening, 'No') = 'No' and ifnull(jv.is_opening, 'No') = 'No'
order by jv.name DESC""", filters, as_dict=1) order by jv.posting_date DESC,jv.name DESC""", filters, as_dict=1)
return entries return entries
def get_balance_row(label, amount, account_currency): def get_balance_row(label, amount, account_currency):
if amount > 0: if amount > 0:
return { return {
"journal_entry": '"' + label + '"', "journal_entry": label,
"debit": amount, "debit": amount,
"credit": 0, "credit": 0,
"account_currency": account_currency "account_currency": account_currency
} }
else: else:
return { return {
"journal_entry": '"' + label + '"', "journal_entry": label,
"debit": 0, "debit": 0,
"credit": abs(amount), "credit": abs(amount),
"account_currency": account_currency "account_currency": account_currency