Merge branch 'master' into develop

frappe/__init__.py

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

frappe/patches/v7_1/disabled_print_settings_for_custom_print_format.py

@@ -6,6 +6,7 @@ from __future__ import unicode_literals
 import frappe
 
 def execute():
+	frappe.reload_doctype('Print Format')
 	frappe.db.sql(""" 
 		update 
 			`tabPrint Format` 
@@ -13,4 +14,4 @@ def execute():
 			align_labels_left = 0, line_breaks = 0, show_section_headings = 0 
 		where 
 			custom_format = 1
-		""")
+		""")