From 51af7ee50af30e64c54e08aaf13cb22adb3373f9 Mon Sep 17 00:00:00 2001
From: Anand Doshi <anand@erpnext.com>
Date: Fri, 21 Dec 2012 11:28:58 +0530
Subject: [PATCH] fixes in print table formatters and modifier

---
 public/js/wn/form/formatters.js   | 16 ++++++++++++++--
 public/js/wn/print/print_table.js |  9 +++++++--
 2 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/public/js/wn/form/formatters.js b/public/js/wn/form/formatters.js
index b102fd7f33..5ca0e3f623 100644
--- a/public/js/wn/form/formatters.js
+++ b/public/js/wn/form/formatters.js
@@ -34,8 +34,20 @@ wn.form.formatters = {
 		return dateutil.str_to_user(value);
 	},
 	Text: function(value) {
-		if(value && value.indexOf("<br>")==-1 && value.indexOf("<p>")==-1 && value.indexOf("<div")==-1)
-			return replace_newlines(value);
+		if(value) {
+			var tags = ["<p[^>]>", "<div[^>]>", "<br[^>]>"];
+			var match = false;
+
+			for(var i=0; i<tags.length; i++) {
+				if(value.match(tags[i])) {
+					match = true;
+				}
+			}
+
+			if(!match) {
+				return replace_newlines(value);
+			}
+		}
 
 		return wn.form.formatters.Data(value);
 	},
diff --git a/public/js/wn/print/print_table.js b/public/js/wn/print/print_table.js
index db6c4797a9..7bba90ac1b 100644
--- a/public/js/wn/print/print_table.js
+++ b/public/js/wn/print/print_table.js
@@ -135,11 +135,16 @@ wn.print.Table = Class.extend({
 						
 					var df = wn.meta.docfield_map[me.tabletype][fieldname];
 					value = wn.form.get_formatter(
-						df && df.fieldtype || "Data")(value);
+						df ? df.fieldtype : "Data")(value);
 
+					// set formatted value back into data so that modifer can use it
+					row[fieldname] = value;
+
+					// modifier is called after formatting so that
+					// modifier's changes do not get lost in formatting (eg. 3.45%)
 					if(me.modifier && me.modifier[fieldname])
 						value = me.modifier[fieldname](row);
-					
+
 					var td = $("<td>").html(value)
 						.css(me.cell_style)
 						.css({width: me.widths[ci]})