From 4d18b3f96d7684b1c6bc307b741702f9adf4f0bc Mon Sep 17 00:00:00 2001
From: Nabin Hait <nabinhait@gmail.com>
Date: Mon, 4 Aug 2014 17:01:01 +0530
Subject: [PATCH] Fixes for standard print formats

---
 erpnext/templates/print_formats/includes/item_grid.html | 4 ++--
 erpnext/templates/print_formats/includes/taxes.html     | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/erpnext/templates/print_formats/includes/item_grid.html b/erpnext/templates/print_formats/includes/item_grid.html
index 3cc3034f3a0..d6ab347c922 100644
--- a/erpnext/templates/print_formats/includes/item_grid.html
+++ b/erpnext/templates/print_formats/includes/item_grid.html
@@ -22,12 +22,12 @@
 				{%- endif %}
 				{% if (not row.meta.is_print_hide("item_name") and
 					(row.meta.is_print_hide("item_code") or row.item_code != row.item_name)) -%}
-					<div class="primary">{{ row.item_name }}</div>
+					<div class="primary">{{ row.get_formatted("item_name",as_html=True) }}</div>
 				{%- endif %}
 				{% if (not row.meta.is_print_hide("description") and row.description and
 					((row.meta.is_print_hide("item_code") and row.meta.is_print_hide("item_name"))
 						or not (row.item_code == row.item_name == row.description))) -%}
-					<p>{{ row.description }}</p>
+					<p>{{ row.get_formatted("description", as_html=True) }}</p>
 				{%- endif %}
 				{%- for field in visible_columns -%}
 					{%- if (field.fieldname not in std_fields) and
diff --git a/erpnext/templates/print_formats/includes/taxes.html b/erpnext/templates/print_formats/includes/taxes.html
index 5d9aaace7fb..50f9d86a38d 100644
--- a/erpnext/templates/print_formats/includes/taxes.html
+++ b/erpnext/templates/print_formats/includes/taxes.html
@@ -5,10 +5,10 @@
 			{%- if not charge.included_in_print_rate -%}
 			<div class="row">
 				<div class="col-xs-5 text-right">
-					<label>{{ charge.description }}</label></div>
+					<label>{{ charge.get_formatted("description", as_html=True) }}</label></div>
 				<div class="col-xs-7 text-right">
 					{{ frappe.format_value(charge.tax_amount / doc.conversion_rate,
-						table_meta.get_field("tax_amount"), doc) }}
+						table_meta.get_field("tax_amount"), doc, currency=doc.currency) }}
 				</div>
 			</div>
 			{%- endif -%}