Merge branch 'master' into develop

frappe/__init__.py

@@ -14,7 +14,7 @@ import os, sys, importlib, inspect, json
 from .exceptions import *
 from .utils.jinja import get_jenv, get_template, render_template, get_email_from_template
 
-__version__ = '8.5.3'
+__version__ = '8.5.4'
 __title__ = "Frappe Framework"
 
 local = Local()

frappe/public/js/frappe/form/formatters.js

@@ -64,8 +64,13 @@ frappe.form.formatters = {
 				precision = decimals.length;
 			}
 		}
-		return frappe.form.formatters._right((value==null || value==="")
-			? "" : format_currency(value, currency, precision), options);
+		value = (value==null || value==="") ?
+			"" : format_currency(value, currency, precision);
+		if (options.for_print) {
+			return value;
+		} else {
+			return frappe.form.formatters._right(value, options);
+		}
 	},
 	Check: function(value) {
 		if(value) {