From 828d5ffaabbe46bb09170a87ba560b6a40b93c96 Mon Sep 17 00:00:00 2001
From: Anand Doshi <anand@erpnext.com>
Date: Wed, 17 Feb 2016 18:31:58 +0530
Subject: [PATCH] [fix] Show Debit/Credit in Bank Reconciliation table

---
 .../bank_reconciliation.py                    |  4 +++
 .../bank_reconciliation_detail.json           | 30 ++-----------------
 .../form_grid/bank_reconciliation_grid.html   | 28 +++++++++++++++++
 3 files changed, 35 insertions(+), 27 deletions(-)
 create mode 100644 erpnext/templates/form_grid/bank_reconciliation_grid.html

diff --git a/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py b/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py
index b60561c75f..fb95731721 100644
--- a/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py
+++ b/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py
@@ -7,6 +7,10 @@ from frappe.utils import flt, getdate, nowdate
 from frappe import msgprint, _
 from frappe.model.document import Document
 
+form_grid_templates = {
+	"journal_entries": "templates/form_grid/bank_reconciliation_grid.html"
+}
+
 class BankReconciliation(Document):
 	def get_details(self):
 		if not (self.bank_account and self.from_date and self.to_date):
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 d770a934f9..fc3c3b6b52 100644
--- a/erpnext/accounts/doctype/bank_reconciliation_detail/bank_reconciliation_detail.json
+++ b/erpnext/accounts/doctype/bank_reconciliation_detail/bank_reconciliation_detail.json
@@ -235,29 +235,6 @@
    "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, 
@@ -270,13 +247,12 @@
  "istable": 1, 
  "max_attachments": 0, 
  "menu_index": 0, 
- "modified": "2016-01-19 12:06:17.568428", 
+ "modified": "2016-02-17 06:50:40.074578", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Bank Reconciliation Detail", 
  "owner": "Administrator", 
  "permissions": [], 
  "read_only": 0, 
- "read_only_onload": 0, 
- "version": 0
-}
+ "read_only_onload": 0
+}
\ No newline at end of file
diff --git a/erpnext/templates/form_grid/bank_reconciliation_grid.html b/erpnext/templates/form_grid/bank_reconciliation_grid.html
new file mode 100644
index 0000000000..363ae337c8
--- /dev/null
+++ b/erpnext/templates/form_grid/bank_reconciliation_grid.html
@@ -0,0 +1,28 @@
+{% if(!doc) { %}
+	<div class="row">
+		<div class="col-sm-4 col-xs-4">{{ __("Journal Entry") }}</div>
+		<div class="col-sm-2 col-xs-4 text-right">{{ __("Amount") }}</div>
+		<div class="col-sm-2 hidden-xs text-right">{{ __(row.grid.get_docfield("cheque_number").label) }}</div>
+		<div class="col-sm-2 hidden-xs text-right">{{ __("Posting Date") }}</div>
+		<div class="col-sm-2 col-xs-4 text-right">{{ __("Clearance Date") }}</div>
+	</div>
+{% } else { %}
+	<div class="row">
+		<div class="col-sm-4 col-xs-4">
+			{{ doc.get_formatted("voucher_id") }}
+			{{ doc.get_formatted("against_account") }}
+		</div>
+		<div class="col-sm-2 col-xs-4 text-right">
+			{{ doc.debit ? doc.get_formatted("debit") : doc.get_formatted("credit") }} {{ doc.debit ? __("Dr") : __("Cr") }}
+		</div>
+		<div class="col-sm-2 hidden-xs text-right">
+			{{ doc.get_formatted("cheque_number") }}
+		</div>
+		<div class="col-sm-2 hidden-xs text-right">
+			{{ doc.get_formatted("posting_date") }}
+		</div>
+		<div class="col-sm-2 col-xs-4 text-right">
+			{{ doc.get_formatted("clearance_date") }}
+		</div>
+	</div>
+{% } %}