Merge branch 'hotfix'

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__ = '9.1.5'
+__version__ = '9.1.6'
 __title__ = "Frappe Framework"
 
 local = Local()

frappe/core/doctype/user/user.json

@@ -1213,6 +1213,7 @@
    "label": "Background Image", 
    "length": 0, 
    "no_copy": 0, 
+   "options": "image", 
    "permlevel": 0, 
    "precision": "", 
    "print_hide": 0, 
@@ -2001,7 +2002,7 @@
  "istable": 0, 
  "max_attachments": 5, 
  "menu_index": 0, 
- "modified": "2017-09-14 14:55:26.044665", 
+ "modified": "2017-10-09 15:33:43.818915", 
  "modified_by": "Administrator", 
  "module": "Core", 
  "name": "User", 

frappe/custom/doctype/customize_form/customize_form.js

@@ -146,6 +146,7 @@ frappe.customize_form.set_primary_action = function(frm) {
 			return frm.call({
 				doc: frm.doc,
 				freeze: true,
+				btn: frm.page.btn_primary,
 				method: "save_customization",
 				callback: function(r) {
 					if(!r.exc) {

frappe/public/css/desk.css

@@ -626,6 +626,10 @@ li.user-progress .progress-bar {
 }
 .frappe-rtl .checkbox .disp-area {
   margin-right: -20px;
+  margin-left: 0px;
+}
+.checkbox .disp-area {
+  margin-left: -20px;
 }
 .text-editor {
   height: 400px;

frappe/public/less/desk.less

@@ -484,6 +484,11 @@ li.user-progress {
 
 .frappe-rtl .checkbox .disp-area {
 	margin-right: -20px;
+	margin-left: 0px;
+}
+
+.checkbox .disp-area {
+	margin-left: -20px;
 }
 
 .text-editor {