From 9547b774f74c8cb870935e4485125f764f4fef40 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Fri, 4 Dec 2015 11:03:07 +0530 Subject: [PATCH] [fix] Fixed amounts not reflected in bank --- .../bank_reconciliation_detail.json | 27 +++++++++++++++++-- .../bank_reconciliation_statement.py | 4 +-- 2 files changed, 27 insertions(+), 4 deletions(-) diff --git a/erpnext/accounts/doctype/bank_reconciliation_detail/bank_reconciliation_detail.json b/erpnext/accounts/doctype/bank_reconciliation_detail/bank_reconciliation_detail.json index d510f632d3..5d74c3f126 100644 --- a/erpnext/accounts/doctype/bank_reconciliation_detail/bank_reconciliation_detail.json +++ b/erpnext/accounts/doctype/bank_reconciliation_detail/bank_reconciliation_detail.json @@ -193,7 +193,7 @@ "hidden": 0, "ignore_user_permissions": 0, "in_filter": 0, - "in_list_view": 1, + "in_list_view": 0, "label": "Cheque Date", "length": 0, "no_copy": 0, @@ -233,6 +233,29 @@ "search_index": 0, "set_only_once": 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, @@ -245,7 +268,7 @@ "istable": 1, "max_attachments": 0, "menu_index": 0, - "modified": "2015-11-30 12:52:01.090839", + "modified": "2015-12-04 11:01:24.286320", "modified_by": "Administrator", "module": "Accounts", "name": "Bank Reconciliation Detail", diff --git a/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py b/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py index d57bf07af0..6ff1eeab3b 100644 --- a/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py +++ b/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py @@ -22,8 +22,8 @@ def execute(filters=None): total_debit, total_credit = 0,0 for d in data: - total_debit += flt(d.debit_in_account_currency) - total_credit += flt(d.credit_in_account_currency) + total_debit += flt(d.debit) + total_credit += flt(d.credit) amounts_not_reflected_in_system = frappe.db.sql(""" select sum(jvd.debit_in_account_currency - jvd.credit_in_account_currency)