Merge branch 'staging' into production

Author: sahil28297

frappe/__init__.py

@@ -24,7 +24,7 @@
 	sys.setdefaultencoding("utf-8")
 
 __frappe_version__ = '12.8.1'
-__version__ = '2.0.8'
+__version__ = '2.0.9'
 __title__ = "Frappe Framework"
 
 local = Local()

frappe/custom/doctype/custom_field/custom_field.json

@@ -360,7 +360,7 @@
  ],
  "icon": "fa fa-glass",
  "idx": 1,
- "modified": "2020-03-17 21:30:18.102333",
+ "modified": "2021-01-15 21:30:18.102333",
  "modified_by": "Administrator",
  "module": "Custom",
  "name": "Custom Field",

frappe/public/js/frappe/form/controls/signature.js

@@ -62,38 +62,21 @@ frappe.ui.form.ControlSignature = frappe.ui.form.ControlData.extend({
 		var me = this;
 		var options = {
 			allow_multiple: false,
+			as_dataurl: true,
 			on_success: file => {
 				me.on_upload_complete(file);
 			}
 		};
 
-		if (this.frm && !this.frm.is_new()) {
-			options.doctype = this.frm.doctype;
-			options.docname = this.frm.docname;
-			options.fieldname = this.df.fieldname;
-		}
-
 		if (this.df.options) {
 			Object.assign(options, this.df.options);
 		}
 		return options;
 	},
-	on_upload_complete: function(attachment) {
+	on_upload_complete: function(file) {
 		var me=this;
-		if (this.frm) {
-			this.frm.attachments.update_attachment(attachment);
-			this.frm.doc.docstatus == 1 ? this.frm.save('Update') : this.frm.save();
-		}
-		frappe.call({
-			method: "frappe.utils.image.image_to_base64",
-			args: {
-				path: attachment.file_url
-			},
-			callback: function (r) {
-				me.set_my_value(r.message);
-				me.set_image(me.get_value());
-			}
-		});
+		me.set_my_value(file.dataurl);
+		me.set_image(me.get_value());
 	},
 	refresh_input: function(e) {
 		// prevent to load the second time

frappe/public/js/frappe/views/communication.js

@@ -130,6 +130,9 @@ frappe.views.CommunicationComposer = Class.extend({
 		this.dialog.set_value("recipients", this.recipients || '');
 		this.dialog.set_value("cc", this.cc || '');
 		this.dialog.set_value("bcc", this.bcc || '');
+		this.dialog.set_value("attach_document_print", this.attach_document_print || false);
+		this.dialog.set_value("send_me_a_copy", this.send_me_a_copy || false);
+		this.dialog.set_value("send_read_receipt", this.send_read_receipt || false);
 
 		if(this.dialog.fields_dict.sender) {
 			this.dialog.fields_dict.sender.set_value(this.sender || '');

frappe/tests/test_listview.py

@@ -14,7 +14,7 @@ def setUp(self):
 			frappe.delete_doc("List View Settings", "DocType")
 
 	def test_get_list_settings_without_settings(self):
-		self.assertIsNone(get_list_settings("DocType"), None)
+		self.assertEqual(get_list_settings("DocType"), {})
 
 	def test_get_list_settings_with_default_settings(self):
 		frappe.get_doc({"doctype": "List View Settings", "name": "DocType"}).insert()

frappe/utils/oauth.py

@@ -46,13 +46,15 @@ def get_oauth_keys(provider):
 
 	if not keys:
 		# try database
-		client_id, client_secret = frappe.get_value("Social Login Key", provider, ["client_id", "client_secret"])
-		client_secret = get_decrypted_password("Social Login Key", provider, "client_secret")
-		keys = {
-			"client_id": client_id,
-			"client_secret": client_secret
-		}
-		return keys
+		if frappe.db.exists("Social Login Key", provider, ["client_id", "client_secret"]):
+			client_id, client_secret = frappe.get_value("Social Login Key", provider, ["client_id", "client_secret"])
+			client_secret = get_decrypted_password("Social Login Key", provider, "client_secret")
+			keys = {
+				"client_id": client_id,
+				"client_secret": client_secret
+			}
+			return keys
+		frappe.throw(_("No Social Login for Provider - {0}.").format(provider))
 	else:
 		return {
 			"client_id": keys["client_id"],