From ecdf03b83690d0fd15aaca9b701699e9a8dc255e Mon Sep 17 00:00:00 2001
From: Anand Doshi <anand@iwebnotes.com>
Date: Fri, 7 Dec 2012 18:26:19 +0530
Subject: [PATCH] fixes in print format - call modifier after formatter

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

diff --git a/public/js/wn/form/formatters.js b/public/js/wn/form/formatters.js
index 8404dd84fd..b102fd7f33 100644
--- a/public/js/wn/form/formatters.js
+++ b/public/js/wn/form/formatters.js
@@ -6,7 +6,7 @@ wn.form.formatters = {
 		return value==null ? "" : value
 	},
 	Float: function(value) {
-		return flt(value, 6);
+		return "<div style='text-align: right'>" + flt(value, 6) + "</div>";
 	},
 	Int: function(value) {
 		return cint(value);
diff --git a/public/js/wn/print/print_table.js b/public/js/wn/print/print_table.js
index c388e82306..3d604d42f6 100644
--- a/public/js/wn/print/print_table.js
+++ b/public/js/wn/print/print_table.js
@@ -103,10 +103,10 @@ wn.print.Table = Class.extend({
 
 		var headrow = $("<tr>").appendTo(table);
 		$.each(me.columns, function(ci, fieldname) {
+			var df = wn.meta.docfield_map[me.tabletype][fieldname];
 			if(me.head_labels) {
 				var label = me.head_labels[ci];
 			} else {
-				var df = wn.meta.docfield_map[me.tabletype][fieldname];
 				var label = df ? df.label : fieldname;
 			}
 			var td = $("<td>").html(label)
@@ -117,6 +117,10 @@ wn.print.Table = Class.extend({
 			if(ci==0) {
 				td.css({"min-width": "30px"});
 			}
+			
+			if(df && in_list(['Float', 'Currency'], df.fieldtype)) {
+				td.css({"text-align": "right"});
+			}
 		});
 		
 		$.each(data, function(ri, row) {
@@ -132,14 +136,14 @@ wn.print.Table = Class.extend({
 						var value = row.idx;
 					else
 						var value = row[fieldname];
-
-					if(me.modifier && me.modifier[fieldname])
-						value = me.modifier[fieldname](row);
-					
+						
 					var df = wn.meta.docfield_map[me.tabletype][fieldname];
 					value = wn.form.get_formatter(
 						df && df.fieldtype || "Data")(value);
 
+					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]})
@@ -210,7 +214,7 @@ wn.print.Table = Class.extend({
 	},
 })
 
-function print_table(dt, dn, fieldname, tabletype, cols, head_labels, widths, condition, cssClass, modifier, hide_empty) {
+function print_table(dt, dn, fieldname, tabletype, cols, head_labels, widths, condition, cssClass, modifier) {
 	return new wn.print.Table({
 		doctype: dt,
 		docname: dn,