+
{% for df in column %}
{{ render_field(df, doc) }}
{% endfor %}
diff --git a/frappe/templates/print_formats/standard_macros.html b/frappe/templates/print_formats/standard_macros.html
index 82754e15a6..b738ab07e4 100644
--- a/frappe/templates/print_formats/standard_macros.html
+++ b/frappe/templates/print_formats/standard_macros.html
@@ -49,13 +49,13 @@
{%- macro render_field_with_label(df, doc) -%}
-
+
{% if df.fieldtype not in ("Image","HTML") and
doc.get(df.fieldname) != None %}
{% endif %}
-
{% if doc.get(df.fieldname) != None -%}
{{ print_value(df, doc) }}{% endif %}
@@ -75,9 +75,9 @@
{%- macro print_value(df, doc, parent_doc=None) -%}
{% if df.fieldtype=="Check" %}
-
+
{% elif df.fieldtype=="Image" %}
- .options] }})
+
{% else %}
{{ doc.get_formatted(df.fieldname, parent_doc or doc) }}
{% endif %}
diff --git a/frappe/templates/styles/classic.css b/frappe/templates/styles/classic.css
index b35e1044fd..14d3920a2e 100644
--- a/frappe/templates/styles/classic.css
+++ b/frappe/templates/styles/classic.css
@@ -1,3 +1,5 @@
+@import url(http://fonts.googleapis.com/css?family=Noto+Serif:400,700);
+
/*
common style for whole page
This should include:
@@ -12,5 +14,5 @@
.print-format h2,
.print-format h3,
.print-format h4 {
- font-family: serif;
+ font-family: 'Noto Serif', serif;
}
diff --git a/frappe/templates/styles/standard.css b/frappe/templates/styles/standard.css
index 5666c76643..312da52da3 100644
--- a/frappe/templates/styles/standard.css
+++ b/frappe/templates/styles/standard.css
@@ -1,3 +1,5 @@
+@import url(http://fonts.googleapis.com/css?family=Noto+Sans:400,700);
+
@media screen {
.print-format-gutter {
background-color: #ddd;
@@ -26,8 +28,16 @@
}
}
+@media print {
+ .print-format p {
+ margin-left: 1px;
+ margin-right: 1px;
+ }
+}
+
.print-format {
font-size: 9pt;
+ -webkit-print-color-adjust:exact;
}
.page-break {
@@ -49,4 +59,3 @@
table.no-border, table.no-border td {
border: 0px;
}
-
diff --git a/frappe/utils/__init__.py b/frappe/utils/__init__.py
index 21c6f2c965..7501b8a906 100644
--- a/frappe/utils/__init__.py
+++ b/frappe/utils/__init__.py
@@ -348,9 +348,17 @@ def fmt_money(amount, precision=None, currency=None):
"""
Convert to string with commas for thousands, millions etc
"""
- number_format = frappe.db.get_default("number_format") or "#,###.##"
- decimal_str, comma_str, precision = get_number_format_info(number_format)
+ number_format = None
+ if currency:
+ number_format = frappe.db.get_value("Currency", currency, "number_format")
+
+ if not number_format:
+ number_format = frappe.db.get_default("number_format") or "#,###.##"
+
+ decimal_str, comma_str, number_format_precision = get_number_format_info(number_format)
+ if not precision:
+ precision = number_format_precision
amount = '%.*f' % (precision, flt(amount))
if amount.find('.') == -1:
diff --git a/frappe/utils/email_lib/email_body.py b/frappe/utils/email_lib/email_body.py
index 6d9132cf3e..c01dff8950 100644
--- a/frappe/utils/email_lib/email_body.py
+++ b/frappe/utils/email_lib/email_body.py
@@ -17,7 +17,7 @@ def get_email(recipients, sender='', msg='', subject='[No Subject]',
msg = markdown(msg)
emailobj.set_html(msg, text_content, footer=footer, print_html=print_html, formatted=formatted)
- for attach in attachments:
+ for attach in (attachments or []):
emailobj.add_attachment(**attach)
return emailobj
diff --git a/frappe/utils/formatters.py b/frappe/utils/formatters.py
index 1a2a9ceee2..d8e283c843 100644
--- a/frappe/utils/formatters.py
+++ b/frappe/utils/formatters.py
@@ -14,7 +14,7 @@ def format_value(value, df, doc=None):
currency=get_field_currency(df, doc) if doc else None)
elif df.fieldtype == "Float":
- return fmt_money(value)
+ return fmt_money(value, precision=get_field_precision(df, doc))
elif df.fieldtype == "Percent":
return "{}%".format(flt(value, 2))
diff --git a/frappe/utils/pdf.py b/frappe/utils/pdf.py
index 610dc8a832..0837e816f5 100644
--- a/frappe/utils/pdf.py
+++ b/frappe/utils/pdf.py
@@ -2,13 +2,28 @@
# MIT License. See license.txt
import pdfkit, os, frappe
+from frappe.utils import scrub_urls
def get_pdf(html, options=None):
if not options:
options = {}
+
+ options.update({
+ "print-media-type": None,
+ "background": None,
+ "images": None,
+ 'margin-top': '15mm',
+ 'margin-right': '15mm',
+ 'margin-bottom': '15mm',
+ 'margin-left': '15mm',
+ 'encoding': "UTF-8",
+ 'no-outline': None
+ })
+
if not options.get("page-size"):
- options['page-size'] = frappe.df.get_single_value("Print Settings", "pdf_page_size") or "A4"
+ options['page-size'] = frappe.db.get_single_value("Print Settings", "pdf_page_size") or "A4"
+ html = scrub_urls(html)
fname = os.path.join("/tmp", frappe.generate_hash() + ".pdf")
pdfkit.from_string(html, fname, options=options or {})
diff --git a/frappe/utils/response.py b/frappe/utils/response.py
index 69056fbb43..9c8db420f8 100644
--- a/frappe/utils/response.py
+++ b/frappe/utils/response.py
@@ -49,7 +49,7 @@ def as_csv():
def as_raw():
response = Response()
- response.headers[b"Content-Type"] = mimetypes.guess_type(frappe.response['filename'])[0] or b"application/unknown"
+ response.headers[b"Content-Type"] = frappe.response.get("content_type") or mimetypes.guess_type(frappe.response['filename'])[0] or b"application/unknown"
response.headers[b"Content-Disposition"] = ("filename=%s" % frappe.response['filename'].replace(' ', '_')).encode("utf-8")
response.data = frappe.response['filecontent']
return response
diff --git a/frappe/website/render.py b/frappe/website/render.py
index de9e07e899..2ecc5ca1c8 100644
--- a/frappe/website/render.py
+++ b/frappe/website/render.py
@@ -3,6 +3,7 @@
from __future__ import unicode_literals
import frappe
+from frappe.utils import cstr
import mimetypes, json
from werkzeug.wrappers import Response
@@ -49,7 +50,7 @@ def render(path, http_status_code=None):
def render_403(e):
path = "message"
- frappe.local.message = "Did you log out?"
+ frappe.local.message = "
{error}
Did you log out?
".format(error=cstr(e)) frappe.local.message_title = "Not Permitted" return render_page(path), e.http_status_code