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

frappe/desk/doctype/bulk_update/bulk_update.js

@@ -4,19 +4,24 @@
 frappe.ui.form.on('Bulk Update', {
 	refresh: function(frm) {
 		frm.page.set_primary_action(__('Update'), function() {
-			frappe.call({
-				method: 'frappe.desk.doctype.bulk_update.bulk_update.update',
-				args: {
-					doctype: frm.doc.document_type,
-					field: frm.doc.field,
-					value: frm.doc.update_value,
-					condition: frm.doc.condition,
-					limit: frm.doc.limit
-				},
-				callback: function() {
-					frappe.hide_progress();
-				}
-			});
+			if(!frm.doc.update_value){
+				frappe.throw(__('Field "value" is mandatory. Please specify value to be updated'));
+			}
+			else{
+				frappe.call({
+					method: 'frappe.desk.doctype.bulk_update.bulk_update.update',
+					args: {
+						doctype: frm.doc.document_type,
+						field: frm.doc.field,
+						value: frm.doc.update_value,
+						condition: frm.doc.condition,
+						limit: frm.doc.limit
+					},
+					callback: function() {
+						frappe.hide_progress();
+					}
+				});
+			}
 		});
 	},
 	document_type: function(frm) {

frappe/integration_broker/doctype/integration_service/integration_service.js

@@ -25,6 +25,11 @@ frappe.ui.form.on('Integration Service', {
 		}
 	},
 	
+	service: function(frm){
+		frm.events.setup_custom_buttons(frm);
+		frm.events.setup_service_details(frm);
+	},
+	
 	setup_custom_buttons: function(frm) {
 		frm.add_custom_button(__("{0} Settings", [frm.doc.service]), function(){
 			frappe.set_route("List", frm.doc.service + " Settings");

frappe/integrations/doctype/dropbox_settings/dropbox_settings.js

@@ -31,7 +31,7 @@ frappe.ui.form.on('Dropbox Settings', {
 		if (frm.doc.app_access_key && frm.doc.app_secret_key && frm.doc.dropbox_access_key && frm.doc.dropbox_access_secret) {
 			frm.add_custom_button(__("Take Backup Now"), function(frm){
 				frappe.call({
-					method: "frappe.integrations.dropbox_integration.take_backup",
+					method: "frappe.integrations.doctype.dropbox_settings.dropbox_settings.take_backup",
 					freeze: true
 				})
 			}).addClass("btn-primary")

frappe/public/css/form_grid.css

@@ -147,6 +147,7 @@
 }
 .grid-row .frappe-control {
   margin-bottom: 0px;
+  position: relative;
 }
 .grid-row .col-sm-6 .editor-toolbar-text-group,
 .grid-row .col-sm-6 .editor-toolbar-align-group {

frappe/public/css/list.css

@@ -65,6 +65,9 @@
   .filter_field {
     width: 65% !important;
   }
+  .filter_field .frappe-control {
+    position: relative;
+  }
 }
 .list-row {
   padding: 9px 15px;

frappe/public/less/form_grid.less

@@ -197,6 +197,7 @@
 
 	.frappe-control {
 		margin-bottom: 0px;
+		position: relative;
 	}
 
 	.col-sm-6 {

frappe/public/less/list.less

@@ -84,6 +84,10 @@
 
 	.filter_field {
 		width: 65% !important;
+
+		.frappe-control {
+			position: relative;
+		}
 	}
 }