Merge branch 'hotfix'

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.5'
+__version__ = '7.1.6'
 __title__ = "Frappe Framework"
 
 local = Local()

frappe/patches.txt

@@ -144,3 +144,4 @@ execute:frappe.db.set_value("Print Settings", "Print Settings", "add_draft_headi
 frappe.patches.v7_0.cleanup_list_settings
 execute:frappe.db.set_default('language', '')
 frappe.patches.v7_1.refactor_integration_broker
+frappe.patches.v7_1.set_backup_limit

frappe/patches/v7_1/set_backup_limit.py

@@ -0,0 +1,9 @@
+from __future__ import unicode_literals
+from frappe.utils import cint
+import frappe
+
+def execute():
+    backup_limit = frappe.db.get_single_value('System Settings', 'backup_limit')
+    
+    if cint(backup_limit) == 0:
+        frappe.db.set_value('System Settings', 'System Settings', 'backup_limit', 3)

frappe/www/print.py

@@ -250,9 +250,6 @@ def make_layout(doc, meta, format_data=None):
 				if page[-1]['has_data']==False:
 					# truncate last section if empty
 					del page[-1]
-				elif page[-1]['columns'][-1]['fields']==[]:
-					# truncate last column in empty
-					del page[-1]['columns'][-1]
 
 			section = get_new_section()
 			if df.fieldtype=='Section Break' and df.label: