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

Merge pull request #4425 from nabinhait/bank_reco_fix

Browse Source 
[fix] Fixed amounts not reflected in bank
This commit is contained in:
Nabin Hait 2015-12-05 12:42:20 +05:30
commit 1a19c05ef0
2 changed files with 27 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
erpnext/accounts/doctype/bank_reconciliation_detail/bank_reconciliation_detail.json
View File

@ -193,7 +193,7 @@
"hidden": 0, "hidden": 0,
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"in_filter": 0, "in_filter": 0,
"in_list_view": 1, "in_list_view": 0,
"label": "Cheque Date", "label": "Cheque Date",
"length": 0, "length": 0,
"no_copy": 0, "no_copy": 0,
@ -233,6 +233,29 @@
"search_index": 0, "search_index": 0,
"set_only_once": 0, "set_only_once": 0,
"unique": 0 "unique": 0
},
{
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
"fieldname": "data_10",
"fieldtype": "Data",
"hidden": 0,
"ignore_user_permissions": 0,
"in_filter": 0,
"in_list_view": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
"precision": "",
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
"set_only_once": 0,
"unique": 0
} }
], ],
"hide_heading": 0, "hide_heading": 0,
@ -245,7 +268,7 @@
"istable": 1, "istable": 1,
"max_attachments": 0, "max_attachments": 0,
"menu_index": 0, "menu_index": 0,
"modified": "2015-11-30 12:52:01.090839", "modified": "2015-12-04 11:01:24.286320",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Accounts", "module": "Accounts",
"name": "Bank Reconciliation Detail", "name": "Bank Reconciliation Detail",

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

@ -22,8 +22,8 @@ def execute(filters=None):
total_debit, total_credit = 0,0 total_debit, total_credit = 0,0
for d in data: for d in data:
total_debit += flt(d.debit_in_account_currency) total_debit += flt(d.debit)
total_credit += flt(d.credit_in_account_currency) total_credit += flt(d.credit)
amounts_not_reflected_in_system = frappe.db.sql(""" amounts_not_reflected_in_system = frappe.db.sql("""
select sum(jvd.debit_in_account_currency - jvd.credit_in_account_currency) select sum(jvd.debit_in_account_currency - jvd.credit_in_account_currency)