diff --git a/frappe/__init__.py b/frappe/__init__.py index bb1315091c..83dbde8d31 100644 --- a/frappe/__init__.py +++ b/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.10.5' +__version__ = '8.10.6' __title__ = "Frappe Framework" local = Local() diff --git a/frappe/patches/v7_1/disabled_print_settings_for_custom_print_format.py b/frappe/patches/v7_1/disabled_print_settings_for_custom_print_format.py index 45797c8c8f..c74d2d98f9 100644 --- a/frappe/patches/v7_1/disabled_print_settings_for_custom_print_format.py +++ b/frappe/patches/v7_1/disabled_print_settings_for_custom_print_format.py @@ -11,7 +11,7 @@ def execute(): update `tabPrint Format` set - align_labels_left = 0, line_breaks = 0, show_section_headings = 0 + align_labels_right = 0, line_breaks = 0, show_section_headings = 0 where custom_format = 1 """) diff --git a/frappe/printing/doctype/print_format/print_format.js b/frappe/printing/doctype/print_format/print_format.js index bd06697725..bcd17c651e 100644 --- a/frappe/printing/doctype/print_format/print_format.js +++ b/frappe/printing/doctype/print_format/print_format.js @@ -43,7 +43,7 @@ frappe.ui.form.on("Print Format", { }, custom_format: function(frm) { var value = frm.doc.custom_format ? 0:1; - frm.set_value('align_labels_left', value); + frm.set_value('align_labels_right', value); frm.set_value('show_section_headings', value); frm.set_value('line_breaks', value); frm.trigger('render_buttons'); diff --git a/frappe/utils/scheduler.py b/frappe/utils/scheduler.py index da0e78cb19..68ab6f7cc2 100755 --- a/frappe/utils/scheduler.py +++ b/frappe/utils/scheduler.py @@ -16,6 +16,7 @@ import schedule import time import MySQLdb import frappe.utils +import os from frappe.utils import get_sites from datetime import datetime from frappe.utils.background_jobs import enqueue, get_jobs, queue_timeout @@ -40,6 +41,11 @@ def start_scheduler(): def enqueue_events_for_all_sites(): '''Loop through sites and enqueue events that are not already queued''' + + if os.path.exists(os.path.join('.', '.restarting')): + # Don't add task to queue if webserver is in restart mode + return + with frappe.init_site(): jobs_per_site = get_jobs() sites = get_sites()