Quellcode durchsuchen

Merge pull request #1935 from KanchanChauhan/some-print-fixes

[Minor]Print fixes
version-14
Rushabh Mehta vor 9 Jahren
committed by GitHub
Ursprung
Commit
e0e1c6b309
2 geänderte Dateien mit 3 neuen und 3 gelöschten Zeilen
  1. +1
    -1
      frappe/__init__.py
  2. +2
    -2
      frappe/www/print.py

+ 1
- 1
frappe/__init__.py Datei anzeigen

@@ -1133,7 +1133,7 @@ def format_value(value, df, doc=None, currency=None):
import frappe.utils.formatters import frappe.utils.formatters
return frappe.utils.formatters.format_value(value, df, doc, currency=currency) return frappe.utils.formatters.format_value(value, df, doc, currency=currency)


def get_print(doctype, name, print_format=None, style=None, html=None, as_pdf=False, doc=None):
def get_print(doctype=None, name=None, print_format=None, style=None, html=None, as_pdf=False, doc=None):
"""Get Print Format for given document. """Get Print Format for given document.


:param doctype: DocType of document. :param doctype: DocType of document.


+ 2
- 2
frappe/www/print.py Datei anzeigen

@@ -19,10 +19,10 @@ standard_format = "templates/print_formats/standard.html"


def get_context(context): def get_context(context):
"""Build context for print""" """Build context for print"""
if not frappe.form_dict.doctype or not frappe.form_dict.name:
if not ((frappe.form_dict.doctype and frappe.form_dict.name) or frappe.form_dict.doc):
return { return {
"body": """<h1>Error</h1> "body": """<h1>Error</h1>
<p>Parameters doctype, name and format required</p>
<p>Parameters doctype and name required</p>
<pre>%s</pre>""" % repr(frappe.form_dict) <pre>%s</pre>""" % repr(frappe.form_dict)
} }




Laden…
Abbrechen
Speichern