From c432270ca8722c80cd1290e343cd402b73c253e7 Mon Sep 17 00:00:00 2001
From: Nabin Hait <nabinhait@gmail.com>
Date: Fri, 12 Sep 2014 12:00:34 +0530
Subject: [PATCH] Report print format fixed for translated columns

---
 .../bank_reconciliation_statement.html        | 30 +++++++++----------
 .../report/general_ledger/general_ledger.html | 24 +++++++--------
 2 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.html b/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.html
index d05bffac12..9d67ba3630 100644
--- a/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.html
+++ b/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.html
@@ -16,31 +16,31 @@
 	</thead>
 	<tbody>
 		{% for(var i=0, l=data.length; i<l; i++) { %}
-			{% if (data[i].posting_date) { %}
+			{% if (data[i][__("Posting Date")]) { %}
 			<tr>
-				<td>{%= dateutil.str_to_user(data[i].posting_date) %}</td>
-				<td>{%= data[i].journal_voucher %}</td>
-				<td>{%= __("Against") %}: {%= data[i].against_account %}
-					{% if (data[i].reference) { %}
-						<br>{%= __("Reference") %}: {%= data[i].reference %}
-						{% if (data[i].ref_date) { %}
-							<br>{%= __("Reference Date") %}: {%= dateutil.str_to_user(data[i].ref_date) %}
+				<td>{%= dateutil.str_to_user(data[i][__("Posting Date")]) %}</td>
+				<td>{%= data[i][__("Journal Voucher")] %}</td>
+				<td>{%= __("Against") %}: {%= data[i][__("Against Account")] %}
+					{% if (data[i][__("Reference")]) { %}
+						<br>{%= __("Reference") %}: {%= data[i][__("Reference")] %}
+						{% if (data[i][__("Ref Date")]) { %}
+							<br>{%= __("Reference Date") %}: {%= dateutil.str_to_user(data[i][__("Ref Date")]) %}
 						{% } %}
 					{% } %}
-					{% if (data[i].clearance_date) { %}
-						<br>{%= __("Clearance Date") %}: {%= dateutil.str_to_user(data[i].clearance_date) %}
+					{% if (data[i][__("Clearance Date")]) { %}
+						<br>{%= __("Clearance Date") %}: {%= dateutil.str_to_user(data[i][__("Clearance Date")]) %}
 					{% } %}
 				</td>
-				<td style="text-align: right">{%= format_currency(data[i].debit) %}</td>
-				<td style="text-align: right">{%= format_currency(data[i].credit) %}</td>
+				<td style="text-align: right">{%= format_currency(data[i][__("Debit")]) %}</td>
+				<td style="text-align: right">{%= format_currency(data[i][__("Credit")]) %}</td>
 			</tr>
 			{% } else { %}
 			<tr>
 				<td></td>
 				<td></td>
-				<td>{%= data[i].journal_voucher %}</td>
-				<td style="text-align: right">{%= format_currency(data[i].debit) %}</td>
-				<td style="text-align: right">{%= format_currency(data[i].credit) %}</td>
+				<td>{%= data[i][__("Journal Voucher")] %}</td>
+				<td style="text-align: right">{%= format_currency(data[i][__("Debit")]) %}</td>
+				<td style="text-align: right">{%= format_currency(data[i][__("Credit")]) %}</td>
 			</tr>
 			{% } %}
 		{% } %}
diff --git a/erpnext/accounts/report/general_ledger/general_ledger.html b/erpnext/accounts/report/general_ledger/general_ledger.html
index eb596d2f92..5c6b0f19bb 100644
--- a/erpnext/accounts/report/general_ledger/general_ledger.html
+++ b/erpnext/accounts/report/general_ledger/general_ledger.html
@@ -22,23 +22,23 @@
 	<tbody>
 		{% for(var i=0, l=data.length; i<l; i++) { %}
 			<tr>
-			{% if(data[i].posting_date) { %}
-				<td>{%= dateutil.str_to_user(data[i].posting_date) %}</td>
-				<td>{%= data[i].voucher_type%}
-					<br>{%= data[i].voucher_no %}</td>
-				<td>{%= data[i].account %}
-					<br>{%= __("Against") %}: {%= data[i].against_account %}
-					<br>{%= __("Remarks") %}: {%= data[i].remarks %}</td>
-				<td style="text-align: right">{%= format_currency(data[i].debit) %}</td>
-				<td style="text-align: right">{%= format_currency(data[i].credit) %}</td>
+			{% if(data[i][__("Posting Date")]) { %}
+				<td>{%= dateutil.str_to_user(data[i][__("Posting Date")]) %}</td>
+				<td>{%= data[i][__("Voucher Type")] %}
+					<br>{%= data[i][__("Voucher No")] %}</td>
+				<td>{%= data[i][__("Account")] %}
+					<br>{%= __("Against") %}: {%= data[i][__("Against Account")] %}
+					<br>{%= __("Remarks") %}: {%= data[i][__("Remarks")] %}</td>
+				<td style="text-align: right">{%= format_currency(data[i][__("Debit")]) %}</td>
+				<td style="text-align: right">{%= format_currency(data[i][__("Credit")]) %}</td>
 			{% } else { %}
 				<td></td>
 				<td></td>
-				<td><b>{%= data[i].account || "&nbsp;" %}</b></td>
+				<td><b>{%= data[i][__("Account")] || "&nbsp;" %}</b></td>
 				<td style="text-align: right">
-					{%= data[i].account && format_currency(data[i].debit) %}</td>
+					{%= data[i][__("Account")] && format_currency(data[i][__("Debit")]) %}</td>
 				<td style="text-align: right">
-					{%= data[i].account && format_currency(data[i].credit) %}</td>
+					{%= data[i][__("Account")] && format_currency(data[i][__("Credit")]) %}</td>
 			{% } %}
 			</tr>
 		{% } %}