From c0d210206fb37624888d6f7b8aba92a6e7366063 Mon Sep 17 00:00:00 2001
From: Mangesh-Khairnar <mkhairnar10@gmail.com>
Date: Thu, 2 Apr 2020 18:12:43 +0530
Subject: [PATCH 001/191] feat: paytm integration

---
 .../doctype/paytm_settings/__init__.py        |  0
 .../doctype/paytm_settings/paytm_settings.js  |  8 ++++
 .../paytm_settings/paytm_settings.json        | 46 +++++++++++++++++++
 .../doctype/paytm_settings/paytm_settings.py  | 10 ++++
 .../paytm_settings/test_paytm_settings.py     | 10 ++++
 5 files changed, 74 insertions(+)
 create mode 100644 frappe/integrations/doctype/paytm_settings/__init__.py
 create mode 100644 frappe/integrations/doctype/paytm_settings/paytm_settings.js
 create mode 100644 frappe/integrations/doctype/paytm_settings/paytm_settings.json
 create mode 100644 frappe/integrations/doctype/paytm_settings/paytm_settings.py
 create mode 100644 frappe/integrations/doctype/paytm_settings/test_paytm_settings.py

diff --git a/frappe/integrations/doctype/paytm_settings/__init__.py b/frappe/integrations/doctype/paytm_settings/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/frappe/integrations/doctype/paytm_settings/paytm_settings.js b/frappe/integrations/doctype/paytm_settings/paytm_settings.js
new file mode 100644
index 0000000000..d51a6e4a25
--- /dev/null
+++ b/frappe/integrations/doctype/paytm_settings/paytm_settings.js
@@ -0,0 +1,8 @@
+// Copyright (c) 2020, Frappe Technologies and contributors
+// For license information, please see license.txt
+
+frappe.ui.form.on('Paytm Settings', {
+	// refresh: function(frm) {
+
+	// }
+});
diff --git a/frappe/integrations/doctype/paytm_settings/paytm_settings.json b/frappe/integrations/doctype/paytm_settings/paytm_settings.json
new file mode 100644
index 0000000000..e57c8a192c
--- /dev/null
+++ b/frappe/integrations/doctype/paytm_settings/paytm_settings.json
@@ -0,0 +1,46 @@
+{
+ "actions": [],
+ "creation": "2020-04-02 00:11:22.846697",
+ "doctype": "DocType",
+ "editable_grid": 1,
+ "engine": "InnoDB",
+ "field_order": [
+  "merchant_id",
+  "merchant_key"
+ ],
+ "fields": [
+  {
+   "fieldname": "merchant_id",
+   "fieldtype": "Data",
+   "label": "Merchant ID"
+  },
+  {
+   "fieldname": "merchant_key",
+   "fieldtype": "Data",
+   "hidden": 1,
+   "label": "Merchant Key"
+  }
+ ],
+ "issingle": 1,
+ "links": [],
+ "modified": "2020-04-02 00:11:22.846697",
+ "modified_by": "Administrator",
+ "module": "Integrations",
+ "name": "Paytm Settings",
+ "owner": "Administrator",
+ "permissions": [
+  {
+   "create": 1,
+   "delete": 1,
+   "email": 1,
+   "print": 1,
+   "read": 1,
+   "role": "System Manager",
+   "share": 1,
+   "write": 1
+  }
+ ],
+ "sort_field": "modified",
+ "sort_order": "DESC",
+ "track_changes": 1
+}
\ No newline at end of file
diff --git a/frappe/integrations/doctype/paytm_settings/paytm_settings.py b/frappe/integrations/doctype/paytm_settings/paytm_settings.py
new file mode 100644
index 0000000000..74d51d1dcc
--- /dev/null
+++ b/frappe/integrations/doctype/paytm_settings/paytm_settings.py
@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2020, Frappe Technologies and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+# import frappe
+from frappe.model.document import Document
+
+class PaytmSettings(Document):
+	pass
diff --git a/frappe/integrations/doctype/paytm_settings/test_paytm_settings.py b/frappe/integrations/doctype/paytm_settings/test_paytm_settings.py
new file mode 100644
index 0000000000..77a16c82ae
--- /dev/null
+++ b/frappe/integrations/doctype/paytm_settings/test_paytm_settings.py
@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2020, Frappe Technologies and Contributors
+# See license.txt
+from __future__ import unicode_literals
+
+# import frappe
+import unittest
+
+class TestPaytmSettings(unittest.TestCase):
+	pass

From 8831bc6531bad3925526ea0d4e9f345cfbd89610 Mon Sep 17 00:00:00 2001
From: Mangesh-Khairnar <mkhairnar10@gmail.com>
Date: Wed, 8 Apr 2020 18:49:48 +0530
Subject: [PATCH 002/191] feat: blink checkout

---
 .../doctype/paytm_settings/checksum.py        | 143 ++++++++++++++++++
 .../includes/integrations/paytm_checkout.js   |  42 +++++
 2 files changed, 185 insertions(+)
 create mode 100644 frappe/integrations/doctype/paytm_settings/checksum.py
 create mode 100644 frappe/templates/includes/integrations/paytm_checkout.js

diff --git a/frappe/integrations/doctype/paytm_settings/checksum.py b/frappe/integrations/doctype/paytm_settings/checksum.py
new file mode 100644
index 0000000000..95fb7dc164
--- /dev/null
+++ b/frappe/integrations/doctype/paytm_settings/checksum.py
@@ -0,0 +1,143 @@
+import base64
+import string
+import random
+import hashlib
+
+from Crypto.Cipher import AES
+
+
+IV = "@@@@&&&&####$$$$"
+BLOCK_SIZE = 16
+
+
+def generate_checksum(param_dict, merchant_key, salt=None):
+	params_string = __get_param_string__(param_dict)
+	salt = salt if salt else __id_generator__(4)
+	final_string = '%s|%s' % (params_string, salt)
+
+	hasher = hashlib.sha256(final_string.encode())
+	hash_string = hasher.hexdigest()
+
+	hash_string += salt
+
+	return __encode__(hash_string, IV, merchant_key)
+
+
+def generate_refund_checksum(param_dict, merchant_key, salt=None):
+	for i in param_dict:
+		if("|" in param_dict[i]):
+			param_dict = {}
+			exit()
+	params_string = __get_param_string__(param_dict)
+	salt = salt if salt else __id_generator__(4)
+	final_string = '%s|%s' % (params_string, salt)
+
+	hasher = hashlib.sha256(final_string.encode())
+	hash_string = hasher.hexdigest()
+
+	hash_string += salt
+
+	return __encode__(hash_string, IV, merchant_key)
+
+
+def generate_checksum_by_str(param_str, merchant_key, salt=None):
+	params_string = param_str
+	salt = salt if salt else __id_generator__(4)
+	final_string = '%s|%s' % (params_string, salt)
+
+	hasher = hashlib.sha256(final_string.encode())
+	hash_string = hasher.hexdigest()
+
+	hash_string += salt
+
+	return __encode__(hash_string, IV, merchant_key)
+
+
+def verify_checksum(param_dict, merchant_key, checksum):
+	# Remove checksum
+	if 'CHECKSUMHASH' in param_dict:
+		param_dict.pop('CHECKSUMHASH')
+
+	# Get salt
+	paytm_hash = __decode__(checksum, IV, merchant_key)
+	salt = paytm_hash[-4:]
+	calculated_checksum = generate_checksum(
+		param_dict, merchant_key, salt=salt)
+	return calculated_checksum == checksum
+
+
+def verify_checksum_by_str(param_str, merchant_key, checksum):
+	# Remove checksum
+	# if 'CHECKSUMHASH' in param_dict:
+		# param_dict.pop('CHECKSUMHASH')
+
+	# Get salt
+	paytm_hash = __decode__(checksum, IV, merchant_key)
+	salt = paytm_hash[-4:]
+	calculated_checksum = generate_checksum_by_str(
+		param_str, merchant_key, salt=salt)
+	return calculated_checksum == checksum
+
+
+def __id_generator__(size=6, chars=string.ascii_uppercase + string.digits + string.ascii_lowercase):
+	return ''.join(random.choice(chars) for _ in range(size))
+
+
+def __get_param_string__(params):
+	params_string = []
+	for key in sorted(params.keys()):
+		if("REFUND" in params[key] or "|" in params[key]):
+			respons_dict = {}
+			exit()
+		value = params[key]
+		params_string.append('' if value == 'null' else str(value))
+	return '|'.join(params_string)
+
+
+def __pad__(s): return s + (BLOCK_SIZE - len(s) %
+							BLOCK_SIZE) * chr(BLOCK_SIZE - len(s) % BLOCK_SIZE)
+
+
+def __unpad__(s): return s[0:-ord(s[-1])]
+
+
+def __encode__(to_encode, iv, key):
+	# Pad
+	to_encode = __pad__(to_encode)
+	# Encrypt
+	c = AES.new(key, AES.MODE_CBC, iv)
+	to_encode = c.encrypt(to_encode)
+	# Encode
+	to_encode = base64.b64encode(to_encode)
+	return to_encode.decode("UTF-8")
+
+
+def __decode__(to_decode, iv, key):
+	# Decode
+	to_decode = base64.b64decode(to_decode)
+	# Decrypt
+	c = AES.new(key, AES.MODE_CBC, iv)
+	to_decode = c.decrypt(to_decode)
+	if type(to_decode) == bytes:
+		# convert bytes array to str.
+		to_decode = to_decode.decode()
+	# remove pad
+	return __unpad__(to_decode)
+
+
+if __name__ == "__main__":
+	params = {
+		"MID": "mid",
+		"ORDER_ID": "order_id",
+		"CUST_ID": "cust_id",
+		"TXN_AMOUNT": "1",
+		"CHANNEL_ID": "WEB",
+		"INDUSTRY_TYPE_ID": "Retail",
+		"WEBSITE": "xxxxxxxxxxx"
+	}
+
+	print(verify_checksum(
+		params, 'xxxxxxxxxxxxxxxx',
+		"CD5ndX8VVjlzjWbbYoAtKQIlvtXPypQYOg0Fi2AUYKXZA5XSHiRF0FDj7vQu66S8MHx9NaDZ/uYm3WBOWHf+sDQAmTyxqUipA7i1nILlxrk="))
+
+	# print(generate_checksum(params, "xxxxxxxxxxxxxxxx"))
diff --git a/frappe/templates/includes/integrations/paytm_checkout.js b/frappe/templates/includes/integrations/paytm_checkout.js
new file mode 100644
index 0000000000..4cf070b60b
--- /dev/null
+++ b/frappe/templates/includes/integrations/paytm_checkout.js
@@ -0,0 +1,42 @@
+function onScriptLoad() {
+	console.log('inside on load')
+	var config = {
+		root: '',
+		flow: 'DEFAULT',
+		data: {
+			orderId: '{{ order_id}}',
+			token: '{{ token }}',
+			tokenType: 'TXN_TOKEN',
+			amount: '{{ amount }}'
+		},
+		handler: {
+			notifyMerchant: function(eventName, data) {
+				// notify about the state of the payment page ( invalid token , session expire , cancel transaction)
+				console.log('notifyMerchant handler function called');
+				console.log('eventName => ', eventName);
+				console.log('data => ', data);
+			},
+			transactionStatus: function transactionStatus(paymentStatus) {
+				// provide information to merchant about the payment status.
+				console.log('transaction status handler function called');
+				console.log('paymentStatus => ', paymentStatus);
+			}
+		}
+	};
+
+	$('.paytm-loading').addClass('hidden');
+	if (window.Paytm && window.Paytm.CheckoutJS) {
+		window.Paytm.CheckoutJS.onLoad(function excecuteAfterCompleteLoad() {
+			// initialze configuration using init method
+			window.Paytm.CheckoutJS.init(config)
+				.then(function onSuccess() {
+					// after successfully updating configuration, invoke Blink Checkout
+					window.Paytm.CheckoutJS.invoke();
+				})
+				.catch(function onError(error) {
+					console.log('inside the error window')
+					console.log('error => ', error);
+				});
+		});
+	}
+}

From 72e88b344033d8512651770c1f170324fa66d08d Mon Sep 17 00:00:00 2001
From: Mangesh-Khairnar <mkhairnar10@gmail.com>
Date: Fri, 10 Apr 2020 12:50:54 +0530
Subject: [PATCH 003/191] feat: create transaction token

---
 .../doctype/paytm_settings/paytm_settings.py  | 150 +++++++++++++++++-
 .../pages/integrations/paytm_checkout.html    |  26 +++
 .../pages/integrations/paytm_checkout.py      | 105 ++++++++++++
 3 files changed, 279 insertions(+), 2 deletions(-)
 create mode 100644 frappe/templates/pages/integrations/paytm_checkout.html
 create mode 100644 frappe/templates/pages/integrations/paytm_checkout.py

diff --git a/frappe/integrations/doctype/paytm_settings/paytm_settings.py b/frappe/integrations/doctype/paytm_settings/paytm_settings.py
index 74d51d1dcc..1f9e508460 100644
--- a/frappe/integrations/doctype/paytm_settings/paytm_settings.py
+++ b/frappe/integrations/doctype/paytm_settings/paytm_settings.py
@@ -3,8 +3,154 @@
 # For license information, please see license.txt
 
 from __future__ import unicode_literals
-# import frappe
+import frappe
 from frappe.model.document import Document
+from frappe import _
+from six.moves.urllib.parse import urlencode
+from frappe.utils import get_url, call_hook_method, cint, flt
+from frappe.integrations.utils import make_get_request, make_post_request, create_request_log, create_payment_gateway
+from frappe.utils import get_request_site_address
+
+import json
+import requests
 
 class PaytmSettings(Document):
-	pass
+	supported_currencies = ["INR"]
+
+	def validate(self):
+		create_payment_gateway('Paytm')
+		call_hook_method('payment_gateway_enabled', gateway='Paytm')
+		if not self.flags.ignore_mandatory:
+			self.validate_paytm_credentails()
+
+	def validate_paytm_credentails(self):
+		if self.merchant_id and self.merchant_key:
+			pass
+			# header = {"Authorization": "Bearer {0}".format(self.get_password(fieldname="secret_key", raise_exception=False))}
+			# try:
+			# 	make_get_request(url="https://api.stripe.com/v1/charges", headers=header)
+			# except Exception:
+			# 	frappe.throw(_("Seems Publishable Key or Secret Key is wrong !!!"))
+
+	def validate_transaction_currency(self, currency):
+		if currency not in self.supported_currencies:
+			frappe.throw(_("Please select another payment method. Stripe does not support transactions in currency '{0}'").format(currency))
+
+	def get_payment_url(self, **kwargs):
+		'''Return payment url with several params'''
+		# create unique order id by making it equal to the integration request
+		integration_request = create_request_log(kwargs, "Host", "Paytm")
+		kwargs.update(dict(order_id=integration_request.name))
+
+		return get_url("./integrations/paytm_checkout?{0}".format(urlencode(kwargs)))
+
+	def create_request(self, data):
+		self.data = frappe._dict(data)
+
+		try:
+			self.integration_request = create_request_log(self.data, "Host", "Paytm")
+			return self.generate_transaction_token()
+
+		except Exception:
+			frappe.log_error(frappe.get_traceback())
+			return{
+				"redirect_to": frappe.redirect_to_message(_('Server Error'), _("It seems that there is an issue with the server's stripe configuration. In case of failure, the amount will get refunded to your account.")),
+				"status": 401
+			}
+
+	def generate_transaction_token(self):
+		import stripe
+		try:
+			charge = stripe.Charge.create(amount=cint(flt(self.data.amount)*100), currency=self.data.currency, source=self.data.stripe_token_id, description=self.data.description, receipt_email=self.data.payer_email)
+
+			if charge.captured == True:
+				self.integration_request.db_set('status', 'Completed', update_modified=False)
+				self.flags.status_changed_to = "Completed"
+
+			else:
+				frappe.log_error(charge.failure_message, 'Stripe Payment not completed')
+
+		except Exception:
+			frappe.log_error(frappe.get_traceback())
+
+		return self.finalize_request()
+
+
+	def finalize_request(self):
+		redirect_to = self.data.get('redirect_to') or None
+		redirect_message = self.data.get('redirect_message') or None
+		status = self.integration_request.status
+
+		if self.flags.status_changed_to == "Completed":
+			if self.data.reference_doctype and self.data.reference_docname:
+				custom_redirect_to = None
+				try:
+					custom_redirect_to = frappe.get_doc(self.data.reference_doctype,
+						self.data.reference_docname).run_method("on_payment_authorized", self.flags.status_changed_to)
+				except Exception:
+					frappe.log_error(frappe.get_traceback())
+
+				if custom_redirect_to:
+					redirect_to = custom_redirect_to
+
+				redirect_url = 'payment-success'
+
+			if self.redirect_url:
+				redirect_url = self.redirect_url
+				redirect_to = None
+		else:
+			redirect_url = 'payment-failed'
+
+		if redirect_to:
+			redirect_url += '?' + urlencode({'redirect_to': redirect_to})
+		if redirect_message:
+			redirect_url += '&' + urlencode({'redirect_message': redirect_message})
+
+		return {
+			"redirect_to": redirect_url,
+			"status": status
+		}
+
+def generate_transaction_token(payment_details, order_id, merchant_id, merchant_key):
+
+	# initialize a dictionary
+	paytmParams = dict()
+
+	redirect_uri = get_request_site_address(True) + "?cmd=frappe.templates.pages.integrations.paytm_checkout.get_transaction_status"
+
+	# body parameters
+	paytmParams["body"] = get_paytm_params(payment_details, order_id, merchant_id, merchant_key)
+
+	checksum = generate_checksum_by_str(json.dumps(paytmParams["body"]), merchant_key)
+
+	paytmParams["head"] = {
+		"signature"  : checksum
+	}
+
+	post_data = json.dumps(paytmParams)
+
+	url = "https://securegw-stage.paytm.in/theia/api/v1/initiateTransaction?mid={0}&orderId={1}".format(merchant_id, order_id)
+
+	response = requests.post(url, data = post_data, headers = {"Content-type": "application/json"}).json()
+	return response['body'].get('txnToken')
+
+def get_paytm_params(payment_details, order_id, merchant_id, merchant_key):
+	return {
+		"requestType" : "Payment",
+		"mid" : merchant_id,
+		"websiteName" : "WEBSTAGING",
+		"orderId" : order_id,
+		"callbackUrl" : redirect_uri,
+		"txnAmount" : {
+			"value" : flt(payment_details['amount'], 2),
+			"currency" : "INR",
+		},
+		"userInfo" : {
+			"custId" : payment_details['payer_email'],
+		},
+	}
+
+def get_gateway_controller(doctype, docname):
+	reference_doc = frappe.get_doc(doctype, docname)
+	gateway_controller = frappe.db.get_value("Payment Gateway", reference_doc.payment_gateway, "gateway_controller")
+	return gateway_controller
\ No newline at end of file
diff --git a/frappe/templates/pages/integrations/paytm_checkout.html b/frappe/templates/pages/integrations/paytm_checkout.html
new file mode 100644
index 0000000000..2aedf31d65
--- /dev/null
+++ b/frappe/templates/pages/integrations/paytm_checkout.html
@@ -0,0 +1,26 @@
+{% extends "templates/web.html" %} {% block title %} Payment {% endblock %} {%-
+block header -%}{% endblock %} {% block script %}
+<script defer
+	type="application/javascript"
+	crossorigin="anonymous"
+	src="{{ host }}/merchantpgpui/checkoutjs/merchants/{{ mid }}.js"
+	onload="onScriptLoad();"
+></script>
+<script>
+	{% include "/templates/includes/integrations/paytm_checkout.js" %}
+</script>
+{% endblock %} {%- block page_content -%}
+<div id="paytm-checkoutjs"></div>
+<p class="lead text-center centered">
+	<span class="paytm-loading">Loading Payment System</span>
+	<span class="paytm-confirming hidden">Confirming Payment</span>
+</p>
+
+{% endblock %} {% block style %}
+<style>
+	/* header,
+	footer {
+		display: none;
+	} */
+</style>
+{% endblock %}
diff --git a/frappe/templates/pages/integrations/paytm_checkout.py b/frappe/templates/pages/integrations/paytm_checkout.py
new file mode 100644
index 0000000000..a17873bc80
--- /dev/null
+++ b/frappe/templates/pages/integrations/paytm_checkout.py
@@ -0,0 +1,105 @@
+# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
+# License: GNU General Public License v3. See license.txt
+from __future__ import unicode_literals
+import frappe
+from frappe import _
+from frappe.utils import flt, cint
+import json
+from six import string_types
+from frappe.integrations.doctype.paytm_settings.checksum import generate_checksum_by_str
+from frappe.utils import get_request_site_address
+import requests
+
+no_cache = 1
+
+expected_keys = ('amount', 'title', 'description', 'reference_doctype', 'reference_docname',
+	'payer_name', 'payer_email')
+
+def get_context(context):
+	context.no_cache = 1
+	merchant_id, merchant_key = get_paytm_credentials()
+
+	try:
+		doc = frappe.get_doc("Integration Request", frappe.form_dict['order_id'])
+		payment_details = json.loads(doc.data)
+		context.token = generate_transaction_token(payment_details, doc.name, merchant_id, merchant_key)
+		context.order_id = doc.name
+
+
+		for key in expected_keys:
+			context[key] = payment_details[key]
+
+		context['amount'] = flt(context['amount'], 2)
+		context.host = 'https://securegw-stage.paytm.in'
+		context.mid = merchant_id
+
+	except Exception as e:
+		frappe.log_error()
+		frappe.redirect_to_message(_('Invalid Token'),
+			_('Seems token you are using is invalid!'),
+			http_status_code=400, indicator_color='red')
+
+		frappe.local.flags.redirect_location = frappe.local.response.location
+		raise frappe.Redirect
+
+def get_paytm_credentials():
+	return frappe.db.get_value("Paytm Settings", None, ['merchant_id', 'merchant_key'])
+
+@frappe.whitelist(allow_guest=True)
+def make_payment(paytm_payment_id, options, reference_doctype, reference_docname, token):
+	data = {}
+
+	if isinstance(options, string_types):
+		data = json.loads(options)
+
+	data.update({
+		"paytm_payment_id": paytm_payment_id,
+		"reference_docname": reference_docname,
+		"reference_doctype": reference_doctype,
+		"token": token
+	})
+
+	data =  frappe.get_doc("Paytm Settings").create_request(data)
+	frappe.db.commit()
+	return data
+
+def generate_transaction_token(payment_details, order_id, merchant_id, merchant_key):
+
+	# initialize a dictionary
+	paytmParams = dict()
+
+	redirect_uri = get_request_site_address(True) + "?cmd=frappe.templates.pages.integrations.paytm_checkout.get_transaction_status"
+
+	# body parameters
+	paytmParams["body"] = {
+		"requestType" : "Payment",
+		"mid" : merchant_id,
+		"websiteName" : "WEBSTAGING",
+		"orderId" : order_id,
+		"callbackUrl" : redirect_uri,
+		"txnAmount" : {
+			"value" : flt(payment_details['amount'], 2),
+			"currency" : "INR",
+		},
+		"userInfo" : {
+			"custId" : payment_details['payer_email'],
+		},
+	}
+
+	checksum = generate_checksum_by_str(json.dumps(paytmParams["body"]), merchant_key)
+
+	paytmParams["head"] = {
+		"signature"  : checksum
+	}
+
+	print(paytmParams)
+	post_data = json.dumps(paytmParams)
+
+	url = "https://securegw-stage.paytm.in/theia/api/v1/initiateTransaction?mid={0}&orderId={1}".format(merchant_id, order_id)
+
+	response = requests.post(url, data = post_data, headers = {"Content-type": "application/json"}).json()
+	return response['body'].get('txnToken')
+
+@frappe.whitelist(allow_guest=True)
+def get_transaction_status():
+	print(vars(frappe.form_dict))
\ No newline at end of file

From 3f6459edbb384d1529fe350bd93bd413c4b4f136 Mon Sep 17 00:00:00 2001
From: Mangesh-Khairnar <mkhairnar10@gmail.com>
Date: Thu, 16 Apr 2020 15:48:37 +0530
Subject: [PATCH 004/191] fix: paytm integration

---
 .pylintrc                                                      | 2 --
 frappe/integrations/doctype/paytm_settings/paytm_settings.json | 3 +--
 2 files changed, 1 insertion(+), 4 deletions(-)
 delete mode 100644 .pylintrc

diff --git a/.pylintrc b/.pylintrc
deleted file mode 100644
index c11c0ab6a3..0000000000
--- a/.pylintrc
+++ /dev/null
@@ -1,2 +0,0 @@
-disable=access-member-before-definition
-disable=no-member
\ No newline at end of file
diff --git a/frappe/integrations/doctype/paytm_settings/paytm_settings.json b/frappe/integrations/doctype/paytm_settings/paytm_settings.json
index e57c8a192c..eb68f0ab79 100644
--- a/frappe/integrations/doctype/paytm_settings/paytm_settings.json
+++ b/frappe/integrations/doctype/paytm_settings/paytm_settings.json
@@ -17,13 +17,12 @@
   {
    "fieldname": "merchant_key",
    "fieldtype": "Data",
-   "hidden": 1,
    "label": "Merchant Key"
   }
  ],
  "issingle": 1,
  "links": [],
- "modified": "2020-04-02 00:11:22.846697",
+ "modified": "2020-04-07 19:57:24.126640",
  "modified_by": "Administrator",
  "module": "Integrations",
  "name": "Paytm Settings",

From b0a34c602d9954f9b1d77fae918ce167a2ba799e Mon Sep 17 00:00:00 2001
From: Mangesh-Khairnar <mkhairnar10@gmail.com>
Date: Thu, 16 Apr 2020 15:51:11 +0530
Subject: [PATCH 005/191] fix: initiate payment via standard checkout

---
 .../pages/integrations/paytm_checkout.html    | 47 ++++++-----
 .../pages/integrations/paytm_checkout.py      | 78 ++-----------------
 2 files changed, 33 insertions(+), 92 deletions(-)

diff --git a/frappe/templates/pages/integrations/paytm_checkout.html b/frappe/templates/pages/integrations/paytm_checkout.html
index 2aedf31d65..772e16ecb8 100644
--- a/frappe/templates/pages/integrations/paytm_checkout.html
+++ b/frappe/templates/pages/integrations/paytm_checkout.html
@@ -1,26 +1,35 @@
-{% extends "templates/web.html" %} {% block title %} Payment {% endblock %} {%-
-block header -%}{% endblock %} {% block script %}
-<script defer
-	type="application/javascript"
-	crossorigin="anonymous"
-	src="{{ host }}/merchantpgpui/checkoutjs/merchants/{{ mid }}.js"
-	onload="onScriptLoad();"
-></script>
-<script>
-	{% include "/templates/includes/integrations/paytm_checkout.js" %}
-</script>
-{% endblock %} {%- block page_content -%}
-<div id="paytm-checkoutjs"></div>
-<p class="lead text-center centered">
-	<span class="paytm-loading">Loading Payment System</span>
-	<span class="paytm-confirming hidden">Confirming Payment</span>
-</p>
+{% extends "templates/web.html" %}
 
-{% endblock %} {% block style %}
+{% block title %} Payment {% endblock %}
+
+{%- block header -%}
+<head>
+	<title>Merchant Checkout Page</title>
+</head>
+{% endblock %}
+
+{% block script %}
+<script defer type="text/javascript">
+	document.paytm_form.submit();
+</script>
+{% endblock %}
+
+{%- block page_content -%}
+<body>
+		<center><h1>Please do not refresh this page...</h1></center>
+		<form method="post" action="{{ url }}" name="paytm_form">
+			{% for name, value in payment_details.items() %}
+				<input type="hidden" name="{{ name }}" value="{{ value }}">
+			{% endfor %}
+		</form>
+</body>
+{% endblock %}
+
+{% block style %}
 <style>
 	/* header,
 	footer {
 		display: none;
 	} */
 </style>
-{% endblock %}
+{% endblock %}
\ No newline at end of file
diff --git a/frappe/templates/pages/integrations/paytm_checkout.py b/frappe/templates/pages/integrations/paytm_checkout.py
index a17873bc80..1c61d5cab4 100644
--- a/frappe/templates/pages/integrations/paytm_checkout.py
+++ b/frappe/templates/pages/integrations/paytm_checkout.py
@@ -6,8 +6,8 @@ from frappe import _
 from frappe.utils import flt, cint
 import json
 from six import string_types
-from frappe.integrations.doctype.paytm_settings.checksum import generate_checksum_by_str
 from frappe.utils import get_request_site_address
+from frappe.integrations.doctype.paytm_settings.paytm_settings import get_paytm_params, get_paytm_config
 import requests
 
 no_cache = 1
@@ -17,21 +17,15 @@ expected_keys = ('amount', 'title', 'description', 'reference_doctype', 'referen
 
 def get_context(context):
 	context.no_cache = 1
-	merchant_id, merchant_key = get_paytm_credentials()
+	paytm_config = get_paytm_config()
 
 	try:
 		doc = frappe.get_doc("Integration Request", frappe.form_dict['order_id'])
 		payment_details = json.loads(doc.data)
-		context.token = generate_transaction_token(payment_details, doc.name, merchant_id, merchant_key)
-		context.order_id = doc.name
 
+		context.payment_details = get_paytm_params(json.loads(doc.data), doc.name, paytm_config)
 
-		for key in expected_keys:
-			context[key] = payment_details[key]
-
-		context['amount'] = flt(context['amount'], 2)
-		context.host = 'https://securegw-stage.paytm.in'
-		context.mid = merchant_id
+		context.url = paytm_config.url
 
 	except Exception as e:
 		frappe.log_error()
@@ -40,66 +34,4 @@ def get_context(context):
 			http_status_code=400, indicator_color='red')
 
 		frappe.local.flags.redirect_location = frappe.local.response.location
-		raise frappe.Redirect
-
-def get_paytm_credentials():
-	return frappe.db.get_value("Paytm Settings", None, ['merchant_id', 'merchant_key'])
-
-@frappe.whitelist(allow_guest=True)
-def make_payment(paytm_payment_id, options, reference_doctype, reference_docname, token):
-	data = {}
-
-	if isinstance(options, string_types):
-		data = json.loads(options)
-
-	data.update({
-		"paytm_payment_id": paytm_payment_id,
-		"reference_docname": reference_docname,
-		"reference_doctype": reference_doctype,
-		"token": token
-	})
-
-	data =  frappe.get_doc("Paytm Settings").create_request(data)
-	frappe.db.commit()
-	return data
-
-def generate_transaction_token(payment_details, order_id, merchant_id, merchant_key):
-
-	# initialize a dictionary
-	paytmParams = dict()
-
-	redirect_uri = get_request_site_address(True) + "?cmd=frappe.templates.pages.integrations.paytm_checkout.get_transaction_status"
-
-	# body parameters
-	paytmParams["body"] = {
-		"requestType" : "Payment",
-		"mid" : merchant_id,
-		"websiteName" : "WEBSTAGING",
-		"orderId" : order_id,
-		"callbackUrl" : redirect_uri,
-		"txnAmount" : {
-			"value" : flt(payment_details['amount'], 2),
-			"currency" : "INR",
-		},
-		"userInfo" : {
-			"custId" : payment_details['payer_email'],
-		},
-	}
-
-	checksum = generate_checksum_by_str(json.dumps(paytmParams["body"]), merchant_key)
-
-	paytmParams["head"] = {
-		"signature"  : checksum
-	}
-
-	print(paytmParams)
-	post_data = json.dumps(paytmParams)
-
-	url = "https://securegw-stage.paytm.in/theia/api/v1/initiateTransaction?mid={0}&orderId={1}".format(merchant_id, order_id)
-
-	response = requests.post(url, data = post_data, headers = {"Content-type": "application/json"}).json()
-	return response['body'].get('txnToken')
-
-@frappe.whitelist(allow_guest=True)
-def get_transaction_status():
-	print(vars(frappe.form_dict))
\ No newline at end of file
+		raise frappe.Redirect
\ No newline at end of file

From 9d71bdcd874451181c21b384be81f8e88f390500 Mon Sep 17 00:00:00 2001
From: Mangesh-Khairnar <mkhairnar10@gmail.com>
Date: Thu, 16 Apr 2020 18:53:56 +0530
Subject: [PATCH 006/191] feat: add paytm config, transaction status

---
 .../paytm_settings/paytm_settings.json        |  40 +++-
 .../doctype/paytm_settings/paytm_settings.py  | 206 ++++++++++--------
 2 files changed, 148 insertions(+), 98 deletions(-)

diff --git a/frappe/integrations/doctype/paytm_settings/paytm_settings.json b/frappe/integrations/doctype/paytm_settings/paytm_settings.json
index eb68f0ab79..0540dc4948 100644
--- a/frappe/integrations/doctype/paytm_settings/paytm_settings.json
+++ b/frappe/integrations/doctype/paytm_settings/paytm_settings.json
@@ -6,23 +6,55 @@
  "engine": "InnoDB",
  "field_order": [
   "merchant_id",
-  "merchant_key"
+  "merchant_key",
+  "staging",
+  "column_break_4",
+  "industry_type",
+  "website"
  ],
  "fields": [
   {
    "fieldname": "merchant_id",
    "fieldtype": "Data",
-   "label": "Merchant ID"
+   "in_list_view": 1,
+   "label": "Merchant ID",
+   "reqd": 1
   },
   {
    "fieldname": "merchant_key",
+   "fieldtype": "Password",
+   "in_list_view": 1,
+   "label": "Merchant Key",
+   "reqd": 1
+  },
+  {
+   "default": "0",
+   "fieldname": "staging",
+   "fieldtype": "Check",
+   "label": "Staging"
+  },
+  {
+   "depends_on": "eval: !doc.staging",
+   "fieldname": "industry_type",
    "fieldtype": "Data",
-   "label": "Merchant Key"
+   "label": "Industry Type",
+   "mandatory_depends_on": "eval: !doc.staging"
+  },
+  {
+   "depends_on": "eval: !doc.staging",
+   "fieldname": "website",
+   "fieldtype": "Data",
+   "label": "Website",
+   "mandatory_depends_on": "eval: !doc.staging"
+  },
+  {
+   "fieldname": "column_break_4",
+   "fieldtype": "Column Break"
   }
  ],
  "issingle": 1,
  "links": [],
- "modified": "2020-04-07 19:57:24.126640",
+ "modified": "2020-04-16 14:16:19.687449",
  "modified_by": "Administrator",
  "module": "Integrations",
  "name": "Paytm Settings",
diff --git a/frappe/integrations/doctype/paytm_settings/paytm_settings.py b/frappe/integrations/doctype/paytm_settings/paytm_settings.py
index 1f9e508460..10282d34ea 100644
--- a/frappe/integrations/doctype/paytm_settings/paytm_settings.py
+++ b/frappe/integrations/doctype/paytm_settings/paytm_settings.py
@@ -3,16 +3,18 @@
 # For license information, please see license.txt
 
 from __future__ import unicode_literals
+import json
+import requests
+from six.moves.urllib.parse import urlencode
+
 import frappe
 from frappe.model.document import Document
 from frappe import _
-from six.moves.urllib.parse import urlencode
-from frappe.utils import get_url, call_hook_method, cint, flt
+from frappe.utils import get_url, call_hook_method, cint, flt, cstr
 from frappe.integrations.utils import make_get_request, make_post_request, create_request_log, create_payment_gateway
 from frappe.utils import get_request_site_address
-
-import json
-import requests
+from frappe.integrations.doctype.paytm_settings.checksum import generate_checksum, verify_checksum
+from frappe.utils.password import get_decrypted_password
 
 class PaytmSettings(Document):
 	supported_currencies = ["INR"]
@@ -44,110 +46,126 @@ class PaytmSettings(Document):
 
 		return get_url("./integrations/paytm_checkout?{0}".format(urlencode(kwargs)))
 
-	def create_request(self, data):
-		self.data = frappe._dict(data)
+def get_paytm_config():
+	''' Returns paytm config '''
 
-		try:
-			self.integration_request = create_request_log(self.data, "Host", "Paytm")
-			return self.generate_transaction_token()
+	paytm_config = frappe.db.get_singles_dict('Paytm Settings')
+	paytm_config.update(dict(merchant_key=get_decrypted_password('Paytm Settings', 'Paytm Settings', 'merchant_key')))
 
-		except Exception:
-			frappe.log_error(frappe.get_traceback())
-			return{
-				"redirect_to": frappe.redirect_to_message(_('Server Error'), _("It seems that there is an issue with the server's stripe configuration. In case of failure, the amount will get refunded to your account.")),
-				"status": 401
-			}
+	if cint(paytm_config.staging):
+		paytm_config.update(dict(
+			website="WEBSTAGING",
+			url='https://securegw-stage.paytm.in/order/process',
+			transaction_status_url='https://securegw-stage.paytm.in/order/status',
+			industry_type_id='RETAIL'
+		))
+	else:
+		paytm_config.update(dict(
+			url='https://securegw.paytm.in/order/process',
+			transaction_status_url='https://securegw.paytm.in/order/status',
+		))
+	return paytm_config
 
-	def generate_transaction_token(self):
-		import stripe
-		try:
-			charge = stripe.Charge.create(amount=cint(flt(self.data.amount)*100), currency=self.data.currency, source=self.data.stripe_token_id, description=self.data.description, receipt_email=self.data.payer_email)
-
-			if charge.captured == True:
-				self.integration_request.db_set('status', 'Completed', update_modified=False)
-				self.flags.status_changed_to = "Completed"
-
-			else:
-				frappe.log_error(charge.failure_message, 'Stripe Payment not completed')
-
-		except Exception:
-			frappe.log_error(frappe.get_traceback())
-
-		return self.finalize_request()
-
-
-	def finalize_request(self):
-		redirect_to = self.data.get('redirect_to') or None
-		redirect_message = self.data.get('redirect_message') or None
-		status = self.integration_request.status
-
-		if self.flags.status_changed_to == "Completed":
-			if self.data.reference_doctype and self.data.reference_docname:
-				custom_redirect_to = None
-				try:
-					custom_redirect_to = frappe.get_doc(self.data.reference_doctype,
-						self.data.reference_docname).run_method("on_payment_authorized", self.flags.status_changed_to)
-				except Exception:
-					frappe.log_error(frappe.get_traceback())
-
-				if custom_redirect_to:
-					redirect_to = custom_redirect_to
-
-				redirect_url = 'payment-success'
-
-			if self.redirect_url:
-				redirect_url = self.redirect_url
-				redirect_to = None
-		else:
-			redirect_url = 'payment-failed'
-
-		if redirect_to:
-			redirect_url += '?' + urlencode({'redirect_to': redirect_to})
-		if redirect_message:
-			redirect_url += '&' + urlencode({'redirect_message': redirect_message})
-
-		return {
-			"redirect_to": redirect_url,
-			"status": status
-		}
-
-def generate_transaction_token(payment_details, order_id, merchant_id, merchant_key):
+def get_paytm_params(payment_details, order_id, paytm_config):
 
 	# initialize a dictionary
-	paytmParams = dict()
+	paytm_params = dict()
+	
+	# redirect_uri = get_request_site_address(True) + "/api/method/frappe.integrations.doctype.paytm_settings.paytm_settings.get_transaction_status"
+	redirect_uri = "http://cf9b2bb1.ngrok.io/api/method/frappe.integrations.doctype.paytm_settings.paytm_settings.get_transaction_status"
 
-	redirect_uri = get_request_site_address(True) + "?cmd=frappe.templates.pages.integrations.paytm_checkout.get_transaction_status"
+	paytm_params.update({
+		"MID" : paytm_config.merchant_id,
+		"WEBSITE" : paytm_config.website,
+		"INDUSTRY_TYPE_ID" : paytm_config.industry_type_id,
+		"CHANNEL_ID" : "WEB",
+		"ORDER_ID" : order_id,
+		"CUST_ID" : payment_details['payer_email'],
+		"EMAIL" : payment_details['payer_email'],
+		"TXN_AMOUNT" : cstr(flt(payment_details['amount'], 2)),
+		"CALLBACK_URL" : redirect_uri,
+	})
 
-	# body parameters
-	paytmParams["body"] = get_paytm_params(payment_details, order_id, merchant_id, merchant_key)
+	checksum = generate_checksum(paytm_params, paytm_config.merchant_key)
 
-	checksum = generate_checksum_by_str(json.dumps(paytmParams["body"]), merchant_key)
+	paytm_params.update({
+		"CHECKSUMHASH" : checksum
+	})
 
-	paytmParams["head"] = {
-		"signature"  : checksum
-	}
+	return paytm_params
 
-	post_data = json.dumps(paytmParams)
+@frappe.whitelist(allow_guest=True)
+def verify_transaction(**kwargs):
+	'''Verify checksum for received data in the callback and then verify the transaction'''
+	paytm_config = get_paytm_config()
+	received_data = frappe._dict(kwargs)
 
-	url = "https://securegw-stage.paytm.in/theia/api/v1/initiateTransaction?mid={0}&orderId={1}".format(merchant_id, order_id)
+	print(received_data)
+	paytm_params = {}
+	for key, value in received_data.items(): 
+		if key == 'CHECKSUMHASH':
+			paytm_checksum = value
+		else:
+			paytm_params[key] = value
+
+	# Verify checksum
+	is_valid_checksum = verify_checksum(paytm_params, paytm_config.merchant_key, paytm_checksum)
+
+	if is_valid_checksum and received_data['RESPCODE'] == '01':
+		verify_transaction_status(paytm_config, received_data['ORDERID'])
+	else:
+		frappe.respond_as_web_page("Payment Failed",
+			"Transaction failed to complete. Don't worry, in case of failure amount will get refunded to your account.",
+			http_status_code=401, indicator_color='red')
+		frappe.log_error("Order unsuccessful, received data:"+received_data, 'Paytm Payment Failed')
+
+def verify_transaction_status(paytm_config, order_id):
+	'''Verify transaction completion after checksum has been verified'''
+	paytm_params=dict(
+		MID=paytm_config.merchant_id,
+		ORDERID= order_id
+	)
+
+	checksum = generate_checksum(paytm_params, paytm_config.merchant_key)
+	paytm_params["CHECKSUMHASH"] = checksum
+
+	post_data = json.dumps(paytm_params)
+	url = paytm_config.transaction_status_url
 
 	response = requests.post(url, data = post_data, headers = {"Content-type": "application/json"}).json()
-	return response['body'].get('txnToken')
+	print('transaction status response')
+	print(response)
+	finalize_request(order_id, response)
+
+def finalize_request(order_id, response):
+	request = frappe.db.get_value('Integration Request', order_id)
+	redirect_to = request.data.get('redirect_to') or None
+	redirect_message = request.data.get('redirect_message') or None
+
+	if request.flags.status_changed_to == "Completed":
+		if request.data.reference_doctype and request.data.reference_docname:
+			custom_redirect_to = None
+			try:
+				custom_redirect_to = frappe.get_doc(request.data.reference_doctype,
+					request.data.reference_docname).run_method("on_payment_authorized", request.flags.status_changed_to)
+			except Exception:
+				frappe.log_error(frappe.get_traceback())
+
+			if custom_redirect_to:
+				redirect_to = custom_redirect_to
+
+			redirect_url = 'payment-success'
+	else:
+		redirect_url = 'payment-failed'
+
+	if redirect_to:
+		redirect_url += '?' + urlencode({'redirect_to': redirect_to})
+	if redirect_message:
+		redirect_url += '&' + urlencode({'redirect_message': redirect_message})
 
-def get_paytm_params(payment_details, order_id, merchant_id, merchant_key):
 	return {
-		"requestType" : "Payment",
-		"mid" : merchant_id,
-		"websiteName" : "WEBSTAGING",
-		"orderId" : order_id,
-		"callbackUrl" : redirect_uri,
-		"txnAmount" : {
-			"value" : flt(payment_details['amount'], 2),
-			"currency" : "INR",
-		},
-		"userInfo" : {
-			"custId" : payment_details['payer_email'],
-		},
+		"redirect_to": redirect_url,
+		"status": status
 	}
 
 def get_gateway_controller(doctype, docname):

From cf5da1c787e1a24ef707d8541e26e5091421ee63 Mon Sep 17 00:00:00 2001
From: Mangesh-Khairnar <mkhairnar10@gmail.com>
Date: Fri, 17 Apr 2020 10:02:54 +0530
Subject: [PATCH 007/191] fix: check for transaction success in the final stage

---
 .../doctype/paytm_settings/paytm_settings.py        | 13 ++++---------
 .../templates/pages/integrations/paytm_checkout.py  |  1 -
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/frappe/integrations/doctype/paytm_settings/paytm_settings.py b/frappe/integrations/doctype/paytm_settings/paytm_settings.py
index 10282d34ea..3382aeb6ed 100644
--- a/frappe/integrations/doctype/paytm_settings/paytm_settings.py
+++ b/frappe/integrations/doctype/paytm_settings/paytm_settings.py
@@ -100,7 +100,6 @@ def verify_transaction(**kwargs):
 	paytm_config = get_paytm_config()
 	received_data = frappe._dict(kwargs)
 
-	print(received_data)
 	paytm_params = {}
 	for key, value in received_data.items(): 
 		if key == 'CHECKSUMHASH':
@@ -133,16 +132,14 @@ def verify_transaction_status(paytm_config, order_id):
 	url = paytm_config.transaction_status_url
 
 	response = requests.post(url, data = post_data, headers = {"Content-type": "application/json"}).json()
-	print('transaction status response')
-	print(response)
 	finalize_request(order_id, response)
 
-def finalize_request(order_id, response):
+def finalize_request(order_id, transaction_response):
 	request = frappe.db.get_value('Integration Request', order_id)
 	redirect_to = request.data.get('redirect_to') or None
 	redirect_message = request.data.get('redirect_message') or None
 
-	if request.flags.status_changed_to == "Completed":
+	if transaction_response['STATUS'] == "TXN_SUCCESS":
 		if request.data.reference_doctype and request.data.reference_docname:
 			custom_redirect_to = None
 			try:
@@ -163,10 +160,8 @@ def finalize_request(order_id, response):
 	if redirect_message:
 		redirect_url += '&' + urlencode({'redirect_message': redirect_message})
 
-	return {
-		"redirect_to": redirect_url,
-		"status": status
-	}
+	frappe.local.response['type'] = 'redirect'
+	frappe.local.response['location'] = 'redirect_url'
 
 def get_gateway_controller(doctype, docname):
 	reference_doc = frappe.get_doc(doctype, docname)
diff --git a/frappe/templates/pages/integrations/paytm_checkout.py b/frappe/templates/pages/integrations/paytm_checkout.py
index 1c61d5cab4..1fa947a68f 100644
--- a/frappe/templates/pages/integrations/paytm_checkout.py
+++ b/frappe/templates/pages/integrations/paytm_checkout.py
@@ -21,7 +21,6 @@ def get_context(context):
 
 	try:
 		doc = frappe.get_doc("Integration Request", frappe.form_dict['order_id'])
-		payment_details = json.loads(doc.data)
 
 		context.payment_details = get_paytm_params(json.loads(doc.data), doc.name, paytm_config)
 

From 0cbf937763cf96ee2fd567aba550ebf0fe29b273 Mon Sep 17 00:00:00 2001
From: Mangesh-Khairnar <mkhairnar10@gmail.com>
Date: Fri, 17 Apr 2020 13:34:26 +0530
Subject: [PATCH 008/191] fix: change status of integration request on
 completion

---
 .../integrations/doctype/paytm_settings/paytm_settings.py  | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/frappe/integrations/doctype/paytm_settings/paytm_settings.py b/frappe/integrations/doctype/paytm_settings/paytm_settings.py
index 3382aeb6ed..39a9f42aa0 100644
--- a/frappe/integrations/doctype/paytm_settings/paytm_settings.py
+++ b/frappe/integrations/doctype/paytm_settings/paytm_settings.py
@@ -135,7 +135,7 @@ def verify_transaction_status(paytm_config, order_id):
 	finalize_request(order_id, response)
 
 def finalize_request(order_id, transaction_response):
-	request = frappe.db.get_value('Integration Request', order_id)
+	request = frappe.get_doc('Integration Request', order_id)
 	redirect_to = request.data.get('redirect_to') or None
 	redirect_message = request.data.get('redirect_message') or None
 
@@ -144,8 +144,10 @@ def finalize_request(order_id, transaction_response):
 			custom_redirect_to = None
 			try:
 				custom_redirect_to = frappe.get_doc(request.data.reference_doctype,
-					request.data.reference_docname).run_method("on_payment_authorized", request.flags.status_changed_to)
+					request.data.reference_docname).run_method("on_payment_authorized", 'Completed')
+				request.db_set('status', 'Completed')
 			except Exception:
+				request.db_set('status', 'Failed')
 				frappe.log_error(frappe.get_traceback())
 
 			if custom_redirect_to:
@@ -153,6 +155,7 @@ def finalize_request(order_id, transaction_response):
 
 			redirect_url = 'payment-success'
 	else:
+		request.db_set('status', 'Failed')
 		redirect_url = 'payment-failed'
 
 	if redirect_to:

From 6eaefb35c7137352f19f2c7d153aa5c78d740bba Mon Sep 17 00:00:00 2001
From: Mangesh-Khairnar <mkhairnar10@gmail.com>
Date: Wed, 22 Apr 2020 11:40:08 +0530
Subject: [PATCH 009/191] fix: add finalize request to complete the transaction

---
 .../doctype/paytm_settings/paytm_settings.py  | 33 ++++++++-------
 .../includes/integrations/paytm_checkout.js   | 42 -------------------
 .../pages/integrations/paytm_checkout.html    |  4 +-
 .../pages/integrations/paytm_checkout.py      |  3 --
 .../website_theme/standard/standard.json      | 20 ---------
 5 files changed, 22 insertions(+), 80 deletions(-)
 delete mode 100644 frappe/templates/includes/integrations/paytm_checkout.js
 delete mode 100644 frappe/website/website_theme/standard/standard.json

diff --git a/frappe/integrations/doctype/paytm_settings/paytm_settings.py b/frappe/integrations/doctype/paytm_settings/paytm_settings.py
index 39a9f42aa0..394cd9c334 100644
--- a/frappe/integrations/doctype/paytm_settings/paytm_settings.py
+++ b/frappe/integrations/doctype/paytm_settings/paytm_settings.py
@@ -71,8 +71,8 @@ def get_paytm_params(payment_details, order_id, paytm_config):
 	# initialize a dictionary
 	paytm_params = dict()
 	
-	# redirect_uri = get_request_site_address(True) + "/api/method/frappe.integrations.doctype.paytm_settings.paytm_settings.get_transaction_status"
-	redirect_uri = "http://cf9b2bb1.ngrok.io/api/method/frappe.integrations.doctype.paytm_settings.paytm_settings.get_transaction_status"
+	redirect_uri = get_request_site_address(True) + "/api/method/frappe.integrations.doctype.paytm_settings.paytm_settings.verify_transaction"
+
 
 	paytm_params.update({
 		"MID" : paytm_config.merchant_id,
@@ -99,24 +99,28 @@ def verify_transaction(**kwargs):
 	'''Verify checksum for received data in the callback and then verify the transaction'''
 	paytm_config = get_paytm_config()
 	received_data = frappe._dict(kwargs)
+	is_valid_checksum = False
 
 	paytm_params = {}
 	for key, value in received_data.items(): 
 		if key == 'CHECKSUMHASH':
 			paytm_checksum = value
+		elif key == 'cmd':
+			continue
 		else:
 			paytm_params[key] = value
 
-	# Verify checksum
-	is_valid_checksum = verify_checksum(paytm_params, paytm_config.merchant_key, paytm_checksum)
+	if paytm_params and paytm_config and paytm_checksum:
+		# Verify checksum
+		is_valid_checksum = verify_checksum(paytm_params, paytm_config.merchant_key, paytm_checksum)
 
 	if is_valid_checksum and received_data['RESPCODE'] == '01':
 		verify_transaction_status(paytm_config, received_data['ORDERID'])
 	else:
 		frappe.respond_as_web_page("Payment Failed",
-			"Transaction failed to complete. Don't worry, in case of failure amount will get refunded to your account.",
+			"Transaction failed to complete. In case of any deductions, deducted amount will get refunded to your account.",
 			http_status_code=401, indicator_color='red')
-		frappe.log_error("Order unsuccessful, received data:"+received_data, 'Paytm Payment Failed')
+		frappe.log_error("Order unsuccessful. Failed Response:"+cstr(received_data), 'Paytm Payment Failed')
 
 def verify_transaction_status(paytm_config, order_id):
 	'''Verify transaction completion after checksum has been verified'''
@@ -136,15 +140,16 @@ def verify_transaction_status(paytm_config, order_id):
 
 def finalize_request(order_id, transaction_response):
 	request = frappe.get_doc('Integration Request', order_id)
-	redirect_to = request.data.get('redirect_to') or None
-	redirect_message = request.data.get('redirect_message') or None
+	transaction_data = frappe._dict(json.loads(request.data))
+	redirect_to = transaction_data.get('redirect_to') or None
+	redirect_message = transaction_data.get('redirect_message') or None
 
 	if transaction_response['STATUS'] == "TXN_SUCCESS":
-		if request.data.reference_doctype and request.data.reference_docname:
+		if transaction_data.reference_doctype and transaction_data.reference_docname:
 			custom_redirect_to = None
 			try:
-				custom_redirect_to = frappe.get_doc(request.data.reference_doctype,
-					request.data.reference_docname).run_method("on_payment_authorized", 'Completed')
+				custom_redirect_to = frappe.get_doc(transaction_data.reference_doctype,
+					transaction_data.reference_docname).run_method("on_payment_authorized", 'Completed')
 				request.db_set('status', 'Completed')
 			except Exception:
 				request.db_set('status', 'Failed')
@@ -153,10 +158,10 @@ def finalize_request(order_id, transaction_response):
 			if custom_redirect_to:
 				redirect_to = custom_redirect_to
 
-			redirect_url = 'payment-success'
+			redirect_url = '/integrations/payment-success'
 	else:
 		request.db_set('status', 'Failed')
-		redirect_url = 'payment-failed'
+		redirect_url = '/integrations/payment-failed'
 
 	if redirect_to:
 		redirect_url += '?' + urlencode({'redirect_to': redirect_to})
@@ -164,7 +169,7 @@ def finalize_request(order_id, transaction_response):
 		redirect_url += '&' + urlencode({'redirect_message': redirect_message})
 
 	frappe.local.response['type'] = 'redirect'
-	frappe.local.response['location'] = 'redirect_url'
+	frappe.local.response['location'] = redirect_url
 
 def get_gateway_controller(doctype, docname):
 	reference_doc = frappe.get_doc(doctype, docname)
diff --git a/frappe/templates/includes/integrations/paytm_checkout.js b/frappe/templates/includes/integrations/paytm_checkout.js
deleted file mode 100644
index 4cf070b60b..0000000000
--- a/frappe/templates/includes/integrations/paytm_checkout.js
+++ /dev/null
@@ -1,42 +0,0 @@
-function onScriptLoad() {
-	console.log('inside on load')
-	var config = {
-		root: '',
-		flow: 'DEFAULT',
-		data: {
-			orderId: '{{ order_id}}',
-			token: '{{ token }}',
-			tokenType: 'TXN_TOKEN',
-			amount: '{{ amount }}'
-		},
-		handler: {
-			notifyMerchant: function(eventName, data) {
-				// notify about the state of the payment page ( invalid token , session expire , cancel transaction)
-				console.log('notifyMerchant handler function called');
-				console.log('eventName => ', eventName);
-				console.log('data => ', data);
-			},
-			transactionStatus: function transactionStatus(paymentStatus) {
-				// provide information to merchant about the payment status.
-				console.log('transaction status handler function called');
-				console.log('paymentStatus => ', paymentStatus);
-			}
-		}
-	};
-
-	$('.paytm-loading').addClass('hidden');
-	if (window.Paytm && window.Paytm.CheckoutJS) {
-		window.Paytm.CheckoutJS.onLoad(function excecuteAfterCompleteLoad() {
-			// initialze configuration using init method
-			window.Paytm.CheckoutJS.init(config)
-				.then(function onSuccess() {
-					// after successfully updating configuration, invoke Blink Checkout
-					window.Paytm.CheckoutJS.invoke();
-				})
-				.catch(function onError(error) {
-					console.log('inside the error window')
-					console.log('error => ', error);
-				});
-		});
-	}
-}
diff --git a/frappe/templates/pages/integrations/paytm_checkout.html b/frappe/templates/pages/integrations/paytm_checkout.html
index 772e16ecb8..77a2045edf 100644
--- a/frappe/templates/pages/integrations/paytm_checkout.html
+++ b/frappe/templates/pages/integrations/paytm_checkout.html
@@ -16,12 +16,14 @@
 
 {%- block page_content -%}
 <body>
-		<center><h1>Please do not refresh this page...</h1></center>
+	<div style="margin: 30vh;">
+		<center><h2>Please do not refresh this page...</h2></center>
 		<form method="post" action="{{ url }}" name="paytm_form">
 			{% for name, value in payment_details.items() %}
 				<input type="hidden" name="{{ name }}" value="{{ value }}">
 			{% endfor %}
 		</form>
+	</div>
 </body>
 {% endblock %}
 
diff --git a/frappe/templates/pages/integrations/paytm_checkout.py b/frappe/templates/pages/integrations/paytm_checkout.py
index 1fa947a68f..5a55d02ce9 100644
--- a/frappe/templates/pages/integrations/paytm_checkout.py
+++ b/frappe/templates/pages/integrations/paytm_checkout.py
@@ -12,9 +12,6 @@ import requests
 
 no_cache = 1
 
-expected_keys = ('amount', 'title', 'description', 'reference_doctype', 'reference_docname',
-	'payer_name', 'payer_email')
-
 def get_context(context):
 	context.no_cache = 1
 	paytm_config = get_paytm_config()
diff --git a/frappe/website/website_theme/standard/standard.json b/frappe/website/website_theme/standard/standard.json
deleted file mode 100644
index a799f25425..0000000000
--- a/frappe/website/website_theme/standard/standard.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
- "button_gradients": 0,
- "button_rounded_corners": 1,
- "button_shadows": 0,
- "creation": "2015-02-19 13:37:33.925909",
- "custom": 0,
- "docstatus": 0,
- "doctype": "Website Theme",
- "font_properties": "300,600",
- "font_size": "",
- "idx": 27,
- "modified": "2020-04-21 02:10:31.761219",
- "modified_by": "Administrator",
- "module": "Website",
- "name": "Standard",
- "owner": "Administrator",
- "theme": "Standard",
- "theme_scss": "$enable-shadows: false;\n$enable-gradients: false;\n$enable-rounded: true;\n\n@import \"frappe/public/scss/website\";\n\n",
- "theme_url": "/assets/css/standard_style.css"
-}
\ No newline at end of file

From 25c9ac002290d070ab596a872faeba926f8317ad Mon Sep 17 00:00:00 2001
From: Mangesh-Khairnar <mkhairnar10@gmail.com>
Date: Wed, 22 Apr 2020 16:12:49 +0530
Subject: [PATCH 010/191] chore: remove initial validation check

---
 .../integrations/doctype/paytm_settings/checksum.py |  1 -
 .../doctype/paytm_settings/paytm_settings.py        | 13 +------------
 .../templates/pages/integrations/paytm_checkout.py  |  6 +-----
 3 files changed, 2 insertions(+), 18 deletions(-)

diff --git a/frappe/integrations/doctype/paytm_settings/checksum.py b/frappe/integrations/doctype/paytm_settings/checksum.py
index 95fb7dc164..b2e67bb5ad 100644
--- a/frappe/integrations/doctype/paytm_settings/checksum.py
+++ b/frappe/integrations/doctype/paytm_settings/checksum.py
@@ -87,7 +87,6 @@ def __get_param_string__(params):
 	params_string = []
 	for key in sorted(params.keys()):
 		if("REFUND" in params[key] or "|" in params[key]):
-			respons_dict = {}
 			exit()
 		value = params[key]
 		params_string.append('' if value == 'null' else str(value))
diff --git a/frappe/integrations/doctype/paytm_settings/paytm_settings.py b/frappe/integrations/doctype/paytm_settings/paytm_settings.py
index 394cd9c334..ed71202ea6 100644
--- a/frappe/integrations/doctype/paytm_settings/paytm_settings.py
+++ b/frappe/integrations/doctype/paytm_settings/paytm_settings.py
@@ -11,7 +11,7 @@ import frappe
 from frappe.model.document import Document
 from frappe import _
 from frappe.utils import get_url, call_hook_method, cint, flt, cstr
-from frappe.integrations.utils import make_get_request, make_post_request, create_request_log, create_payment_gateway
+from frappe.integrations.utils import create_request_log, create_payment_gateway
 from frappe.utils import get_request_site_address
 from frappe.integrations.doctype.paytm_settings.checksum import generate_checksum, verify_checksum
 from frappe.utils.password import get_decrypted_password
@@ -22,17 +22,6 @@ class PaytmSettings(Document):
 	def validate(self):
 		create_payment_gateway('Paytm')
 		call_hook_method('payment_gateway_enabled', gateway='Paytm')
-		if not self.flags.ignore_mandatory:
-			self.validate_paytm_credentails()
-
-	def validate_paytm_credentails(self):
-		if self.merchant_id and self.merchant_key:
-			pass
-			# header = {"Authorization": "Bearer {0}".format(self.get_password(fieldname="secret_key", raise_exception=False))}
-			# try:
-			# 	make_get_request(url="https://api.stripe.com/v1/charges", headers=header)
-			# except Exception:
-			# 	frappe.throw(_("Seems Publishable Key or Secret Key is wrong !!!"))
 
 	def validate_transaction_currency(self, currency):
 		if currency not in self.supported_currencies:
diff --git a/frappe/templates/pages/integrations/paytm_checkout.py b/frappe/templates/pages/integrations/paytm_checkout.py
index 5a55d02ce9..3018a9d65b 100644
--- a/frappe/templates/pages/integrations/paytm_checkout.py
+++ b/frappe/templates/pages/integrations/paytm_checkout.py
@@ -3,12 +3,8 @@
 from __future__ import unicode_literals
 import frappe
 from frappe import _
-from frappe.utils import flt, cint
 import json
-from six import string_types
-from frappe.utils import get_request_site_address
 from frappe.integrations.doctype.paytm_settings.paytm_settings import get_paytm_params, get_paytm_config
-import requests
 
 no_cache = 1
 
@@ -23,7 +19,7 @@ def get_context(context):
 
 		context.url = paytm_config.url
 
-	except Exception as e:
+	except Exception:
 		frappe.log_error()
 		frappe.redirect_to_message(_('Invalid Token'),
 			_('Seems token you are using is invalid!'),

From 7dbdb7c50bb37e0fa1e371032c4b2516d3089c4e Mon Sep 17 00:00:00 2001
From: Mangesh-Khairnar <mkhairnar10@gmail.com>
Date: Fri, 24 Apr 2020 11:18:35 +0530
Subject: [PATCH 011/191] fix: add pycryptodome for paytm checksum generation

---
 requirements.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/requirements.txt b/requirements.txt
index 58f923d880..2587a2eceb 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -66,3 +66,4 @@ watchdog==0.8.0
 Werkzeug==0.16.1
 xlrd==1.2.0
 zxcvbn-python==4.4.24
+pycryptodome==3.9.7
\ No newline at end of file

From 7a15f6f61d121901aa08c1f0bd1c3627bda0fe34 Mon Sep 17 00:00:00 2001
From: Mangesh-Khairnar <mkhairnar10@gmail.com>
Date: Fri, 24 Apr 2020 15:09:11 +0530
Subject: [PATCH 012/191] revert: add pylint and standard json again

---
 .pylintrc                                     |  2 ++
 .../website_theme/standard/standard.json      | 20 +++++++++++++++++++
 2 files changed, 22 insertions(+)
 create mode 100644 .pylintrc
 create mode 100644 frappe/website/website_theme/standard/standard.json

diff --git a/.pylintrc b/.pylintrc
new file mode 100644
index 0000000000..c11c0ab6a3
--- /dev/null
+++ b/.pylintrc
@@ -0,0 +1,2 @@
+disable=access-member-before-definition
+disable=no-member
\ No newline at end of file
diff --git a/frappe/website/website_theme/standard/standard.json b/frappe/website/website_theme/standard/standard.json
new file mode 100644
index 0000000000..a799f25425
--- /dev/null
+++ b/frappe/website/website_theme/standard/standard.json
@@ -0,0 +1,20 @@
+{
+ "button_gradients": 0,
+ "button_rounded_corners": 1,
+ "button_shadows": 0,
+ "creation": "2015-02-19 13:37:33.925909",
+ "custom": 0,
+ "docstatus": 0,
+ "doctype": "Website Theme",
+ "font_properties": "300,600",
+ "font_size": "",
+ "idx": 27,
+ "modified": "2020-04-21 02:10:31.761219",
+ "modified_by": "Administrator",
+ "module": "Website",
+ "name": "Standard",
+ "owner": "Administrator",
+ "theme": "Standard",
+ "theme_scss": "$enable-shadows: false;\n$enable-gradients: false;\n$enable-rounded: true;\n\n@import \"frappe/public/scss/website\";\n\n",
+ "theme_url": "/assets/css/standard_style.css"
+}
\ No newline at end of file

From f512fe8446f4fb8f9755099406a014ed0f04b8fd Mon Sep 17 00:00:00 2001
From: Himanshu Warekar <himanshuwarekar@yahoo.com>
Date: Thu, 7 May 2020 18:21:05 +0530
Subject: [PATCH 013/191] feat: help article feedback

---
 .../js/frappe/form/sidebar/form_sidebar.js    | 13 ++++
 .../frappe/form/templates/form_sidebar.html   |  6 +-
 frappe/public/js/frappe/utils/common.js       |  6 ++
 frappe/public/less/sidebar.less               |  3 +-
 frappe/templates/includes/feedback.html       | 29 +++++++++
 frappe/website/doctype/feedback/__init__.py   |  0
 frappe/website/doctype/feedback/feedback.js   |  8 +++
 frappe/website/doctype/feedback/feedback.json | 59 +++++++++++++++++++
 frappe/website/doctype/feedback/feedback.py   | 27 +++++++++
 .../website/doctype/feedback/test_feedback.py | 10 ++++
 .../help_article/templates/help_article.html  |  5 +-
 11 files changed, 163 insertions(+), 3 deletions(-)
 create mode 100644 frappe/templates/includes/feedback.html
 create mode 100644 frappe/website/doctype/feedback/__init__.py
 create mode 100644 frappe/website/doctype/feedback/feedback.js
 create mode 100644 frappe/website/doctype/feedback/feedback.json
 create mode 100644 frappe/website/doctype/feedback/feedback.py
 create mode 100644 frappe/website/doctype/feedback/test_feedback.py

diff --git a/frappe/public/js/frappe/form/sidebar/form_sidebar.js b/frappe/public/js/frappe/form/sidebar/form_sidebar.js
index a145e47149..9450fdc674 100644
--- a/frappe/public/js/frappe/form/sidebar/form_sidebar.js
+++ b/frappe/public/js/frappe/form/sidebar/form_sidebar.js
@@ -93,6 +93,19 @@ frappe.ui.form.Sidebar = Class.extend({
 				});
 			}
 
+			frappe.utils.get_feedback(this.frm.doc.name).then((res) => {
+				this.sidebar
+					.find(".helpful")
+					.html(
+						__("Helpful {0}", [String(res.message.helpful).bold()])
+					);
+				this.sidebar
+					.find(".not-helpful")
+					.html(
+						__("Not Helpful {0}", [String(res.message.not_helpful).bold()])
+					);
+			});
+
 			this.sidebar
 				.find(".modified-by")
 				.html(
diff --git a/frappe/public/js/frappe/form/templates/form_sidebar.html b/frappe/public/js/frappe/form/templates/form_sidebar.html
index 30b2205bae..3e72684818 100644
--- a/frappe/public/js/frappe/form/templates/form_sidebar.html
+++ b/frappe/public/js/frappe/form/templates/form_sidebar.html
@@ -106,11 +106,15 @@
 </ul>
 <ul class="list-unstyled sidebar-menu text-muted">
 	<li class="pageview-count"></li>
+	<li class="feedback">
+		<p class="helpful"></p>
+		<p class="not-helpful"></p>
+	</li>
 	<li class="modified-by"></li>
 	<li class="created-by"></li>
 </ul>
 {% if(frappe.get_form_sidebar_extension) { %}
-    {{ frappe.get_form_sidebar_extension() }}
+	{{ frappe.get_form_sidebar_extension() }}
 {% } %}
 <ul class="list-unstyled visible-xs visible-sm">
 
diff --git a/frappe/public/js/frappe/utils/common.js b/frappe/public/js/frappe/utils/common.js
index 1cdabf23e0..2fda8ed27a 100644
--- a/frappe/public/js/frappe/utils/common.js
+++ b/frappe/public/js/frappe/utils/common.js
@@ -359,3 +359,9 @@ frappe.utils.get_page_view_count = function(route) {
 		path: route
 	});
 };
+
+frappe.utils.get_feedback = function(reference_name) {
+	return frappe.call("frappe.website.doctype.feedback.feedback.get_feedback_count", {
+		reference_name: reference_name
+	});
+};
\ No newline at end of file
diff --git a/frappe/public/less/sidebar.less b/frappe/public/less/sidebar.less
index 109b7a3209..b6ffb7e697 100644
--- a/frappe/public/less/sidebar.less
+++ b/frappe/public/less/sidebar.less
@@ -274,7 +274,8 @@ body[data-route^="Module"] .main-menu {
 
 .layout-side-section .form-sidebar {
 	.modified-by,
-	.pageview-count {
+	.pageview-count,
+	.feedback {
 		margin-bottom: 15px;
 	}
 }
diff --git a/frappe/templates/includes/feedback.html b/frappe/templates/includes/feedback.html
new file mode 100644
index 0000000000..5d10c7b159
--- /dev/null
+++ b/frappe/templates/includes/feedback.html
@@ -0,0 +1,29 @@
+<div class="feedback-view mb-4">
+	<hr />
+	<span class="text-muted small">{{ _("Helpful?") }}</span>
+	<span class="small">
+		<a class="feedback btn btn-light btn-sm" data-value="Yes">{{ _("Yes") }}</a>
+		<a class="feedback btn btn-light btn-sm" data-value="No">{{ _("No") }}</a>
+	</span>
+</div>
+
+<script>
+	frappe.ready(function() {
+		$(".feedback").click(function() {
+			let args = {
+				reference_doctype: "{{ reference_doctype or doctype }}",
+				reference_name: "{{ reference_name or name }}",
+				helpful: this.getAttribute("data-value"),
+			}
+
+			frappe.call({
+				btn: this,
+				method: "frappe.website.doctype.feedback.feedback.add_feedback",
+				args: args,
+				callback: function(r) {
+					console.log(r);
+				}
+			})
+		})
+	});
+</script>
diff --git a/frappe/website/doctype/feedback/__init__.py b/frappe/website/doctype/feedback/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/frappe/website/doctype/feedback/feedback.js b/frappe/website/doctype/feedback/feedback.js
new file mode 100644
index 0000000000..f5fa89b30e
--- /dev/null
+++ b/frappe/website/doctype/feedback/feedback.js
@@ -0,0 +1,8 @@
+// Copyright (c) 2020, Frappe Technologies and contributors
+// For license information, please see license.txt
+
+frappe.ui.form.on('Feedback', {
+	// refresh: function(frm) {
+
+	// }
+});
diff --git a/frappe/website/doctype/feedback/feedback.json b/frappe/website/doctype/feedback/feedback.json
new file mode 100644
index 0000000000..b04aefa462
--- /dev/null
+++ b/frappe/website/doctype/feedback/feedback.json
@@ -0,0 +1,59 @@
+{
+ "actions": [],
+ "creation": "2020-05-07 16:42:27.234652",
+ "doctype": "DocType",
+ "editable_grid": 1,
+ "engine": "InnoDB",
+ "field_order": [
+  "reference_doctype",
+  "reference_name",
+  "helpful"
+ ],
+ "fields": [
+  {
+   "fieldname": "reference_doctype",
+   "fieldtype": "Link",
+   "label": "Reference DocType",
+   "options": "DocType"
+  },
+  {
+   "fieldname": "helpful",
+   "fieldtype": "Select",
+   "label": "Helpful",
+   "options": "Yes\nNo"
+  },
+  {
+   "fieldname": "reference_name",
+   "fieldtype": "Dynamic Link",
+   "label": "Reference Name",
+   "options": "reference_doctype",
+   "search_index": 1
+  }
+ ],
+ "in_create": 1,
+ "links": [],
+ "modified": "2020-05-07 16:53:29.211653",
+ "modified_by": "Administrator",
+ "module": "Website",
+ "name": "Feedback",
+ "owner": "Administrator",
+ "permissions": [
+  {
+   "create": 1,
+   "delete": 1,
+   "email": 1,
+   "export": 1,
+   "print": 1,
+   "read": 1,
+   "report": 1,
+   "role": "System Manager",
+   "share": 1,
+   "write": 1
+  }
+ ],
+ "quick_entry": 1,
+ "read_only": 1,
+ "sort_field": "modified",
+ "sort_order": "DESC",
+ "track_changes": 1
+}
\ No newline at end of file
diff --git a/frappe/website/doctype/feedback/feedback.py b/frappe/website/doctype/feedback/feedback.py
new file mode 100644
index 0000000000..3b92118ec3
--- /dev/null
+++ b/frappe/website/doctype/feedback/feedback.py
@@ -0,0 +1,27 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2020, Frappe Technologies and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe.model.document import Document
+
+class Feedback(Document):
+	pass
+
+@frappe.whitelist(allow_guest=True)
+def add_feedback(reference_doctype, reference_name, helpful):
+	frappe.get_doc({
+		"doctype": "Feedback",
+		"reference_doctype": reference_doctype,
+		"reference_name": reference_name,
+		"helpful": helpful
+	}).insert(ignore_permissions=True)
+
+@frappe.whitelist()
+def get_feedback_count(reference_name):
+
+	return {
+		"helpful": frappe.db.count("Feedback", {"reference_name": reference_name, "helpful": "Yes"}),
+		"not_helpful": frappe.db.count("Feedback", {"reference_name": reference_name, "helpful": "No"}),
+	}
\ No newline at end of file
diff --git a/frappe/website/doctype/feedback/test_feedback.py b/frappe/website/doctype/feedback/test_feedback.py
new file mode 100644
index 0000000000..9a31738d75
--- /dev/null
+++ b/frappe/website/doctype/feedback/test_feedback.py
@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2020, Frappe Technologies and Contributors
+# See license.txt
+from __future__ import unicode_literals
+
+# import frappe
+import unittest
+
+class TestFeedback(unittest.TestCase):
+	pass
diff --git a/frappe/website/doctype/help_article/templates/help_article.html b/frappe/website/doctype/help_article/templates/help_article.html
index 913e6d6a92..6c59359785 100644
--- a/frappe/website/doctype/help_article/templates/help_article.html
+++ b/frappe/website/doctype/help_article/templates/help_article.html
@@ -19,6 +19,9 @@
 	<p><br><a href="/{{ category.route }}" class='text-muted small'>
 		{{ _("More articles on {0}").format(category.name) }}</a></p>
 </article>
+<div class="help-article-feedback">
+	{% include 'templates/includes/feedback.html' %}
+</div>
 <div class="help-article-comments">
 	<hr>
 	<h4>Comments</h4>
@@ -26,7 +29,7 @@
 </div>
 <script>
 frappe.ready(function() {
-    frappe.set_search_path("/kb");
+	frappe.set_search_path("/kb");
 });
 </script>
 {% endblock %}

From c3a45de794a23f96ba208add27c518765d8c9d80 Mon Sep 17 00:00:00 2001
From: Himanshu Warekar <himanshuwarekar@yahoo.com>
Date: Fri, 8 May 2020 11:39:40 +0530
Subject: [PATCH 014/191] fix: feedback restrict to help article

---
 .../js/frappe/form/sidebar/form_sidebar.js    |  13 -
 .../frappe/form/templates/form_sidebar.html   |   4 -
 frappe/public/js/frappe/utils/common.js       |   6 -
 frappe/public/less/sidebar.less               |   3 +-
 frappe/templates/includes/feedback.html       |  29 -
 frappe/website/doctype/feedback/__init__.py   |   0
 frappe/website/doctype/feedback/feedback.js   |   8 -
 frappe/website/doctype/feedback/feedback.json |  59 --
 frappe/website/doctype/feedback/feedback.py   |  27 -
 .../website/doctype/feedback/test_feedback.py |  10 -
 .../doctype/help_article/help_article.js      |  15 +
 .../doctype/help_article/help_article.json    | 559 +++++-------------
 .../doctype/help_article/help_article.py      |  10 +-
 .../help_article/templates/help_article.html  |  26 +-
 14 files changed, 185 insertions(+), 584 deletions(-)
 delete mode 100644 frappe/templates/includes/feedback.html
 delete mode 100644 frappe/website/doctype/feedback/__init__.py
 delete mode 100644 frappe/website/doctype/feedback/feedback.js
 delete mode 100644 frappe/website/doctype/feedback/feedback.json
 delete mode 100644 frappe/website/doctype/feedback/feedback.py
 delete mode 100644 frappe/website/doctype/feedback/test_feedback.py

diff --git a/frappe/public/js/frappe/form/sidebar/form_sidebar.js b/frappe/public/js/frappe/form/sidebar/form_sidebar.js
index 9450fdc674..a145e47149 100644
--- a/frappe/public/js/frappe/form/sidebar/form_sidebar.js
+++ b/frappe/public/js/frappe/form/sidebar/form_sidebar.js
@@ -93,19 +93,6 @@ frappe.ui.form.Sidebar = Class.extend({
 				});
 			}
 
-			frappe.utils.get_feedback(this.frm.doc.name).then((res) => {
-				this.sidebar
-					.find(".helpful")
-					.html(
-						__("Helpful {0}", [String(res.message.helpful).bold()])
-					);
-				this.sidebar
-					.find(".not-helpful")
-					.html(
-						__("Not Helpful {0}", [String(res.message.not_helpful).bold()])
-					);
-			});
-
 			this.sidebar
 				.find(".modified-by")
 				.html(
diff --git a/frappe/public/js/frappe/form/templates/form_sidebar.html b/frappe/public/js/frappe/form/templates/form_sidebar.html
index 3e72684818..497a6488e2 100644
--- a/frappe/public/js/frappe/form/templates/form_sidebar.html
+++ b/frappe/public/js/frappe/form/templates/form_sidebar.html
@@ -106,10 +106,6 @@
 </ul>
 <ul class="list-unstyled sidebar-menu text-muted">
 	<li class="pageview-count"></li>
-	<li class="feedback">
-		<p class="helpful"></p>
-		<p class="not-helpful"></p>
-	</li>
 	<li class="modified-by"></li>
 	<li class="created-by"></li>
 </ul>
diff --git a/frappe/public/js/frappe/utils/common.js b/frappe/public/js/frappe/utils/common.js
index 2fda8ed27a..1cdabf23e0 100644
--- a/frappe/public/js/frappe/utils/common.js
+++ b/frappe/public/js/frappe/utils/common.js
@@ -359,9 +359,3 @@ frappe.utils.get_page_view_count = function(route) {
 		path: route
 	});
 };
-
-frappe.utils.get_feedback = function(reference_name) {
-	return frappe.call("frappe.website.doctype.feedback.feedback.get_feedback_count", {
-		reference_name: reference_name
-	});
-};
\ No newline at end of file
diff --git a/frappe/public/less/sidebar.less b/frappe/public/less/sidebar.less
index b6ffb7e697..109b7a3209 100644
--- a/frappe/public/less/sidebar.less
+++ b/frappe/public/less/sidebar.less
@@ -274,8 +274,7 @@ body[data-route^="Module"] .main-menu {
 
 .layout-side-section .form-sidebar {
 	.modified-by,
-	.pageview-count,
-	.feedback {
+	.pageview-count {
 		margin-bottom: 15px;
 	}
 }
diff --git a/frappe/templates/includes/feedback.html b/frappe/templates/includes/feedback.html
deleted file mode 100644
index 5d10c7b159..0000000000
--- a/frappe/templates/includes/feedback.html
+++ /dev/null
@@ -1,29 +0,0 @@
-<div class="feedback-view mb-4">
-	<hr />
-	<span class="text-muted small">{{ _("Helpful?") }}</span>
-	<span class="small">
-		<a class="feedback btn btn-light btn-sm" data-value="Yes">{{ _("Yes") }}</a>
-		<a class="feedback btn btn-light btn-sm" data-value="No">{{ _("No") }}</a>
-	</span>
-</div>
-
-<script>
-	frappe.ready(function() {
-		$(".feedback").click(function() {
-			let args = {
-				reference_doctype: "{{ reference_doctype or doctype }}",
-				reference_name: "{{ reference_name or name }}",
-				helpful: this.getAttribute("data-value"),
-			}
-
-			frappe.call({
-				btn: this,
-				method: "frappe.website.doctype.feedback.feedback.add_feedback",
-				args: args,
-				callback: function(r) {
-					console.log(r);
-				}
-			})
-		})
-	});
-</script>
diff --git a/frappe/website/doctype/feedback/__init__.py b/frappe/website/doctype/feedback/__init__.py
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/frappe/website/doctype/feedback/feedback.js b/frappe/website/doctype/feedback/feedback.js
deleted file mode 100644
index f5fa89b30e..0000000000
--- a/frappe/website/doctype/feedback/feedback.js
+++ /dev/null
@@ -1,8 +0,0 @@
-// Copyright (c) 2020, Frappe Technologies and contributors
-// For license information, please see license.txt
-
-frappe.ui.form.on('Feedback', {
-	// refresh: function(frm) {
-
-	// }
-});
diff --git a/frappe/website/doctype/feedback/feedback.json b/frappe/website/doctype/feedback/feedback.json
deleted file mode 100644
index b04aefa462..0000000000
--- a/frappe/website/doctype/feedback/feedback.json
+++ /dev/null
@@ -1,59 +0,0 @@
-{
- "actions": [],
- "creation": "2020-05-07 16:42:27.234652",
- "doctype": "DocType",
- "editable_grid": 1,
- "engine": "InnoDB",
- "field_order": [
-  "reference_doctype",
-  "reference_name",
-  "helpful"
- ],
- "fields": [
-  {
-   "fieldname": "reference_doctype",
-   "fieldtype": "Link",
-   "label": "Reference DocType",
-   "options": "DocType"
-  },
-  {
-   "fieldname": "helpful",
-   "fieldtype": "Select",
-   "label": "Helpful",
-   "options": "Yes\nNo"
-  },
-  {
-   "fieldname": "reference_name",
-   "fieldtype": "Dynamic Link",
-   "label": "Reference Name",
-   "options": "reference_doctype",
-   "search_index": 1
-  }
- ],
- "in_create": 1,
- "links": [],
- "modified": "2020-05-07 16:53:29.211653",
- "modified_by": "Administrator",
- "module": "Website",
- "name": "Feedback",
- "owner": "Administrator",
- "permissions": [
-  {
-   "create": 1,
-   "delete": 1,
-   "email": 1,
-   "export": 1,
-   "print": 1,
-   "read": 1,
-   "report": 1,
-   "role": "System Manager",
-   "share": 1,
-   "write": 1
-  }
- ],
- "quick_entry": 1,
- "read_only": 1,
- "sort_field": "modified",
- "sort_order": "DESC",
- "track_changes": 1
-}
\ No newline at end of file
diff --git a/frappe/website/doctype/feedback/feedback.py b/frappe/website/doctype/feedback/feedback.py
deleted file mode 100644
index 3b92118ec3..0000000000
--- a/frappe/website/doctype/feedback/feedback.py
+++ /dev/null
@@ -1,27 +0,0 @@
-# -*- coding: utf-8 -*-
-# Copyright (c) 2020, Frappe Technologies and contributors
-# For license information, please see license.txt
-
-from __future__ import unicode_literals
-import frappe
-from frappe.model.document import Document
-
-class Feedback(Document):
-	pass
-
-@frappe.whitelist(allow_guest=True)
-def add_feedback(reference_doctype, reference_name, helpful):
-	frappe.get_doc({
-		"doctype": "Feedback",
-		"reference_doctype": reference_doctype,
-		"reference_name": reference_name,
-		"helpful": helpful
-	}).insert(ignore_permissions=True)
-
-@frappe.whitelist()
-def get_feedback_count(reference_name):
-
-	return {
-		"helpful": frappe.db.count("Feedback", {"reference_name": reference_name, "helpful": "Yes"}),
-		"not_helpful": frappe.db.count("Feedback", {"reference_name": reference_name, "helpful": "No"}),
-	}
\ No newline at end of file
diff --git a/frappe/website/doctype/feedback/test_feedback.py b/frappe/website/doctype/feedback/test_feedback.py
deleted file mode 100644
index 9a31738d75..0000000000
--- a/frappe/website/doctype/feedback/test_feedback.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# -*- coding: utf-8 -*-
-# Copyright (c) 2020, Frappe Technologies and Contributors
-# See license.txt
-from __future__ import unicode_literals
-
-# import frappe
-import unittest
-
-class TestFeedback(unittest.TestCase):
-	pass
diff --git a/frappe/website/doctype/help_article/help_article.js b/frappe/website/doctype/help_article/help_article.js
index c56bda8e0b..0ca92aefbd 100644
--- a/frappe/website/doctype/help_article/help_article.js
+++ b/frappe/website/doctype/help_article/help_article.js
@@ -3,6 +3,21 @@
 
 frappe.ui.form.on('Help Article', {
 	refresh: function(frm) {
+		frm.dashboard.clear_headline();
 
+		frm.dashboard.set_headline_alert(`
+			<div class="row">
+				<div class="col-md-6 col-xs-12">
+					<span class="indicator whitespace-nowrap green">
+						<span>Helpful ${frm.doc.helpful}</span>
+					</span>
+				</div>
+				<div class="col-md-6 col-xs-12">
+					<span class="indicator whitespace-nowrap red">
+						<span>Not Helpful ${frm.doc.helpful}</span>
+					</span>
+				</div>
+			</div>
+		`);
 	}
 });
diff --git a/frappe/website/doctype/help_article/help_article.json b/frappe/website/doctype/help_article/help_article.json
index 5957333724..ca659692c6 100644
--- a/frappe/website/doctype/help_article/help_article.json
+++ b/frappe/website/doctype/help_article/help_article.json
@@ -1,445 +1,158 @@
 {
- "allow_copy": 0, 
- "allow_guest_to_view": 1, 
- "allow_import": 1, 
- "allow_rename": 0, 
- "beta": 0, 
- "creation": "2014-10-30 14:25:53.780105", 
- "custom": 0, 
- "docstatus": 0, 
- "doctype": "DocType", 
- "document_type": "", 
- "editable_grid": 0, 
+ "actions": [],
+ "allow_guest_to_view": 1,
+ "allow_import": 1,
+ "creation": "2014-10-30 14:25:53.780105",
+ "doctype": "DocType",
+ "field_order": [
+  "title",
+  "category",
+  "published",
+  "column_break_4",
+  "author",
+  "level",
+  "section_break_7",
+  "content",
+  "likes",
+  "route",
+  "owner",
+  "feedback",
+  "helpful",
+  "cb_00",
+  "not_helpful"
+ ],
  "fields": [
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "title", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 1, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Title", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "title",
+   "fieldtype": "Data",
+   "in_global_search": 1,
+   "label": "Title",
+   "reqd": 1,
+   "search_index": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "category", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 1, 
-   "label": "Category", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Help Category", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "category",
+   "fieldtype": "Link",
+   "in_list_view": 1,
+   "in_standard_filter": 1,
+   "label": "Category",
+   "options": "Help Category",
+   "reqd": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "published", 
-   "fieldtype": "Check", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Published", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "default": "0",
+   "fieldname": "published",
+   "fieldtype": "Check",
+   "label": "Published"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "column_break_4", 
-   "fieldtype": "Column Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "column_break_4",
+   "fieldtype": "Column Break"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "default": "user_fullname", 
-   "fieldname": "author", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Author", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "default": "user_fullname",
+   "fieldname": "author",
+   "fieldtype": "Data",
+   "label": "Author"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "level", 
-   "fieldtype": "Select", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Level", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Beginner\nIntermediate\nExpert", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "level",
+   "fieldtype": "Select",
+   "label": "Level",
+   "options": "Beginner\nIntermediate\nExpert"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "section_break_7", 
-   "fieldtype": "Section Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "section_break_7",
+   "fieldtype": "Section Break"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "content", 
-   "fieldtype": "Text Editor", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 1, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Content", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "content",
+   "fieldtype": "Text Editor",
+   "in_global_search": 1,
+   "label": "Content",
+   "reqd": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "likes", 
-   "fieldtype": "Int", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Likes", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "likes",
+   "fieldtype": "Int",
+   "label": "Likes",
+   "read_only": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "route", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 1, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Route", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "route",
+   "fieldtype": "Data",
+   "in_global_search": 1,
+   "label": "Route"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "default": "user", 
-   "fieldname": "owner", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Owner", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "User", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
+   "default": "user",
+   "fieldname": "owner",
+   "fieldtype": "Link",
+   "label": "Owner",
+   "options": "User"
+  },
+  {
+   "collapsible": 1,
+   "fieldname": "feedback",
+   "fieldtype": "Section Break",
+   "label": "Feedback"
+  },
+  {
+   "default": "0",
+   "fieldname": "helpful",
+   "fieldtype": "Int",
+   "in_list_view": 1,
+   "label": "Helpful",
+   "read_only": 1
+  },
+  {
+   "fieldname": "cb_00",
+   "fieldtype": "Column Break"
+  },
+  {
+   "default": "0",
+   "fieldname": "not_helpful",
+   "fieldtype": "Data",
+   "in_list_view": 1,
+   "label": "Not Helpful",
+   "read_only": 1
   }
- ], 
- "has_web_view": 1, 
- "hide_heading": 0, 
- "hide_toolbar": 0, 
- "icon": "icon-file-alt", 
- "idx": 0, 
- "image_view": 0, 
- "in_create": 0, 
- "is_published_field": "published", 
- "is_submittable": 0, 
- "issingle": 0, 
- "istable": 0, 
- "max_attachments": 0, 
- "modified": "2018-05-18 17:49:52.912440", 
- "modified_by": "Administrator", 
- "module": "Website", 
- "name": "Help Article", 
- "name_case": "", 
- "owner": "Administrator", 
+ ],
+ "has_web_view": 1,
+ "icon": "icon-file-alt",
+ "is_published_field": "published",
+ "links": [],
+ "modified": "2020-05-08 10:48:19.997789",
+ "modified_by": "Administrator",
+ "module": "Website",
+ "name": "Help Article",
+ "owner": "Administrator",
  "permissions": [
   {
-   "amend": 0, 
-   "cancel": 0, 
-   "create": 1, 
-   "delete": 1, 
-   "email": 1, 
-   "export": 1, 
-   "if_owner": 0, 
-   "import": 1, 
-   "permlevel": 0, 
-   "print": 1, 
-   "read": 1, 
-   "report": 1, 
-   "role": "Knowledge Base Editor", 
-   "set_user_permissions": 0, 
-   "share": 0, 
-   "submit": 0, 
+   "create": 1,
+   "delete": 1,
+   "email": 1,
+   "export": 1,
+   "import": 1,
+   "print": 1,
+   "read": 1,
+   "report": 1,
+   "role": "Knowledge Base Editor",
    "write": 1
-  }, 
+  },
   {
-   "amend": 0, 
-   "cancel": 0, 
-   "create": 1, 
-   "delete": 0, 
-   "email": 0, 
-   "export": 0, 
-   "if_owner": 0, 
-   "import": 0, 
-   "permlevel": 0, 
-   "print": 0, 
-   "read": 1, 
-   "report": 0, 
-   "role": "Knowledge Base Contributor", 
-   "set_user_permissions": 0, 
-   "share": 0, 
-   "submit": 0, 
+   "create": 1,
+   "read": 1,
+   "role": "Knowledge Base Contributor",
    "write": 1
-  }, 
+  },
   {
-   "amend": 0, 
-   "cancel": 0, 
-   "create": 0, 
-   "delete": 0, 
-   "email": 0, 
-   "export": 0, 
-   "if_owner": 0, 
-   "import": 0, 
-   "permlevel": 0, 
-   "print": 0, 
-   "read": 1, 
-   "report": 0, 
-   "role": "Guest", 
-   "set_user_permissions": 0, 
-   "share": 0, 
-   "submit": 0, 
-   "write": 0
+   "read": 1,
+   "role": "Guest"
   }
- ], 
- "quick_entry": 0, 
- "read_only": 0, 
- "read_only_onload": 0, 
- "show_name_in_global_search": 0, 
- "sort_field": "modified", 
- "sort_order": "DESC", 
- "title_field": "title", 
- "track_changes": 1, 
- "track_seen": 0
+ ],
+ "sort_field": "modified",
+ "sort_order": "DESC",
+ "title_field": "title",
+ "track_changes": 1
 }
\ No newline at end of file
diff --git a/frappe/website/doctype/help_article/help_article.py b/frappe/website/doctype/help_article/help_article.py
index 6220d0aff5..fa26cfef99 100644
--- a/frappe/website/doctype/help_article/help_article.py
+++ b/frappe/website/doctype/help_article/help_article.py
@@ -4,7 +4,7 @@
 from __future__ import unicode_literals
 import frappe
 from frappe.website.website_generator import WebsiteGenerator
-from frappe.utils import is_markdown, markdown
+from frappe.utils import is_markdown, markdown, cint
 from frappe.website.utils import get_comment_list
 from frappe import _
 
@@ -100,3 +100,11 @@ def clear_website_cache(path=None):
 	frappe.cache().delete_value("knowledge_base:category_sidebar")
 	frappe.cache().delete_value("knowledge_base:faq")
 
+@frappe.whitelist(allow_guest=True)
+def add_feedback(article, helpful):
+	field = "helpful"
+	if helpful == "No":
+		field = "not_helpful"
+
+	value = cint(frappe.db.get_value("Help Article", article, field))
+	frappe.db.set_value("Help Article", article, field, value+1, update_modified=False)
\ No newline at end of file
diff --git a/frappe/website/doctype/help_article/templates/help_article.html b/frappe/website/doctype/help_article/templates/help_article.html
index 6c59359785..4f71117dea 100644
--- a/frappe/website/doctype/help_article/templates/help_article.html
+++ b/frappe/website/doctype/help_article/templates/help_article.html
@@ -19,8 +19,13 @@
 	<p><br><a href="/{{ category.route }}" class='text-muted small'>
 		{{ _("More articles on {0}").format(category.name) }}</a></p>
 </article>
-<div class="help-article-feedback">
-	{% include 'templates/includes/feedback.html' %}
+<div class="help-article-feedback mb-4">
+	<hr />
+	<div class="feedback-view ">
+		<span class="text-muted small" style="margin-right: 15px;">{{ _("Was this helpful?") }}</span>
+		<button class="feedback btn btn-light btn-sm" data-value="Yes" style="width: 50px;">{{ _("Yes") }}</button>
+		<button class="feedback btn btn-light btn-sm" data-value="No" style="width: 50px;">{{ _("No") }}</button>
+	</div>
 </div>
 <div class="help-article-comments">
 	<hr>
@@ -30,6 +35,23 @@
 <script>
 frappe.ready(function() {
 	frappe.set_search_path("/kb");
+	$(".feedback").click(function() {
+		let args = {
+			article: "{{ reference_name or name }}",
+			helpful: this.getAttribute("data-value"),
+		}
+
+		frappe.call({
+			btn: this,
+			method: "frappe.website.doctype.help_article.help_article.add_feedback",
+			args: args,
+			callback: function(r) {
+				$(".feedback")[0].disabled = true;
+				$(".feedback")[1].disabled = true;
+				frappe.msgprint(__("Feedback Submitted."));
+			}
+		})
+	});
 });
 </script>
 {% endblock %}

From 8c65d3581ebb634d913cc81a02dbda60fd278c4d Mon Sep 17 00:00:00 2001
From: Himanshu <himanshuwarekar@yahoo.com>
Date: Wed, 27 May 2020 13:39:29 +0530
Subject: [PATCH 015/191] Update
 frappe/website/doctype/help_article/templates/help_article.html

Co-authored-by: Prssanna Desai <prssud@gmail.com>
---
 frappe/website/doctype/help_article/templates/help_article.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frappe/website/doctype/help_article/templates/help_article.html b/frappe/website/doctype/help_article/templates/help_article.html
index 4f71117dea..08c8fa342d 100644
--- a/frappe/website/doctype/help_article/templates/help_article.html
+++ b/frappe/website/doctype/help_article/templates/help_article.html
@@ -48,7 +48,7 @@ frappe.ready(function() {
 			callback: function(r) {
 				$(".feedback")[0].disabled = true;
 				$(".feedback")[1].disabled = true;
-				frappe.msgprint(__("Feedback Submitted."));
+				frappe.msgprint(__("Thank you for your feedback!"));
 			}
 		})
 	});

From 0781d048d178aea71ccfdeeeb5d6caac3db42299 Mon Sep 17 00:00:00 2001
From: Mangesh-Khairnar <mkhairnar10@gmail.com>
Date: Tue, 2 Jun 2020 12:33:01 +0530
Subject: [PATCH 016/191] fix: add docs link to the settings page dashboard

---
 .../integrations/doctype/paytm_settings/paytm_settings.js   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/frappe/integrations/doctype/paytm_settings/paytm_settings.js b/frappe/integrations/doctype/paytm_settings/paytm_settings.js
index d51a6e4a25..fe2ee7c952 100644
--- a/frappe/integrations/doctype/paytm_settings/paytm_settings.js
+++ b/frappe/integrations/doctype/paytm_settings/paytm_settings.js
@@ -2,7 +2,7 @@
 // For license information, please see license.txt
 
 frappe.ui.form.on('Paytm Settings', {
-	// refresh: function(frm) {
-
-	// }
+	refresh: function(frm) {
+		frm.dashboard.set_headline(__("For more information, {0}.", [`<a href='https://erpnext.com/docs/user/manual/en/erpnext_integration/paytm-integration'>${__('Click here')}</a>`]));
+	}
 });

From 04c070d82d3bb1df4072a52f279478487a2511cc Mon Sep 17 00:00:00 2001
From: Mangesh-Khairnar <mkhairnar10@gmail.com>
Date: Thu, 4 Jun 2020 14:38:46 +0530
Subject: [PATCH 017/191] fix: add paytm settings link to the module page

---
 frappe/config/integrations.py            | 5 +++++
 frappe/templates/includes/login/login.js | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/frappe/config/integrations.py b/frappe/config/integrations.py
index f41adc9ea4..a7ac20065f 100644
--- a/frappe/config/integrations.py
+++ b/frappe/config/integrations.py
@@ -27,6 +27,11 @@ def get_data():
 					"name": "Stripe Settings",
 					"description": _("Stripe payment gateway settings"),
 				},
+				{
+					"type": "doctype",
+					"name": "Paytm Settings",
+					"description": _("Paytm payment gateway settings"),
+				},
 			]
 		},
 		{
diff --git a/frappe/templates/includes/login/login.js b/frappe/templates/includes/login/login.js
index 37b8acb328..793fcc1720 100644
--- a/frappe/templates/includes/login/login.js
+++ b/frappe/templates/includes/login/login.js
@@ -186,7 +186,7 @@ login.login_handlers = (function() {
 			} else if(data.message == 'Password Reset'){
 				window.location.href = frappe.utils.sanitise_redirect(data.redirect_to);
 			} else if(data.message=="No App") {
-				login.set_indicator("{{ _("Success") }}", 'green');
+				login.set_indicator("{{ _('Success') }}", 'green');
 				if(localStorage) {
 					var last_visited =
 						localStorage.getItem("last_visited")

From a9a8fc953fa6a90be8718a9d5c1f9b16fa890e87 Mon Sep 17 00:00:00 2001
From: Mangesh-Khairnar <mkhairnar10@gmail.com>
Date: Mon, 8 Jun 2020 17:06:48 +0530
Subject: [PATCH 018/191] fix: update the checksum logic

---
 .../doctype/paytm_settings/checksum.py        | 172 ++++++------------
 .../paytm_settings/paytm_settings.json        |  40 ++--
 .../doctype/paytm_settings/paytm_settings.py  |   8 +-
 3 files changed, 85 insertions(+), 135 deletions(-)

diff --git a/frappe/integrations/doctype/paytm_settings/checksum.py b/frappe/integrations/doctype/paytm_settings/checksum.py
index b2e67bb5ad..32f976ae18 100644
--- a/frappe/integrations/doctype/paytm_settings/checksum.py
+++ b/frappe/integrations/doctype/paytm_settings/checksum.py
@@ -2,141 +2,79 @@ import base64
 import string
 import random
 import hashlib
+import sys
 
 from Crypto.Cipher import AES
 
 
-IV = "@@@@&&&&####$$$$"
+iv = '@@@@&&&&####$$$$'
 BLOCK_SIZE = 16
 
+if (sys.version_info > (3, 0)):
+	__pad__ = lambda s: bytes(s + (BLOCK_SIZE - len(s) % BLOCK_SIZE) * chr(BLOCK_SIZE - len(s) % BLOCK_SIZE), 'utf-8')
+else:
+	__pad__ = lambda s: s + (BLOCK_SIZE - len(s) % BLOCK_SIZE) * chr(BLOCK_SIZE - len(s) % BLOCK_SIZE)
 
-def generate_checksum(param_dict, merchant_key, salt=None):
-	params_string = __get_param_string__(param_dict)
-	salt = salt if salt else __id_generator__(4)
-	final_string = '%s|%s' % (params_string, salt)
+__unpad__ = lambda s: s[0:-ord(s[-1])]
 
-	hasher = hashlib.sha256(final_string.encode())
-	hash_string = hasher.hexdigest()
+def encrypt(input, key):
+	input = __pad__(input)
+	c = AES.new(key.encode("utf8"), AES.MODE_CBC, iv.encode("utf8"))
+	input = c.encrypt(input)
+	input = base64.b64encode(input)
+	return input.decode("UTF-8")
 
-	hash_string += salt
+def decrypt(encrypted, key):
+	encrypted = base64.b64decode(encrypted)
+	c = AES.new(key.encode("utf8"), AES.MODE_CBC, iv.encode("utf8"))
+	param = c.decrypt(encrypted)
+	if type(param) == bytes:
+		param = param.decode()
+	return __unpad__(param)
 
-	return __encode__(hash_string, IV, merchant_key)
+def generateSignature(params, key):
+	if not type(params) is dict and not type(params) is str:
+		raise Exception("string or dict expected, " + str(type(params)) + " given")
+	if type(params) is dict:
+		params = getStringByParams(params)
+	return generateSignatureByString(params, key)
 
+def verifySignature(params, key, checksum):
+	if not type(params) is dict and not type(params) is str:
+		raise Exception("string or dict expected, " + str(type(params)) + " given")
+	if "CHECKSUMHASH" in params:
+		del params["CHECKSUMHASH"]
+		
+	if type(params) is dict:
+		params = getStringByParams(params)
+	return verifySignatureByString(params, key, checksum)
 
-def generate_refund_checksum(param_dict, merchant_key, salt=None):
-	for i in param_dict:
-		if("|" in param_dict[i]):
-			param_dict = {}
-			exit()
-	params_string = __get_param_string__(param_dict)
-	salt = salt if salt else __id_generator__(4)
-	final_string = '%s|%s' % (params_string, salt)
+def generateSignatureByString(params, key):
+	salt = generateRandomString(4)
+	return calculateChecksum(params, key, salt)
 
-	hasher = hashlib.sha256(final_string.encode())
-	hash_string = hasher.hexdigest()
-
-	hash_string += salt
-
-	return __encode__(hash_string, IV, merchant_key)
-
-
-def generate_checksum_by_str(param_str, merchant_key, salt=None):
-	params_string = param_str
-	salt = salt if salt else __id_generator__(4)
-	final_string = '%s|%s' % (params_string, salt)
-
-	hasher = hashlib.sha256(final_string.encode())
-	hash_string = hasher.hexdigest()
-
-	hash_string += salt
-
-	return __encode__(hash_string, IV, merchant_key)
-
-
-def verify_checksum(param_dict, merchant_key, checksum):
-	# Remove checksum
-	if 'CHECKSUMHASH' in param_dict:
-		param_dict.pop('CHECKSUMHASH')
-
-	# Get salt
-	paytm_hash = __decode__(checksum, IV, merchant_key)
+def verifySignatureByString(params, key, checksum):
+	paytm_hash = decrypt(checksum, key)    
 	salt = paytm_hash[-4:]
-	calculated_checksum = generate_checksum(
-		param_dict, merchant_key, salt=salt)
-	return calculated_checksum == checksum
+	return paytm_hash == calculateHash(params, salt)
 
+def generateRandomString(length):
+	chars = string.ascii_uppercase + string.digits + string.ascii_lowercase
+	return ''.join(random.choice(chars) for _ in range(length))
 
-def verify_checksum_by_str(param_str, merchant_key, checksum):
-	# Remove checksum
-	# if 'CHECKSUMHASH' in param_dict:
-		# param_dict.pop('CHECKSUMHASH')
-
-	# Get salt
-	paytm_hash = __decode__(checksum, IV, merchant_key)
-	salt = paytm_hash[-4:]
-	calculated_checksum = generate_checksum_by_str(
-		param_str, merchant_key, salt=salt)
-	return calculated_checksum == checksum
-
-
-def __id_generator__(size=6, chars=string.ascii_uppercase + string.digits + string.ascii_lowercase):
-	return ''.join(random.choice(chars) for _ in range(size))
-
-
-def __get_param_string__(params):
+def getStringByParams(params):
 	params_string = []
 	for key in sorted(params.keys()):
-		if("REFUND" in params[key] or "|" in params[key]):
-			exit()
-		value = params[key]
-		params_string.append('' if value == 'null' else str(value))
+		value = params[key] if params[key] is not None and params[key].lower() != "null" else ""
+		params_string.append(str(value))
 	return '|'.join(params_string)
 
+def calculateHash(params, salt):
+	finalString = '%s|%s' % (params, salt)
+	hasher = hashlib.sha256(finalString.encode())
+	hashString = hasher.hexdigest() + salt
+	return hashString
 
-def __pad__(s): return s + (BLOCK_SIZE - len(s) %
-							BLOCK_SIZE) * chr(BLOCK_SIZE - len(s) % BLOCK_SIZE)
-
-
-def __unpad__(s): return s[0:-ord(s[-1])]
-
-
-def __encode__(to_encode, iv, key):
-	# Pad
-	to_encode = __pad__(to_encode)
-	# Encrypt
-	c = AES.new(key, AES.MODE_CBC, iv)
-	to_encode = c.encrypt(to_encode)
-	# Encode
-	to_encode = base64.b64encode(to_encode)
-	return to_encode.decode("UTF-8")
-
-
-def __decode__(to_decode, iv, key):
-	# Decode
-	to_decode = base64.b64decode(to_decode)
-	# Decrypt
-	c = AES.new(key, AES.MODE_CBC, iv)
-	to_decode = c.decrypt(to_decode)
-	if type(to_decode) == bytes:
-		# convert bytes array to str.
-		to_decode = to_decode.decode()
-	# remove pad
-	return __unpad__(to_decode)
-
-
-if __name__ == "__main__":
-	params = {
-		"MID": "mid",
-		"ORDER_ID": "order_id",
-		"CUST_ID": "cust_id",
-		"TXN_AMOUNT": "1",
-		"CHANNEL_ID": "WEB",
-		"INDUSTRY_TYPE_ID": "Retail",
-		"WEBSITE": "xxxxxxxxxxx"
-	}
-
-	print(verify_checksum(
-		params, 'xxxxxxxxxxxxxxxx',
-		"CD5ndX8VVjlzjWbbYoAtKQIlvtXPypQYOg0Fi2AUYKXZA5XSHiRF0FDj7vQu66S8MHx9NaDZ/uYm3WBOWHf+sDQAmTyxqUipA7i1nILlxrk="))
-
-	# print(generate_checksum(params, "xxxxxxxxxxxxxxxx"))
+def calculateChecksum(params, key, salt): 
+	hashString = calculateHash(params, salt)
+	return encrypt(hashString, key)
\ No newline at end of file
diff --git a/frappe/integrations/doctype/paytm_settings/paytm_settings.json b/frappe/integrations/doctype/paytm_settings/paytm_settings.json
index 0540dc4948..93fbd0df09 100644
--- a/frappe/integrations/doctype/paytm_settings/paytm_settings.json
+++ b/frappe/integrations/doctype/paytm_settings/paytm_settings.json
@@ -9,7 +9,7 @@
   "merchant_key",
   "staging",
   "column_break_4",
-  "industry_type",
+  "industry_type_id",
   "website"
  ],
  "fields": [
@@ -18,43 +18,55 @@
    "fieldtype": "Data",
    "in_list_view": 1,
    "label": "Merchant ID",
-   "reqd": 1
+   "reqd": 1,
+   "show_days": 1,
+   "show_seconds": 1
   },
   {
    "fieldname": "merchant_key",
    "fieldtype": "Password",
    "in_list_view": 1,
    "label": "Merchant Key",
-   "reqd": 1
+   "reqd": 1,
+   "show_days": 1,
+   "show_seconds": 1
   },
   {
    "default": "0",
    "fieldname": "staging",
    "fieldtype": "Check",
-   "label": "Staging"
-  },
-  {
-   "depends_on": "eval: !doc.staging",
-   "fieldname": "industry_type",
-   "fieldtype": "Data",
-   "label": "Industry Type",
-   "mandatory_depends_on": "eval: !doc.staging"
+   "label": "Staging",
+   "show_days": 1,
+   "show_seconds": 1
   },
   {
    "depends_on": "eval: !doc.staging",
    "fieldname": "website",
    "fieldtype": "Data",
    "label": "Website",
-   "mandatory_depends_on": "eval: !doc.staging"
+   "mandatory_depends_on": "eval: !doc.staging",
+   "show_days": 1,
+   "show_seconds": 1
   },
   {
    "fieldname": "column_break_4",
-   "fieldtype": "Column Break"
+   "fieldtype": "Column Break",
+   "show_days": 1,
+   "show_seconds": 1
+  },
+  {
+   "depends_on": "eval: !doc.staging",
+   "fieldname": "industry_type_id",
+   "fieldtype": "Data",
+   "label": "Industry Type ID",
+   "mandatory_depends_on": "eval: !doc.staging",
+   "show_days": 1,
+   "show_seconds": 1
   }
  ],
  "issingle": 1,
  "links": [],
- "modified": "2020-04-16 14:16:19.687449",
+ "modified": "2020-06-08 13:36:09.703143",
  "modified_by": "Administrator",
  "module": "Integrations",
  "name": "Paytm Settings",
diff --git a/frappe/integrations/doctype/paytm_settings/paytm_settings.py b/frappe/integrations/doctype/paytm_settings/paytm_settings.py
index ed71202ea6..c169a53246 100644
--- a/frappe/integrations/doctype/paytm_settings/paytm_settings.py
+++ b/frappe/integrations/doctype/paytm_settings/paytm_settings.py
@@ -13,7 +13,7 @@ from frappe import _
 from frappe.utils import get_url, call_hook_method, cint, flt, cstr
 from frappe.integrations.utils import create_request_log, create_payment_gateway
 from frappe.utils import get_request_site_address
-from frappe.integrations.doctype.paytm_settings.checksum import generate_checksum, verify_checksum
+from frappe.integrations.doctype.paytm_settings.checksum import generateSignature, verifySignature
 from frappe.utils.password import get_decrypted_password
 
 class PaytmSettings(Document):
@@ -75,7 +75,7 @@ def get_paytm_params(payment_details, order_id, paytm_config):
 		"CALLBACK_URL" : redirect_uri,
 	})
 
-	checksum = generate_checksum(paytm_params, paytm_config.merchant_key)
+	checksum = generateSignature(paytm_params, paytm_config.merchant_key)
 
 	paytm_params.update({
 		"CHECKSUMHASH" : checksum
@@ -101,7 +101,7 @@ def verify_transaction(**kwargs):
 
 	if paytm_params and paytm_config and paytm_checksum:
 		# Verify checksum
-		is_valid_checksum = verify_checksum(paytm_params, paytm_config.merchant_key, paytm_checksum)
+		is_valid_checksum = verifySignature(paytm_params, paytm_config.merchant_key, paytm_checksum)
 
 	if is_valid_checksum and received_data['RESPCODE'] == '01':
 		verify_transaction_status(paytm_config, received_data['ORDERID'])
@@ -118,7 +118,7 @@ def verify_transaction_status(paytm_config, order_id):
 		ORDERID= order_id
 	)
 
-	checksum = generate_checksum(paytm_params, paytm_config.merchant_key)
+	checksum = generateSignature(paytm_params, paytm_config.merchant_key)
 	paytm_params["CHECKSUMHASH"] = checksum
 
 	post_data = json.dumps(paytm_params)

From 86508e7617e9b9d448599b6298dacf83f840d136 Mon Sep 17 00:00:00 2001
From: Himanshu Warekar <himanshuwarekar@yahoo.com>
Date: Mon, 15 Jun 2020 14:53:30 +0530
Subject: [PATCH 019/191] fix: change to primary for button

---
 .../help_article/templates/help_article.html       | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/frappe/website/doctype/help_article/templates/help_article.html b/frappe/website/doctype/help_article/templates/help_article.html
index 08c8fa342d..01271af8b9 100644
--- a/frappe/website/doctype/help_article/templates/help_article.html
+++ b/frappe/website/doctype/help_article/templates/help_article.html
@@ -23,8 +23,8 @@
 	<hr />
 	<div class="feedback-view ">
 		<span class="text-muted small" style="margin-right: 15px;">{{ _("Was this helpful?") }}</span>
-		<button class="feedback btn btn-light btn-sm" data-value="Yes" style="width: 50px;">{{ _("Yes") }}</button>
-		<button class="feedback btn btn-light btn-sm" data-value="No" style="width: 50px;">{{ _("No") }}</button>
+		<button class="feedback btn btn-outline-primary btn-sm" data-value="Yes" style="width: 50px;">{{ _("Yes") }}</button>
+		<button class="feedback btn btn-outline-primary btn-sm" data-value="No" style="width: 50px;">{{ _("No") }}</button>
 	</div>
 </div>
 <div class="help-article-comments">
@@ -41,13 +41,19 @@ frappe.ready(function() {
 			helpful: this.getAttribute("data-value"),
 		}
 
+		let disable_button = function(btn) {
+			btn.classList.remove("btn-outline-primary");
+			btn.classList.add("btn-light");
+			btn.disabled = true
+		}
+
 		frappe.call({
 			btn: this,
 			method: "frappe.website.doctype.help_article.help_article.add_feedback",
 			args: args,
 			callback: function(r) {
-				$(".feedback")[0].disabled = true;
-				$(".feedback")[1].disabled = true;
+				disable_button($(".feedback")[0]);
+				disable_button($(".feedback")[1]);
 				frappe.msgprint(__("Thank you for your feedback!"));
 			}
 		})

From 0aceebd5507d088410354e6bf55acdc54667b816 Mon Sep 17 00:00:00 2001
From: Himanshu <himanshuwarekar@yahoo.com>
Date: Wed, 24 Jun 2020 10:52:03 +0530
Subject: [PATCH 020/191] Update
 frappe/website/doctype/help_article/help_article.js

Co-authored-by: Prssanna Desai <prssud@gmail.com>
---
 frappe/website/doctype/help_article/help_article.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frappe/website/doctype/help_article/help_article.js b/frappe/website/doctype/help_article/help_article.js
index 0ca92aefbd..0a87b22e2c 100644
--- a/frappe/website/doctype/help_article/help_article.js
+++ b/frappe/website/doctype/help_article/help_article.js
@@ -14,7 +14,7 @@ frappe.ui.form.on('Help Article', {
 				</div>
 				<div class="col-md-6 col-xs-12">
 					<span class="indicator whitespace-nowrap red">
-						<span>Not Helpful ${frm.doc.helpful}</span>
+						<span>Not Helpful ${frm.doc.not_helpful}</span>
 					</span>
 				</div>
 			</div>

From 249d04420b9e32e8543c02bf8879d321747df5ba Mon Sep 17 00:00:00 2001
From: Himanshu <himanshuwarekar@yahoo.com>
Date: Fri, 26 Jun 2020 13:28:15 +0530
Subject: [PATCH 021/191] Update
 frappe/website/doctype/help_article/templates/help_article.html

Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com>
---
 frappe/website/doctype/help_article/templates/help_article.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frappe/website/doctype/help_article/templates/help_article.html b/frappe/website/doctype/help_article/templates/help_article.html
index 01271af8b9..cdd830295f 100644
--- a/frappe/website/doctype/help_article/templates/help_article.html
+++ b/frappe/website/doctype/help_article/templates/help_article.html
@@ -22,7 +22,7 @@
 <div class="help-article-feedback mb-4">
 	<hr />
 	<div class="feedback-view ">
-		<span class="text-muted small" style="margin-right: 15px;">{{ _("Was this helpful?") }}</span>
+		<span class="text-muted small mr-2">{{ _("Was this article helpful?") }}</span>
 		<button class="feedback btn btn-outline-primary btn-sm" data-value="Yes" style="width: 50px;">{{ _("Yes") }}</button>
 		<button class="feedback btn btn-outline-primary btn-sm" data-value="No" style="width: 50px;">{{ _("No") }}</button>
 	</div>

From 548a5fa41640e6bf7dff1e19c011146ddfa7e65e Mon Sep 17 00:00:00 2001
From: Himanshu Warekar <himanshuwarekar@yahoo.com>
Date: Fri, 26 Jun 2020 15:38:07 +0530
Subject: [PATCH 022/191] fix: add new disabled state

---
 .../help_article/templates/help_article.html        | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/frappe/website/doctype/help_article/templates/help_article.html b/frappe/website/doctype/help_article/templates/help_article.html
index cdd830295f..a97154847b 100644
--- a/frappe/website/doctype/help_article/templates/help_article.html
+++ b/frappe/website/doctype/help_article/templates/help_article.html
@@ -25,6 +25,7 @@
 		<span class="text-muted small mr-2">{{ _("Was this article helpful?") }}</span>
 		<button class="feedback btn btn-outline-primary btn-sm" data-value="Yes" style="width: 50px;">{{ _("Yes") }}</button>
 		<button class="feedback btn btn-outline-primary btn-sm" data-value="No" style="width: 50px;">{{ _("No") }}</button>
+		<button class="feedback-msg btn btn-sm disabled hide">{{ _("Thank you for your feedback!") }}</button>
 	</div>
 </div>
 <div class="help-article-comments">
@@ -41,20 +42,14 @@ frappe.ready(function() {
 			helpful: this.getAttribute("data-value"),
 		}
 
-		let disable_button = function(btn) {
-			btn.classList.remove("btn-outline-primary");
-			btn.classList.add("btn-light");
-			btn.disabled = true
-		}
-
 		frappe.call({
 			btn: this,
 			method: "frappe.website.doctype.help_article.help_article.add_feedback",
 			args: args,
 			callback: function(r) {
-				disable_button($(".feedback")[0]);
-				disable_button($(".feedback")[1]);
-				frappe.msgprint(__("Thank you for your feedback!"));
+				$(".feedback")[0].classList.add("hide");
+				$(".feedback")[1].classList.add("hide");
+				$(".feedback-msg")[0].classList.remove("hide");
 			}
 		})
 	});

From 8ddfd2344d6c7d8be3855d317602de2b7d2f8888 Mon Sep 17 00:00:00 2001
From: "Chinmay D. Pai" <chinmaydpai@gmail.com>
Date: Thu, 2 Jul 2020 12:53:16 +0530
Subject: [PATCH 023/191] chore: add search queries to whitelist

these functions are called through search widget and need to be
whitelisted to work

Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
---
 frappe/contacts/address_and_contact.py     | 1 +
 frappe/contacts/doctype/address/address.py | 3 ++-
 frappe/contacts/doctype/contact/contact.py | 1 +
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/frappe/contacts/address_and_contact.py b/frappe/contacts/address_and_contact.py
index 5a004f153b..51f13fb1a1 100644
--- a/frappe/contacts/address_and_contact.py
+++ b/frappe/contacts/address_and_contact.py
@@ -146,6 +146,7 @@ def delete_contact_and_address(doctype, docname):
 			if len(doc.links)==1:
 				doc.delete()
 
+@frappe.whitelist()
 def filter_dynamic_link_doctypes(doctype, txt, searchfield, start, page_len, filters):
 	if not txt: txt = ""
 
diff --git a/frappe/contacts/doctype/address/address.py b/frappe/contacts/doctype/address/address.py
index b85d578353..79bdb42931 100644
--- a/frappe/contacts/doctype/address/address.py
+++ b/frappe/contacts/doctype/address/address.py
@@ -230,6 +230,7 @@ def get_company_address(company):
 
 	return ret
 
+@frappe.whitelist()
 def address_query(doctype, txt, searchfield, start, page_len, filters):
 	from frappe.desk.reportview import get_match_cond
 
@@ -289,4 +290,4 @@ def get_condensed_address(doc):
 	return ", ".join([doc.get(d) for d in fields if doc.get(d)])
 
 def update_preferred_address(address, field):
-	frappe.db.set_value('Address', address, field, 0)
\ No newline at end of file
+	frappe.db.set_value('Address', address, field, 0)
diff --git a/frappe/contacts/doctype/contact/contact.py b/frappe/contacts/doctype/contact/contact.py
index 4cf209541c..598e186ee8 100644
--- a/frappe/contacts/doctype/contact/contact.py
+++ b/frappe/contacts/doctype/contact/contact.py
@@ -182,6 +182,7 @@ def update_contact(doc, method):
 		contact.flags.ignore_mandatory = True
 		contact.save(ignore_permissions=True)
 
+@frappe.whitelist()
 def contact_query(doctype, txt, searchfield, start, page_len, filters):
 	from frappe.desk.reportview import get_match_cond
 

From 338151a7e5e067ec3e566025b1c99b04621432e3 Mon Sep 17 00:00:00 2001
From: "Chinmay D. Pai" <chinmaydpai@gmail.com>
Date: Tue, 7 Jul 2020 11:22:37 +0530
Subject: [PATCH 024/191] fix: correctly format sql query

Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
---
 frappe/contacts/doctype/contact/contact.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/frappe/contacts/doctype/contact/contact.py b/frappe/contacts/doctype/contact/contact.py
index 598e186ee8..e340c7e2d0 100644
--- a/frappe/contacts/doctype/contact/contact.py
+++ b/frappe/contacts/doctype/contact/contact.py
@@ -205,14 +205,14 @@ def contact_query(doctype, txt, searchfield, start, page_len, filters):
 			`tabDynamic Link`.parenttype = 'Contact' and
 			`tabDynamic Link`.link_doctype = %(link_doctype)s and
 			`tabDynamic Link`.link_name = %(link_name)s and
-			`tabContact`.`{key}` like %(txt)s
-			{mcond}
+			`tabContact`.`%(key)s` like %(txt)s
+			%(mcond)s
 		order by
 			if(locate(%(_txt)s, `tabContact`.name), locate(%(_txt)s, `tabContact`.name), 99999),
 			`tabContact`.idx desc, `tabContact`.name
-		limit %(start)s, %(page_len)s """.format(
-			mcond=get_match_cond(doctype),
-			key=searchfield), {
+		limit %(start)s, %(page_len)s """, {
+			'mcond': get_match_cond(doctype),
+			'key': searchfield,
 			'txt': '%' + txt + '%',
 			'_txt': txt.replace("%", ""),
 			'start': start,

From 36d1b5f0150799a08b5ca39c5efd35040e3a899d Mon Sep 17 00:00:00 2001
From: "Chinmay D. Pai" <chinmaydpai@gmail.com>
Date: Thu, 9 Jul 2020 12:27:39 +0530
Subject: [PATCH 025/191] fix: check if field exists in meta before executing
 query

Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
---
 frappe/contacts/doctype/contact/contact.py | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/frappe/contacts/doctype/contact/contact.py b/frappe/contacts/doctype/contact/contact.py
index e340c7e2d0..4af4362aff 100644
--- a/frappe/contacts/doctype/contact/contact.py
+++ b/frappe/contacts/doctype/contact/contact.py
@@ -186,6 +186,9 @@ def update_contact(doc, method):
 def contact_query(doctype, txt, searchfield, start, page_len, filters):
 	from frappe.desk.reportview import get_match_cond
 
+	if not frappe.get_meta("Contact").get_field(searchfield):
+		return {}
+
 	link_doctype = filters.pop('link_doctype')
 	link_name = filters.pop('link_name')
 
@@ -205,14 +208,12 @@ def contact_query(doctype, txt, searchfield, start, page_len, filters):
 			`tabDynamic Link`.parenttype = 'Contact' and
 			`tabDynamic Link`.link_doctype = %(link_doctype)s and
 			`tabDynamic Link`.link_name = %(link_name)s and
-			`tabContact`.`%(key)s` like %(txt)s
-			%(mcond)s
+			`tabContact`.`{key}` like %(txt)s
+			{mcond}
 		order by
 			if(locate(%(_txt)s, `tabContact`.name), locate(%(_txt)s, `tabContact`.name), 99999),
 			`tabContact`.idx desc, `tabContact`.name
-		limit %(start)s, %(page_len)s """, {
-			'mcond': get_match_cond(doctype),
-			'key': searchfield,
+		limit %(start)s, %(page_len)s """.format(mcond=get_match_cond(doctype), key=searchfield), {
 			'txt': '%' + txt + '%',
 			'_txt': txt.replace("%", ""),
 			'start': start,

From 2220cb969bc973ca0dc4e0848e49a2f66d76eb15 Mon Sep 17 00:00:00 2001
From: Deepesh Garg <deepeshgarg6@gmail.com>
Date: Fri, 10 Jul 2020 20:33:11 +0530
Subject: [PATCH 026/191] fix: Datetime field description

---
 frappe/public/js/frappe/form/controls/datetime.js | 2 --
 1 file changed, 2 deletions(-)

diff --git a/frappe/public/js/frappe/form/controls/datetime.js b/frappe/public/js/frappe/form/controls/datetime.js
index b487be6eca..f44591ddcb 100644
--- a/frappe/public/js/frappe/form/controls/datetime.js
+++ b/frappe/public/js/frappe/form/controls/datetime.js
@@ -20,8 +20,6 @@ frappe.ui.form.ControlDatetime = frappe.ui.form.ControlDate.extend({
 		if (!frappe.datetime.is_timezone_same()) {
 			if (!description) {
 				this.df.description = time_zone;
-			} else if (!description.includes(time_zone)) {
-				this.df.description += '<br>' + time_zone;
 			}
 		}
 		this._super();

From 817b2488271ef109d4f53ecf4b1856ff3635892e Mon Sep 17 00:00:00 2001
From: Himanshu <himanshuwarekar@yahoo.com>
Date: Sat, 11 Jul 2020 17:34:28 +0530
Subject: [PATCH 027/191] Update
 frappe/website/doctype/help_article/templates/help_article.html

Co-authored-by: Prssanna Desai <prssud@gmail.com>
---
 frappe/website/doctype/help_article/templates/help_article.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frappe/website/doctype/help_article/templates/help_article.html b/frappe/website/doctype/help_article/templates/help_article.html
index a97154847b..bfe2bc4529 100644
--- a/frappe/website/doctype/help_article/templates/help_article.html
+++ b/frappe/website/doctype/help_article/templates/help_article.html
@@ -22,7 +22,7 @@
 <div class="help-article-feedback mb-4">
 	<hr />
 	<div class="feedback-view ">
-		<span class="text-muted small mr-2">{{ _("Was this article helpful?") }}</span>
+		<div class="text-muted small mr-2 mb-2">{{ _("Was this article helpful?") }}</div>
 		<button class="feedback btn btn-outline-primary btn-sm" data-value="Yes" style="width: 50px;">{{ _("Yes") }}</button>
 		<button class="feedback btn btn-outline-primary btn-sm" data-value="No" style="width: 50px;">{{ _("No") }}</button>
 		<button class="feedback-msg btn btn-sm disabled hide">{{ _("Thank you for your feedback!") }}</button>

From 44979d17f6762f069acca40fb0ac5063bd5df550 Mon Sep 17 00:00:00 2001
From: Himanshu <himanshuwarekar@yahoo.com>
Date: Sat, 11 Jul 2020 17:34:50 +0530
Subject: [PATCH 028/191] Update
 frappe/website/doctype/help_article/templates/help_article.html

Co-authored-by: Prssanna Desai <prssud@gmail.com>
---
 .../doctype/help_article/templates/help_article.html        | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/frappe/website/doctype/help_article/templates/help_article.html b/frappe/website/doctype/help_article/templates/help_article.html
index bfe2bc4529..577383858b 100644
--- a/frappe/website/doctype/help_article/templates/help_article.html
+++ b/frappe/website/doctype/help_article/templates/help_article.html
@@ -47,9 +47,9 @@ frappe.ready(function() {
 			method: "frappe.website.doctype.help_article.help_article.add_feedback",
 			args: args,
 			callback: function(r) {
-				$(".feedback")[0].classList.add("hide");
-				$(".feedback")[1].classList.add("hide");
-				$(".feedback-msg")[0].classList.remove("hide");
+				$(".feedback")[0].classList.add("hidden");
+				$(".feedback")[1].classList.add("hidden");
+				$(".feedback-msg")[0].classList.remove("hidden");
 			}
 		})
 	});

From 28e0f42f9c6525b1b2ddaf0c6c80762a09115190 Mon Sep 17 00:00:00 2001
From: Deepesh Garg <deepeshgarg6@gmail.com>
Date: Mon, 13 Jul 2020 13:42:17 +0530
Subject: [PATCH 029/191] feat: Hide timezone

---
 frappe/public/js/frappe/form/controls/datetime.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/frappe/public/js/frappe/form/controls/datetime.js b/frappe/public/js/frappe/form/controls/datetime.js
index f44591ddcb..c99dfe899f 100644
--- a/frappe/public/js/frappe/form/controls/datetime.js
+++ b/frappe/public/js/frappe/form/controls/datetime.js
@@ -17,9 +17,11 @@ frappe.ui.form.ControlDatetime = frappe.ui.form.ControlDate.extend({
 	set_description: function() {
 		const { description } = this.df;
 		const { time_zone } = frappe.sys_defaults;
-		if (!frappe.datetime.is_timezone_same()) {
+		if (!this.df.hide_timezone && !frappe.datetime.is_timezone_same()) {
 			if (!description) {
 				this.df.description = time_zone;
+			} else if (!description.includes(time_zone)) {
+				this.df.description += '<br>' + time_zone;
 			}
 		}
 		this._super();

From ccde503c5a0b81887eba33e0a17069d9ba08099b Mon Sep 17 00:00:00 2001
From: marination <maricadsouza221197@gmail.com>
Date: Mon, 13 Jul 2020 19:27:46 +0530
Subject: [PATCH 030/191] fix: Total Row in Reports

---
 .../js/frappe/views/reports/query_report.js       | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/frappe/public/js/frappe/views/reports/query_report.js b/frappe/public/js/frappe/views/reports/query_report.js
index f82956adac..609e1feb46 100644
--- a/frappe/public/js/frappe/views/reports/query_report.js
+++ b/frappe/public/js/frappe/views/reports/query_report.js
@@ -861,8 +861,19 @@ frappe.views.QueryReport = class QueryReport extends frappe.views.BaseList {
 				if (column.isHeader && !data && this.data) {
 					// totalRow doesn't have a data object
 					// proxy it using the first data object
-					// this is needed only for currency formatting
-					data = this.data[0];
+					// applied to Float, Currency fields, needed only for currency formatting.
+					// make first data column have value 'Total'
+					let index = 1;
+					if (this.datatable && this.datatable.options.checkboxColumn) index = 2;
+
+					if (column.colIndex === index && !value) {
+						value = "Total";
+						column.fieldtype = "Data"; // avoid type issues for value if Date column
+					}
+					else if (in_list(["Currency", "Float"], column.fieldtype)) {
+						// proxy for currency and float
+						data = this.data[0];
+					}
 				}
 				return frappe.format(value, column,
 					{for_print: false, always_show_decimals: true}, data);

From 0e1a8006ff081494b4b5483357de01adcf85fd52 Mon Sep 17 00:00:00 2001
From: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
Date: Tue, 14 Jul 2020 12:56:12 +0530
Subject: [PATCH 031/191] fix: Return empty array

---
 frappe/contacts/doctype/contact/contact.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frappe/contacts/doctype/contact/contact.py b/frappe/contacts/doctype/contact/contact.py
index 4af4362aff..0cdd7c7fdd 100644
--- a/frappe/contacts/doctype/contact/contact.py
+++ b/frappe/contacts/doctype/contact/contact.py
@@ -187,7 +187,7 @@ def contact_query(doctype, txt, searchfield, start, page_len, filters):
 	from frappe.desk.reportview import get_match_cond
 
 	if not frappe.get_meta("Contact").get_field(searchfield):
-		return {}
+		return []
 
 	link_doctype = filters.pop('link_doctype')
 	link_name = filters.pop('link_name')

From f057260e90a5e8c7888ac9b62431bb19d09063ef Mon Sep 17 00:00:00 2001
From: prssanna <prssud@gmail.com>
Date: Tue, 14 Jul 2020 17:49:34 +0530
Subject: [PATCH 032/191] fix: reorder result according to custom columns for
 script reports

---
 frappe/desk/query_report.py | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/frappe/desk/query_report.py b/frappe/desk/query_report.py
index 0edfd57d4f..d0a32ef076 100644
--- a/frappe/desk/query_report.py
+++ b/frappe/desk/query_report.py
@@ -67,8 +67,7 @@ def generate_report_result(report, filters=None, user=None, custom_columns=None)
 		# Reordered columns
 		columns = json.loads(report.custom_columns)
 
-		if report.report_type == 'Query Report':
-			result = reorder_data_for_custom_columns(columns, query_columns, result)
+		result = reorder_data_for_custom_columns(columns, query_columns, result, report.report_type)
 
 		result = add_data_to_custom_columns(columns, result)
 
@@ -216,15 +215,21 @@ def add_data_to_custom_columns(columns, result):
 
 	return data
 
-def reorder_data_for_custom_columns(custom_columns, columns, result):
+def reorder_data_for_custom_columns(custom_columns, columns, result, report_type):
+	custom_column_labels = [col["label"] for col in custom_columns]
+
+	if report_type == 'Query Report':
+		original_column_labels = [col.split(":")[0] for col in columns]
+	else:
+		original_column_labels = [col["label"] for col in columns]
+
 	reordered_result = []
-	columns = [col.split(":")[0] for col in columns]
 
 	for res in result:
 		r = []
-		for col in custom_columns:
+		for col_name in custom_column_labels:
 			try:
-				idx = columns.index(col.get("label"))
+				idx = original_column_labels.index(col_name)
 				r.append(res[idx])
 			except ValueError:
 				pass

From 71f9c3aab0961cfb17b2cfe47a9491cd3db7714c Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Tue, 14 Jul 2020 21:10:49 +0530
Subject: [PATCH 033/191] fix: set form perm only for standard reports

---
 frappe/core/doctype/report/report.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frappe/core/doctype/report/report.js b/frappe/core/doctype/report/report.js
index 818c5951e6..b4c30f5bbd 100644
--- a/frappe/core/doctype/report/report.js
+++ b/frappe/core/doctype/report/report.js
@@ -1,6 +1,6 @@
 frappe.ui.form.on('Report', {
 	refresh: function(frm) {
-		if(!frappe.boot.developer_mode && frappe.session.user !== 'Administrator') {
+		if (frm.doc.is_standard && !frappe.boot.developer_mode) {
 			// make the document read-only
 			frm.set_read_only();
 		}

From dfbf453eec5b5ebe47cfbcaa1f70c44b3fff4148 Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Tue, 14 Jul 2020 21:58:04 +0530
Subject: [PATCH 034/191] fix: don't allow removing ID column

---
 frappe/public/js/frappe/views/reports/report_view.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/frappe/public/js/frappe/views/reports/report_view.js b/frappe/public/js/frappe/views/reports/report_view.js
index 9e7e5cbdd6..4ae61c6f96 100644
--- a/frappe/public/js/frappe/views/reports/report_view.js
+++ b/frappe/public/js/frappe/views/reports/report_view.js
@@ -768,10 +768,12 @@ frappe.views.ReportView = class ReportView extends frappe.views.ListView {
 		const index = this.fields.findIndex(f => column.field === f[0]);
 		if (index === -1) return;
 		const field = this.fields[index];
-		if (field[0] === 'name' && this.group_by === null) {
+
+		if (field[0] === 'name') {
 			this.refresh();
 			frappe.throw(__('Cannot remove ID field'));
 		}
+
 		this.fields.splice(index, 1);
 		this.build_fields();
 		this.setup_columns();

From 46b5cb587f67c1da58dcca2a255aaa0c8f58318a Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Tue, 14 Jul 2020 21:58:23 +0530
Subject: [PATCH 035/191] feat: don't show name field in pick columns

---
 frappe/public/js/frappe/views/reports/report_view.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frappe/public/js/frappe/views/reports/report_view.js b/frappe/public/js/frappe/views/reports/report_view.js
index 4ae61c6f96..95a3577698 100644
--- a/frappe/public/js/frappe/views/reports/report_view.js
+++ b/frappe/public/js/frappe/views/reports/report_view.js
@@ -852,7 +852,7 @@ frappe.views.ReportView = class ReportView extends frappe.views.ListView {
 			columns: 2,
 			options: columns[this.doctype]
 				.filter(df => {
-					return !df.hidden;
+					return !df.hidden && df.fieldname !== 'name';
 				})
 				.map(df => ({
 					label: __(df.label),

From bb2f09b270f56ee502557d0909157f77b99f47fd Mon Sep 17 00:00:00 2001
From: prssanna <prssud@gmail.com>
Date: Tue, 14 Jul 2020 18:49:02 +0530
Subject: [PATCH 036/191] feat(Dashboard): option to refresh all charts and
 cards

---
 frappe/core/page/dashboard/dashboard.js | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/frappe/core/page/dashboard/dashboard.js b/frappe/core/page/dashboard/dashboard.js
index f17bc1e0b5..cee230265f 100644
--- a/frappe/core/page/dashboard/dashboard.js
+++ b/frappe/core/page/dashboard/dashboard.js
@@ -172,19 +172,26 @@ class Dashboard {
 	set_dropdown() {
 		this.page.clear_menu();
 
-		this.page.add_menu_item('Edit...', () => {
+		this.page.add_menu_item(__('Edit'), () => {
 			frappe.set_route('Form', 'Dashboard', frappe.dashboard.dashboard_name);
-		}, 1);
+		});
 
-		this.page.add_menu_item('New...', () => {
+		this.page.add_menu_item(__('New'), () => {
 			frappe.new_doc('Dashboard');
-		}, 1);
+		});
 
-		frappe.db.get_list("Dashboard").then(dashboards => {
+		this.page.add_menu_item(__('Refresh All'), () => {
+			this.chart_group &&
+				this.chart_group.widgets_list.forEach(chart => chart.refresh());
+			this.number_card_group &&
+				this.number_card_group.widgets_list.forEach(card => card.render_card());
+		});
+
+		frappe.db.get_list('Dashboard').then(dashboards => {
 			dashboards.map(dashboard => {
 				let name = dashboard.name;
 				if(name != this.dashboard_name){
-					this.page.add_menu_item(name, () => frappe.set_route("dashboard", name));
+					this.page.add_menu_item(name, () => frappe.set_route("dashboard", name), 1);
 				}
 			});
 		});

From 1023422433213a03c181e19966277fd01e1ec0d7 Mon Sep 17 00:00:00 2001
From: prssanna <prssud@gmail.com>
Date: Wed, 15 Jul 2020 17:54:51 +0530
Subject: [PATCH 037/191] fix: Add share perm in set_read_only

---
 frappe/public/js/frappe/form/form.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/frappe/public/js/frappe/form/form.js b/frappe/public/js/frappe/form/form.js
index f7d1b3e873..843e5382dc 100644
--- a/frappe/public/js/frappe/form/form.js
+++ b/frappe/public/js/frappe/form/form.js
@@ -1401,6 +1401,9 @@ frappe.ui.form.Form = class FrappeForm {
 		for (var i=0, l=docperms.length; i<l; i++) {
 			var p = docperms[i];
 			perm[p.permlevel || 0] = {read:1, print:1, cancel:1, email:1};
+			if (p.share) {
+				perm[p.permlevel || 0].share = 1;
+			}
 		}
 		this.perm = perm;
 	}

From 907411d33fbc0db7950df119f75acae28b83ae90 Mon Sep 17 00:00:00 2001
From: "Chinmay D. Pai" <chinmaydpai@gmail.com>
Date: Thu, 16 Jul 2020 15:33:04 +0530
Subject: [PATCH 038/191] fix: validate if field exists in meta before adding
 to query

Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
---
 frappe/contacts/doctype/address/address.py | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/frappe/contacts/doctype/address/address.py b/frappe/contacts/doctype/address/address.py
index 79bdb42931..9c838eeb40 100644
--- a/frappe/contacts/doctype/address/address.py
+++ b/frappe/contacts/doctype/address/address.py
@@ -238,13 +238,14 @@ def address_query(doctype, txt, searchfield, start, page_len, filters):
 	link_name = filters.pop('link_name')
 
 	condition = ""
-	for fieldname, value in iteritems(filters):
-		condition += " and {field}={value}".format(
-			field=fieldname,
-			value=value
-		)
-
 	meta = frappe.get_meta("Address")
+	for fieldname, value in iteritems(filters):
+		if meta.get_field(fieldname) or fieldname in frappe.db.DEFAULT_COLUMNS:
+			condition += " and {field}={value}".format(
+				field=fieldname,
+				value=value
+			)
+
 	searchfields = meta.get_search_fields()
 
 	if searchfield:

From 1e6e305a3746c9aa7bec8cb907faf41c815a2aff Mon Sep 17 00:00:00 2001
From: "Chinmay D. Pai" <chinmaydpai@gmail.com>
Date: Thu, 16 Jul 2020 15:36:07 +0530
Subject: [PATCH 039/191] fix: check if searchfield exists in default columns

Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
---
 frappe/contacts/doctype/contact/contact.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/frappe/contacts/doctype/contact/contact.py b/frappe/contacts/doctype/contact/contact.py
index 0cdd7c7fdd..5be2cd086c 100644
--- a/frappe/contacts/doctype/contact/contact.py
+++ b/frappe/contacts/doctype/contact/contact.py
@@ -186,7 +186,8 @@ def update_contact(doc, method):
 def contact_query(doctype, txt, searchfield, start, page_len, filters):
 	from frappe.desk.reportview import get_match_cond
 
-	if not frappe.get_meta("Contact").get_field(searchfield):
+	if not frappe.get_meta("Contact").get_field(searchfield)\
+		or searchfield not in frappe.db.DEFAULT_COLUMNS:
 		return []
 
 	link_doctype = filters.pop('link_doctype')

From 28399ba94b7436df9d2833328d0100b36303f60c Mon Sep 17 00:00:00 2001
From: "Chinmay D. Pai" <chinmaydpai@gmail.com>
Date: Thu, 16 Jul 2020 15:41:29 +0530
Subject: [PATCH 040/191] fix: check for searchfield in meta

Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
---
 frappe/contacts/doctype/address/address.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/frappe/contacts/doctype/address/address.py b/frappe/contacts/doctype/address/address.py
index 9c838eeb40..4de92cfa57 100644
--- a/frappe/contacts/doctype/address/address.py
+++ b/frappe/contacts/doctype/address/address.py
@@ -248,7 +248,8 @@ def address_query(doctype, txt, searchfield, start, page_len, filters):
 
 	searchfields = meta.get_search_fields()
 
-	if searchfield:
+	if searchfield and (meta.get_field(searchfield)\
+				or searchfield in frappe.db.DEFAULT_COLUMNS):
 		searchfields.append(searchfield)
 
 	search_condition = ''

From 476e625261ab4954b7429978b24840e52967c9c0 Mon Sep 17 00:00:00 2001
From: Gavin D'souza <gavin18d@gmail.com>
Date: Thu, 16 Jul 2020 16:26:20 +0530
Subject: [PATCH 041/191] fix: Add site validation for logger

---
 frappe/__init__.py     | 4 ++--
 frappe/app.py          | 5 +++--
 frappe/utils/logger.py | 4 ++--
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/frappe/__init__.py b/frappe/__init__.py
index d644d2a473..8c24980189 100644
--- a/frappe/__init__.py
+++ b/frappe/__init__.py
@@ -1559,10 +1559,10 @@ def get_doctype_app(doctype):
 
 loggers = {}
 log_level = None
-def logger(module=None, with_more_info=False):
+def logger(module=None, with_more_info=False, _site=None):
 	'''Returns a python logger that uses StreamHandler'''
 	from frappe.utils.logger import get_logger
-	return get_logger(module=module, with_more_info=with_more_info)
+	return get_logger(module=module, with_more_info=with_more_info, _site=_site)
 
 def log_error(message=None, title=_("Error")):
 	'''Log error to Error Log'''
diff --git a/frappe/app.py b/frappe/app.py
index 57db867882..83a9b8c149 100644
--- a/frappe/app.py
+++ b/frappe/app.py
@@ -99,8 +99,9 @@ def application(request):
 		frappe.monitor.stop(response)
 		frappe.recorder.dump()
 
-		frappe.logger("frappe.web").info({
-			"site": get_site_name(request.host),
+		_site = get_site_name(request.host)
+		frappe.logger("frappe.web", _site=_site).info({
+			"site": _site,
 			"remote_addr": getattr(request, "remote_addr", "NOTFOUND"),
 			"base_url": getattr(request, "base_url", "NOTFOUND"),
 			"full_path": getattr(request, "full_path", "NOTFOUND"),
diff --git a/frappe/utils/logger.py b/frappe/utils/logger.py
index 89e3711b0f..bea83297d2 100755
--- a/frappe/utils/logger.py
+++ b/frappe/utils/logger.py
@@ -17,7 +17,7 @@ default_log_level = logging.DEBUG
 site = getattr(frappe.local, 'site', None)
 
 
-def get_logger(module, with_more_info=False):
+def get_logger(module, with_more_info=False, _site=None):
 	global site
 	if module in frappe.loggers:
 		return frappe.loggers[module]
@@ -38,7 +38,7 @@ def get_logger(module, with_more_info=False):
 	handler = RotatingFileHandler(LOG_FILENAME, maxBytes=100_000, backupCount=20)
 	logger.addHandler(handler)
 #
-	if site:
+	if site == _site:
 		SITELOG_FILENAME = os.path.join(site, 'logs', logfile)
 		site_handler = RotatingFileHandler(SITELOG_FILENAME, maxBytes=100_000, backupCount=20)
 		site_handler.setFormatter(formatter)

From e92a612ba231eebb8dbe7ac42d24ac002a89fbe1 Mon Sep 17 00:00:00 2001
From: Gavin D'souza <gavin18d@gmail.com>
Date: Thu, 16 Jul 2020 16:26:53 +0530
Subject: [PATCH 042/191] docs(get_logger): add docstring

---
 frappe/utils/logger.py | 21 +++++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

diff --git a/frappe/utils/logger.py b/frappe/utils/logger.py
index bea83297d2..afe4335aea 100755
--- a/frappe/utils/logger.py
+++ b/frappe/utils/logger.py
@@ -18,7 +18,24 @@ site = getattr(frappe.local, 'site', None)
 
 
 def get_logger(module, with_more_info=False, _site=None):
+	"""Application Logger for your given module
+
+	Args:
+		module (str): Name of your logger and consequently your log file.
+		with_more_info (bool, optional): Will log the form dict using the SiteContextFilter. Defaults to False.
+		_site (str, optional): If set, validates the current site context with the passed value. The `frappe.web` logger uses this to determine that the application is logging information related to the logger called. Defaults to None.
+
+	Returns:
+		<class 'logging.Logger'>: Returns a Python logger object with Site and Bench level logging capabilities.
+	"""
 	global site
+
+	def allow_site():
+		allow = False
+		if site: allow = True
+		if _site: allow = site == _site
+		return allow
+
 	if module in frappe.loggers:
 		return frappe.loggers[module]
 
@@ -37,8 +54,8 @@ def get_logger(module, with_more_info=False, _site=None):
 	formatter = logging.Formatter('%(asctime)s %(levelname)s %(name)s %(message)s')
 	handler = RotatingFileHandler(LOG_FILENAME, maxBytes=100_000, backupCount=20)
 	logger.addHandler(handler)
-#
-	if site == _site:
+
+	if allow_site():
 		SITELOG_FILENAME = os.path.join(site, 'logs', logfile)
 		site_handler = RotatingFileHandler(SITELOG_FILENAME, maxBytes=100_000, backupCount=20)
 		site_handler.setFormatter(formatter)

From 252e6d877966b33f7d62509cf3038e160bc5d2aa Mon Sep 17 00:00:00 2001
From: Deepesh Garg <deepeshgarg6@gmail.com>
Date: Thu, 16 Jul 2020 22:49:26 +0530
Subject: [PATCH 043/191] fix: Make checkboxes navigatable via tab key

---
 frappe/public/less/desk.less             | 9 ++++++++-
 frappe/public/less/frappe-datatable.less | 4 ++++
 frappe/public/less/role_editor.less      | 4 ++++
 3 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/frappe/public/less/desk.less b/frappe/public/less/desk.less
index b0fb60b6a3..c4f8626a60 100644
--- a/frappe/public/less/desk.less
+++ b/frappe/public/less/desk.less
@@ -790,10 +790,17 @@ li.user-progress {
 	height: 12px;
 }
 
+.frappe-control {
+	.checkbox input[type=checkbox]:before{
+		margin-top: -10px;
+	}
+}
+
+
 // custom font awesome checkbox
 input[type="checkbox"] {
 	position: relative;
-	visibility: hidden;
+	height: 0px !important;
 
 	&:before {
 		position: absolute;
diff --git a/frappe/public/less/frappe-datatable.less b/frappe/public/less/frappe-datatable.less
index 54eecf2b3d..56725636ae 100644
--- a/frappe/public/less/frappe-datatable.less
+++ b/frappe/public/less/frappe-datatable.less
@@ -33,6 +33,10 @@
 	}
 }
 
+.dt-cell input[type=checkbox]:before {
+	margin-top: -10px;
+}
+
 .dt-scrollable {
 	max-height: calc(100vh - 250px);
 	min-height: 100px;
diff --git a/frappe/public/less/role_editor.less b/frappe/public/less/role_editor.less
index c95f1ebc55..91eefcf7d0 100644
--- a/frappe/public/less/role_editor.less
+++ b/frappe/public/less/role_editor.less
@@ -9,6 +9,10 @@
 	padding-top: 2px;
 }
 
+.user-role input[type=checkbox]:before {
+	margin-top: -10px;
+}
+
 table.user-perm {
 	border-collapse: collapse;
     width: 100%;

From 66cb9a5c1a027d9049ce8ea3839cd59fd3dc3d13 Mon Sep 17 00:00:00 2001
From: Deepesh Garg <deepeshgarg6@gmail.com>
Date: Fri, 17 Jul 2020 10:04:37 +0530
Subject: [PATCH 044/191] fix: Move csss from desk.less to cotrol.less

---
 frappe/public/less/controls.less | 6 ++++++
 frappe/public/less/desk.less     | 7 -------
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/frappe/public/less/controls.less b/frappe/public/less/controls.less
index f842401515..cee13a4737 100644
--- a/frappe/public/less/controls.less
+++ b/frappe/public/less/controls.less
@@ -30,6 +30,12 @@
 	}
 }
 
+.frappe-control {
+	.checkbox input[type=checkbox]:before{
+		margin-top: -10px;
+	}
+}
+
 .frappe-control .control-value {
 	overflow-wrap: break-word;
 }
diff --git a/frappe/public/less/desk.less b/frappe/public/less/desk.less
index c4f8626a60..7fe6b4e3a2 100644
--- a/frappe/public/less/desk.less
+++ b/frappe/public/less/desk.less
@@ -790,13 +790,6 @@ li.user-progress {
 	height: 12px;
 }
 
-.frappe-control {
-	.checkbox input[type=checkbox]:before{
-		margin-top: -10px;
-	}
-}
-
-
 // custom font awesome checkbox
 input[type="checkbox"] {
 	position: relative;

From 1cdd8c5b92c32378bf3d5ccece21fddf9eb88940 Mon Sep 17 00:00:00 2001
From: Deepesh Garg <deepeshgarg6@gmail.com>
Date: Fri, 17 Jul 2020 13:15:27 +0530
Subject: [PATCH 045/191] fix: Update CSS

---
 frappe/public/less/controls.less         |  6 ------
 frappe/public/less/desk.less             | 17 +++++++++++++----
 frappe/public/less/frappe-datatable.less |  4 ----
 frappe/public/less/list.less             |  2 +-
 frappe/public/less/role_editor.less      |  4 ----
 5 files changed, 14 insertions(+), 19 deletions(-)

diff --git a/frappe/public/less/controls.less b/frappe/public/less/controls.less
index cee13a4737..f842401515 100644
--- a/frappe/public/less/controls.less
+++ b/frappe/public/less/controls.less
@@ -30,12 +30,6 @@
 	}
 }
 
-.frappe-control {
-	.checkbox input[type=checkbox]:before{
-		margin-top: -10px;
-	}
-}
-
 .frappe-control .control-value {
 	overflow-wrap: break-word;
 }
diff --git a/frappe/public/less/desk.less b/frappe/public/less/desk.less
index 7fe6b4e3a2..d0117c88ad 100644
--- a/frappe/public/less/desk.less
+++ b/frappe/public/less/desk.less
@@ -787,9 +787,10 @@ li.user-progress {
 	margin-right: 5px;
 	margin-left: 0px;
 	position: relative;
-	height: 12px;
 }
 
+@checkbox-height: 14px;
+
 // custom font awesome checkbox
 input[type="checkbox"] {
 	position: relative;
@@ -804,9 +805,10 @@ input[type="checkbox"] {
 		font-weight: normal;
 		font-variant: normal;
 		text-transform: none;
-		line-height: 14px;
+		line-height: @checkbox-height;
+		margin-top: -10px;
 		display: inline-block;
-		font-size: 14px;
+		font-size: @checkbox-height;
 		color: @text-extra-muted;
 		.transition(150ms color);
 		left: 0px;
@@ -818,10 +820,17 @@ input[type="checkbox"] {
 
 	&:checked:before {
 		content: '\f14a';
-		font-size: 13px;
+		font-size: @checkbox-height - 1px;
 		color: @checkbox-color;
 	}
 
+	&:checked:focus:before {
+		box-shadow: inset 0 0 1px 2px @text-muted;
+		padding: 0px 1px;
+		border-radius: 3px;
+		height: @checkbox-height - 1px;
+	}
+
 	&:focus {
 		outline: none;
 	}
diff --git a/frappe/public/less/frappe-datatable.less b/frappe/public/less/frappe-datatable.less
index 56725636ae..54eecf2b3d 100644
--- a/frappe/public/less/frappe-datatable.less
+++ b/frappe/public/less/frappe-datatable.less
@@ -33,10 +33,6 @@
 	}
 }
 
-.dt-cell input[type=checkbox]:before {
-	margin-top: -10px;
-}
-
 .dt-scrollable {
 	max-height: calc(100vh - 250px);
 	min-height: 100px;
diff --git a/frappe/public/less/list.less b/frappe/public/less/list.less
index 4e066f86e4..7fc64d2d9b 100644
--- a/frappe/public/less/list.less
+++ b/frappe/public/less/list.less
@@ -197,7 +197,7 @@ body.no-list-sidebar {
 }
 
 input.list-check-all, input.list-row-checkbox {
-	margin-top: 0px;
+	display: 'inline';
 }
 
 .filterable {
diff --git a/frappe/public/less/role_editor.less b/frappe/public/less/role_editor.less
index 91eefcf7d0..c95f1ebc55 100644
--- a/frappe/public/less/role_editor.less
+++ b/frappe/public/less/role_editor.less
@@ -9,10 +9,6 @@
 	padding-top: 2px;
 }
 
-.user-role input[type=checkbox]:before {
-	margin-top: -10px;
-}
-
 table.user-perm {
 	border-collapse: collapse;
     width: 100%;

From 53312282e2701e826dc6be0bd303432c3004af41 Mon Sep 17 00:00:00 2001
From: Deepesh Garg <deepeshgarg6@gmail.com>
Date: Fri, 17 Jul 2020 13:29:54 +0530
Subject: [PATCH 046/191] fix: Update CSS

---
 frappe/public/less/list.less | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frappe/public/less/list.less b/frappe/public/less/list.less
index 7fc64d2d9b..4c7d04406d 100644
--- a/frappe/public/less/list.less
+++ b/frappe/public/less/list.less
@@ -197,7 +197,7 @@ body.no-list-sidebar {
 }
 
 input.list-check-all, input.list-row-checkbox {
-	display: 'inline';
+	display: inline-block;
 }
 
 .filterable {

From ff39b6ae5f6024bb5ab3118d7b4171a0cb539678 Mon Sep 17 00:00:00 2001
From: "Chinmay D. Pai" <chinmaydpai@gmail.com>
Date: Fri, 17 Jul 2020 16:24:31 +0530
Subject: [PATCH 047/191] fix: email encoding issue inside email queue
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

email addresses get formatted incorrectly inside the email queue,
causing emails to be sent with encoded-words addresses instead of
proper, human readable email addresses. this particularly happens when
the address has special and accented characters. an example of
encoded-words address looks like:

=?utf-8?q?=C3=A1dministr=C3=A1tor?= <admin@example.com>

instead of something like:

ádministrátor <admin@example.com>

another issue that causes this is validations that strip html tags from
field when ignore_xss_filter is not set in a docfield. setting
ignore_xss_filter for the email field inside email queue fixes
this issue.

Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
---
 frappe/core/doctype/communication/email.py    |   2 +-
 .../doctype/email_queue/email_queue.json      | 564 ++----------------
 frappe/utils/__init__.py                      |   5 +-
 3 files changed, 49 insertions(+), 522 deletions(-)

diff --git a/frappe/core/doctype/communication/email.py b/frappe/core/doctype/communication/email.py
index e9db865ade..4c531fbac6 100755
--- a/frappe/core/doctype/communication/email.py
+++ b/frappe/core/doctype/communication/email.py
@@ -236,7 +236,7 @@ def prepare_to_notify(doc, print_html=None, print_format=None, attachments=None)
 
 	if doc.sender:
 		# combine for sending to get the format 'Jane <jane@example.com>'
-		doc.sender = formataddr([doc.sender_full_name, doc.sender])
+		doc.sender = get_formatted_email(doc.sender_full_name, mail=doc.sender)
 
 	doc.attachments = []
 
diff --git a/frappe/email/doctype/email_queue/email_queue.json b/frappe/email/doctype/email_queue/email_queue.json
index ee8683af22..4529ea8211 100644
--- a/frappe/email/doctype/email_queue/email_queue.json
+++ b/frappe/email/doctype/email_queue/email_queue.json
@@ -1,640 +1,166 @@
 {
- "allow_copy": 0,
- "allow_events_in_timeline": 0,
- "allow_guest_to_view": 0,
- "allow_import": 0,
- "allow_rename": 0,
+ "actions": [],
  "autoname": "hash",
- "beta": 0,
  "creation": "2012-08-02 15:17:28",
- "custom": 0,
  "description": "Email Queue records.",
- "docstatus": 0,
  "doctype": "DocType",
  "document_type": "System",
- "editable_grid": 0,
  "engine": "InnoDB",
+ "field_order": [
+  "sender",
+  "recipients",
+  "show_as_cc",
+  "message",
+  "status",
+  "error",
+  "message_id",
+  "reference_doctype",
+  "reference_name",
+  "communication",
+  "send_after",
+  "priority",
+  "add_unsubscribe_link",
+  "unsubscribe_param",
+  "unsubscribe_method",
+  "expose_recipients",
+  "attachments",
+  "retry"
+ ],
  "fields": [
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
    "fieldname": "sender",
    "fieldtype": "Data",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
+   "ignore_xss_filter": 1,
    "label": "Sender",
-   "length": 0,
-   "no_copy": 0,
-   "options": "Email",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
+   "options": "Email"
   },
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
    "fieldname": "recipients",
    "fieldtype": "Table",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
    "label": "Recipient",
-   "length": 0,
-   "no_copy": 0,
-   "options": "Email Queue Recipient",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
+   "options": "Email Queue Recipient"
   },
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
    "fieldname": "show_as_cc",
    "fieldtype": "Small Text",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Show as cc",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
+   "label": "Show as cc"
   },
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
    "fieldname": "message",
    "fieldtype": "Code",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Message",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
+   "label": "Message"
   },
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
    "default": "Not Sent",
    "fieldname": "status",
    "fieldtype": "Select",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
    "in_list_view": 1,
    "in_standard_filter": 1,
    "label": "Status",
-   "length": 0,
-   "no_copy": 0,
-   "options": "\nNot Sent\nSending\nSent\nError\nExpired",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
+   "options": "\nNot Sent\nSending\nSent\nError\nExpired"
   },
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
    "fieldname": "error",
    "fieldtype": "Code",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Error",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
+   "label": "Error"
   },
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
    "fieldname": "message_id",
    "fieldtype": "Data",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
    "label": "Message ID",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
    "read_only": 1,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 1,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
+   "search_index": 1
   },
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
    "fieldname": "reference_doctype",
    "fieldtype": "Link",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
    "label": "Reference Document Type",
-   "length": 0,
-   "no_copy": 0,
    "options": "DocType",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 1,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
+   "read_only": 1
   },
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
    "fieldname": "reference_name",
    "fieldtype": "Data",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
    "label": "Reference DocName",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 1,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
+   "read_only": 1
   },
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
    "fieldname": "communication",
    "fieldtype": "Link",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
    "label": "Communication",
-   "length": 0,
-   "no_copy": 0,
    "options": "Communication",
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 1,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
+   "search_index": 1
   },
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
    "fieldname": "send_after",
    "fieldtype": "Datetime",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
    "label": "Send After",
-   "length": 0,
    "no_copy": 1,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 1,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
+   "read_only": 1
   },
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
    "default": "1",
    "fieldname": "priority",
    "fieldtype": "Int",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
    "label": "Priority",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 1,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
+   "read_only": 1
   },
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
    "default": "1",
    "fieldname": "add_unsubscribe_link",
    "fieldtype": "Check",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Add Unsubscribe Link",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
+   "label": "Add Unsubscribe Link"
   },
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
    "fieldname": "unsubscribe_param",
    "fieldtype": "Data",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
    "label": "Unsubscribe Param",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 1,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
+   "read_only": 1
   },
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
    "fieldname": "unsubscribe_method",
    "fieldtype": "Data",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Unsubscribe Method",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
+   "label": "Unsubscribe Method"
   },
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
    "fieldname": "expose_recipients",
    "fieldtype": "Data",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Expose Recipients",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
+   "label": "Expose Recipients"
   },
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
    "fieldname": "attachments",
    "fieldtype": "Code",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
    "label": "Attachments",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 1,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
+   "read_only": 1
   },
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
    "default": "0",
    "fieldname": "retry",
    "fieldtype": "Int",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
    "label": "Retry",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 1,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "unique": 0
+   "read_only": 1
   }
  ],
- "has_web_view": 0,
- "hide_heading": 0,
- "hide_toolbar": 0,
  "icon": "fa fa-envelope",
  "idx": 1,
- "image_view": 0,
  "in_create": 1,
- "is_submittable": 0,
- "issingle": 0,
- "istable": 0,
- "max_attachments": 0,
- "modified": "2019-09-05 14:22:27.664645",
+ "links": [],
+ "modified": "2020-07-17 15:58:15.369419",
  "modified_by": "Administrator",
  "module": "Email",
  "name": "Email Queue",
  "owner": "Administrator",
  "permissions": [
   {
-   "amend": 0,
-   "cancel": 0,
-   "create": 0,
    "delete": 1,
    "email": 1,
-   "export": 0,
-   "if_owner": 0,
-   "import": 0,
-   "permlevel": 0,
    "print": 1,
    "read": 1,
    "report": 1,
-   "role": "System Manager",
-   "set_user_permissions": 0,
-   "share": 0,
-   "submit": 0,
-   "write": 0
+   "role": "System Manager"
   }
  ],
- "quick_entry": 0,
- "read_only": 0,
- "read_only_onload": 0,
- "show_name_in_global_search": 0,
+ "sort_field": "modified",
  "sort_order": "DESC",
- "track_changes": 1,
- "track_seen": 0,
- "track_views": 0
+ "track_changes": 1
 }
\ No newline at end of file
diff --git a/frappe/utils/__init__.py b/frappe/utils/__init__.py
index f996b5109e..1da220dc30 100644
--- a/frappe/utils/__init__.py
+++ b/frappe/utils/__init__.py
@@ -63,10 +63,11 @@ def get_email_address(user=None):
 
 	return frappe.db.get_value("User", user, "email")
 
-def get_formatted_email(user):
+def get_formatted_email(user, mail=None):
 	"""get Email Address of user formatted as: `John Doe <johndoe@example.com>`"""
 	fullname = get_fullname(user)
-	mail = get_email_address(user)
+	if not mail:
+		mail = get_email_address(user)
 	return cstr(make_header(decode_header(formataddr((fullname, mail)))))
 
 def extract_email_id(email):

From c87d598480e006a88a4374d0ab17d15429701441 Mon Sep 17 00:00:00 2001
From: Gavin D'souza <gavin18d@gmail.com>
Date: Fri, 17 Jul 2020 17:35:08 +0530
Subject: [PATCH 048/191] refactor: less word do trick

Co-authored-by: Chinmay Pai <chinmaydpai@gmail.com>
---
 frappe/utils/logger.py | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/frappe/utils/logger.py b/frappe/utils/logger.py
index afe4335aea..9254c0aedd 100755
--- a/frappe/utils/logger.py
+++ b/frappe/utils/logger.py
@@ -31,10 +31,7 @@ def get_logger(module, with_more_info=False, _site=None):
 	global site
 
 	def allow_site():
-		allow = False
-		if site: allow = True
-		if _site: allow = site == _site
-		return allow
+		return (_site and _site == site) or bool(site)
 
 	if module in frappe.loggers:
 		return frappe.loggers[module]

From 39ec64f1e3ba69f2b83c09afbceee31760950b93 Mon Sep 17 00:00:00 2001
From: "Chinmay D. Pai" <chinmaydpai@gmail.com>
Date: Fri, 17 Jul 2020 18:36:53 +0530
Subject: [PATCH 049/191] fix: add default email policy to mail body

the default policy encodes special characters correctly, and is not set
by _default_ unless python3.8 is used. so we'll explicitly define the
policy to be used for the email body

Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
---
 frappe/email/email_body.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/frappe/email/email_body.py b/frappe/email/email_body.py
index 8340d81917..d21d9290fb 100755
--- a/frappe/email/email_body.py
+++ b/frappe/email/email_body.py
@@ -11,6 +11,7 @@ import email.utils
 from six import iteritems, text_type, string_types
 from email.mime.multipart import MIMEMultipart
 from email.header import Header
+from email import policy
 
 
 def get_email(recipients, sender='', msg='', subject='[No Subject]',
@@ -68,7 +69,7 @@ class EMail:
 		self.subject = subject
 		self.expose_recipients = expose_recipients
 
-		self.msg_root = MIMEMultipart('mixed')
+		self.msg_root = MIMEMultipart('mixed', policy=policy.default)
 		self.msg_alternative = MIMEMultipart('alternative')
 		self.msg_root.attach(self.msg_alternative)
 		self.cc = cc or []
@@ -238,7 +239,7 @@ class EMail:
 		"""validate, build message and convert to string"""
 		self.validate()
 		self.make()
-		return self.msg_root.as_string()
+		return self.msg_root.as_string(policy=policy.default)
 
 def get_formatted_html(subject, message, footer=None, print_html=None,
 		email_account=None, header=None, unsubscribe_link=None, sender=None):

From 3678435d4ab3e0c706bbc5c9a7b6bb3e7f46d789 Mon Sep 17 00:00:00 2001
From: "Chinmay D. Pai" <chinmaydpai@gmail.com>
Date: Fri, 17 Jul 2020 18:38:57 +0530
Subject: [PATCH 050/191] fix: remove redundant condition for field
 sanitization

Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
---
 frappe/model/base_document.py | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/frappe/model/base_document.py b/frappe/model/base_document.py
index c7ef7890b4..d89800b296 100644
--- a/frappe/model/base_document.py
+++ b/frappe/model/base_document.py
@@ -702,10 +702,7 @@ class BaseDocument(object):
 			df = self.meta.get_field(fieldname)
 			sanitized_value = value
 
-			if df and df.get("fieldtype") in ("Data", "Code", "Small Text", "Text") and df.get("options")=="Email":
-				sanitized_value = sanitize_email(value)
-
-			elif df and (df.get("ignore_xss_filter")
+			if df and (df.get("ignore_xss_filter")
 						or (df.get("fieldtype")=="Code" and df.get("options")!="Email")
 						or df.get("fieldtype") in ("Attach", "Attach Image", "Barcode")
 

From cac8a8c4a0ab67b83f665905fab6a10c316bc70f Mon Sep 17 00:00:00 2001
From: prssanna <prssud@gmail.com>
Date: Sat, 18 Jul 2020 14:16:16 +0530
Subject: [PATCH 051/191] fix: set policy to SMTPUTF8

---
 frappe/email/email_body.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frappe/email/email_body.py b/frappe/email/email_body.py
index d21d9290fb..a004bbac5f 100755
--- a/frappe/email/email_body.py
+++ b/frappe/email/email_body.py
@@ -239,7 +239,7 @@ class EMail:
 		"""validate, build message and convert to string"""
 		self.validate()
 		self.make()
-		return self.msg_root.as_string(policy=policy.default)
+		return self.msg_root.as_string(policy=policy.SMTPUTF8)
 
 def get_formatted_html(subject, message, footer=None, print_html=None,
 		email_account=None, header=None, unsubscribe_link=None, sender=None):

From 742d79cd5fd0d4d44ecff987a29b1d70ab124798 Mon Sep 17 00:00:00 2001
From: prssanna <prssud@gmail.com>
Date: Sat, 18 Jul 2020 14:16:32 +0530
Subject: [PATCH 052/191] style: fix indent

---
 frappe/model/base_document.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/frappe/model/base_document.py b/frappe/model/base_document.py
index d89800b296..7d56736cdc 100644
--- a/frappe/model/base_document.py
+++ b/frappe/model/base_document.py
@@ -703,12 +703,12 @@ class BaseDocument(object):
 			sanitized_value = value
 
 			if df and (df.get("ignore_xss_filter")
-						or (df.get("fieldtype")=="Code" and df.get("options")!="Email")
-						or df.get("fieldtype") in ("Attach", "Attach Image", "Barcode")
+				or (df.get("fieldtype")=="Code" and df.get("options")!="Email")
+				or df.get("fieldtype") in ("Attach", "Attach Image", "Barcode")
 
-						# cancelled and submit but not update after submit should be ignored
-						or self.docstatus==2
-						or (self.docstatus==1 and not df.get("allow_on_submit"))):
+				# cancelled and submit but not update after submit should be ignored
+				or self.docstatus==2
+				or (self.docstatus==1 and not df.get("allow_on_submit"))):
 				continue
 
 			else:

From 6f83cece05fd98cf9ddf8de2a8c9f17b8cf91f31 Mon Sep 17 00:00:00 2001
From: prssanna <prssud@gmail.com>
Date: Sat, 18 Jul 2020 17:09:23 +0530
Subject: [PATCH 053/191] fix: remove allow_worflow from number_card.json

---
 frappe/desk/doctype/number_card/number_card.json | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/frappe/desk/doctype/number_card/number_card.json b/frappe/desk/doctype/number_card/number_card.json
index e94a06dab8..333885a7f9 100644
--- a/frappe/desk/doctype/number_card/number_card.json
+++ b/frappe/desk/doctype/number_card/number_card.json
@@ -1,7 +1,6 @@
 {
  "actions": [],
  "allow_rename": 1,
- "allow_workflow": 1,
  "creation": "2020-04-15 18:06:39.444683",
  "doctype": "DocType",
  "editable_grid": 1,
@@ -191,7 +190,7 @@
   }
  ],
  "links": [],
- "modified": "2020-07-17 18:04:00.814756",
+ "modified": "2020-07-18 17:08:22.882538",
  "modified_by": "Administrator",
  "module": "Desk",
  "name": "Number Card",

From c45864eac0a4049b58ed826a86b6c5651990c61f Mon Sep 17 00:00:00 2001
From: "Chinmay D. Pai" <chinmaydpai@gmail.com>
Date: Sat, 18 Jul 2020 18:27:44 +0530
Subject: [PATCH 054/191] fix: specify SMTPUTF8 policy everywhere

Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
---
 frappe/email/email_body.py | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/frappe/email/email_body.py b/frappe/email/email_body.py
index a004bbac5f..a404f7fdfa 100755
--- a/frappe/email/email_body.py
+++ b/frappe/email/email_body.py
@@ -69,8 +69,8 @@ class EMail:
 		self.subject = subject
 		self.expose_recipients = expose_recipients
 
-		self.msg_root = MIMEMultipart('mixed', policy=policy.default)
-		self.msg_alternative = MIMEMultipart('alternative')
+		self.msg_root = MIMEMultipart('mixed', policy=policy.SMTPUTF8)
+		self.msg_alternative = MIMEMultipart('alternative', policy=policy.SMTPUTF8)
 		self.msg_root.attach(self.msg_alternative)
 		self.cc = cc or []
 		self.bcc = bcc or []
@@ -101,7 +101,7 @@ class EMail:
 			Attach message in the text portion of multipart/alternative
 		"""
 		from email.mime.text import MIMEText
-		part = MIMEText(message, 'plain', 'utf-8')
+		part = MIMEText(message, 'plain', 'utf-8', policy=policy.SMTPUTF8)
 		self.msg_alternative.attach(part)
 
 	def set_part_html(self, message, inline_images):
@@ -114,9 +114,9 @@ class EMail:
 			message, _inline_images = replace_filename_with_cid(message)
 
 			# prepare parts
-			msg_related = MIMEMultipart('related')
+			msg_related = MIMEMultipart('related', policy=policy.SMTPUTF8)
 
-			html_part = MIMEText(message, 'html', 'utf-8')
+			html_part = MIMEText(message, 'html', 'utf-8', policy=policy.SMTPUTF8)
 			msg_related.attach(html_part)
 
 			for image in _inline_images:
@@ -125,7 +125,7 @@ class EMail:
 
 			self.msg_alternative.attach(msg_related)
 		else:
-			self.msg_alternative.attach(MIMEText(message, 'html', 'utf-8'))
+			self.msg_alternative.attach(MIMEText(message, 'html', 'utf-8', policy=policy.SMTPUTF8))
 
 	def set_html_as_text(self, html):
 		"""Set plain text from HTML"""
@@ -136,7 +136,7 @@ class EMail:
 		from email.mime.text import MIMEText
 
 		maintype, subtype = mime_type.split('/')
-		part = MIMEText(message, _subtype = subtype)
+		part = MIMEText(message, _subtype = subtype, policy=policy.SMTPUTF8)
 
 		if as_attachment:
 			part.add_header('Content-Disposition', 'attachment', filename=filename)

From b32238a2951b19e60f2e77dd38be6e59c68283f6 Mon Sep 17 00:00:00 2001
From: Deepesh Garg <deepeshgarg6@gmail.com>
Date: Sat, 18 Jul 2020 18:40:36 +0530
Subject: [PATCH 055/191] fix: CSS for mozila browser

---
 frappe/public/less/desk.less | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/frappe/public/less/desk.less b/frappe/public/less/desk.less
index d0117c88ad..26f80c1262 100644
--- a/frappe/public/less/desk.less
+++ b/frappe/public/less/desk.less
@@ -807,7 +807,7 @@ input[type="checkbox"] {
 		text-transform: none;
 		line-height: @checkbox-height;
 		margin-top: -10px;
-		display: inline-block;
+		display: inline-block !important;
 		font-size: @checkbox-height;
 		color: @text-extra-muted;
 		.transition(150ms color);
@@ -851,6 +851,7 @@ input[type="checkbox"] {
 	input[type="checkbox"] {
 		visibility: visible;
 		left: 0;
+		height: 12px !important
 	}
 }
 
@@ -858,6 +859,7 @@ input[type="checkbox"] {
 	input[type="checkbox"] {
 		visibility: visible;
 		left: 0;
+		height: 12px !important
 	}
 }
 
@@ -867,6 +869,7 @@ input[type="checkbox"] {
 	input[type="checkbox"] {
 		 visibility: visible;
 		 left: 0;
+		 height: 12px !important
 	}
 }
 

From 8a6cb7db3d99dc55c149bf49446b612771b46f64 Mon Sep 17 00:00:00 2001
From: "Chinmay D. Pai" <chinmaydpai@gmail.com>
Date: Sat, 18 Jul 2020 18:52:55 +0530
Subject: [PATCH 056/191] chore: replace rfc-compatible newlines with \n

Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
---
 frappe/email/test_email_body.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frappe/email/test_email_body.py b/frappe/email/test_email_body.py
index 43c4bb8333..7d24ea9025 100644
--- a/frappe/email/test_email_body.py
+++ b/frappe/email/test_email_body.py
@@ -39,7 +39,7 @@ This is the text version of this email
 			subject='Test Subject',
 			content=email_html,
 			text_content=email_text
-		).as_string()
+		).as_string().replace("\r\n", "\n")
 
 	def test_prepare_message_returns_already_encoded_string(self):
 

From 42591f2828013e00e03796e2e08cc0bd98072ff1 Mon Sep 17 00:00:00 2001
From: "Chinmay D. Pai" <chinmaydpai@gmail.com>
Date: Sat, 18 Jul 2020 19:08:29 +0530
Subject: [PATCH 057/191] chore: replace rfc-compatible newline with \n

Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
---
 frappe/email/test_email_body.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frappe/email/test_email_body.py b/frappe/email/test_email_body.py
index 7d24ea9025..705a853bc6 100644
--- a/frappe/email/test_email_body.py
+++ b/frappe/email/test_email_body.py
@@ -153,7 +153,7 @@ w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 			subject='Test Subject',
 			content=email_html,
 			header=['Email Title', 'green']
-		).as_string()
+		).as_string().replace("\r\n", "\n")
 
 		self.assertTrue('''<span class=3D"indicator indicator-green" style=3D"background-color:#98=
 d85b; border-radius:8px; display:inline-block; height:8px; margin-right:5px=

From a4239c4f1f3a8318dfcc3f545de968e90805d1d0 Mon Sep 17 00:00:00 2001
From: prssanna <prssud@gmail.com>
Date: Sat, 18 Jul 2020 19:40:10 +0530
Subject: [PATCH 058/191] fix: don't set header if empty

---
 frappe/email/email_body.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/frappe/email/email_body.py b/frappe/email/email_body.py
index a404f7fdfa..d545190c47 100755
--- a/frappe/email/email_body.py
+++ b/frappe/email/email_body.py
@@ -223,7 +223,8 @@ class EMail:
 
 		# reset headers as values may be changed.
 		for key, val in iteritems(headers):
-			self.set_header(key, val)
+			if val:
+				self.set_header(key, val)
 
 		# call hook to enable apps to modify msg_root before sending
 		for hook in frappe.get_hooks("make_email_body_message"):

From 3787c4eb28a2125cb5109c2dcdbe86d0505def03 Mon Sep 17 00:00:00 2001
From: Suraj Shetty <surajshetty3416@gmail.com>
Date: Sun, 19 Jul 2020 18:18:29 +0530
Subject: [PATCH 059/191] refactor: Remove un-wanted code

---
 frappe/public/less/desk.less | 26 +++-----------------------
 1 file changed, 3 insertions(+), 23 deletions(-)

diff --git a/frappe/public/less/desk.less b/frappe/public/less/desk.less
index 26f80c1262..36ceed9bfa 100644
--- a/frappe/public/less/desk.less
+++ b/frappe/public/less/desk.less
@@ -845,31 +845,11 @@ input[type="checkbox"] {
 	height: 100%;
 }
 
-// mozilla doesn't support
+// Firefox doesn't support
 // pseudo elements on checkbox
-@-moz-document url-prefix() {
+@supports (-moz-appearance: none) or (-ms-ime-align:auto) {
 	input[type="checkbox"] {
-		visibility: visible;
-		left: 0;
-		height: 12px !important
-	}
-}
-
-@supports (-moz-appearance: none) {
-	input[type="checkbox"] {
-		visibility: visible;
-		left: 0;
-		height: 12px !important
-	}
-}
-
-// edge doesn't support pseudo elements on checkbox
-//Microsoft Edge Browser 12+ (All)
-@supports (-ms-ime-align:auto) {
-	input[type="checkbox"] {
-		 visibility: visible;
-		 left: 0;
-		 height: 12px !important
+		height: @checkbox-height !important
 	}
 }
 

From 0eae7dc1d875351117a3e4d61b33b7f4ed339a54 Mon Sep 17 00:00:00 2001
From: Abhishek Balam <abhishekbalam96@gmail.com>
Date: Mon, 20 Jul 2020 08:32:05 +0530
Subject: [PATCH 060/191] fix(Controls): 'Yes/No' instead of '1/0' in Filter
 Descriptions for 'Check' values (#11040)

* fix: show 'Yes/No' instead of '1/0' in Filter Descriptions for 'Check' fieldtype

* fix: spacing

* fix: add gettext and cleanup
---
 frappe/public/js/frappe/form/controls/link.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/frappe/public/js/frappe/form/controls/link.js b/frappe/public/js/frappe/form/controls/link.js
index 603506a056..56f9430238 100644
--- a/frappe/public/js/frappe/form/controls/link.js
+++ b/frappe/public/js/frappe/form/controls/link.js
@@ -332,6 +332,10 @@ frappe.ui.form.ControlLink = frappe.ui.form.ControlData.extend({
 			let docfield = frappe.meta.get_docfield(doctype, fieldname);
 			let label = docfield ? docfield.label : frappe.model.unscrub(fieldname);
 
+			if (docfield && docfield.fieldtype === 'Check') {
+				filter[3] = filter[3] ? __('Yes'): __('No');
+			}
+
 			if (filter[3] && Array.isArray(filter[3]) && filter[3].length > 5) {
 				filter[3] = filter[3].slice(0, 5);
 				filter[3].push('...');

From 42daf5a905e763fb4f9c9c9209760a737ab1ed71 Mon Sep 17 00:00:00 2001
From: "Chinmay D. Pai" <chinmaydpai@gmail.com>
Date: Mon, 20 Jul 2020 19:05:43 +0530
Subject: [PATCH 061/191] chore: escape value and remove unused condition

Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
---
 frappe/contacts/doctype/address/address.py | 3 +--
 frappe/contacts/doctype/contact/contact.py | 7 -------
 2 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/frappe/contacts/doctype/address/address.py b/frappe/contacts/doctype/address/address.py
index 4de92cfa57..57dea8284c 100644
--- a/frappe/contacts/doctype/address/address.py
+++ b/frappe/contacts/doctype/address/address.py
@@ -243,8 +243,7 @@ def address_query(doctype, txt, searchfield, start, page_len, filters):
 		if meta.get_field(fieldname) or fieldname in frappe.db.DEFAULT_COLUMNS:
 			condition += " and {field}={value}".format(
 				field=fieldname,
-				value=value
-			)
+				value=frappe.db.escape(value))
 
 	searchfields = meta.get_search_fields()
 
diff --git a/frappe/contacts/doctype/contact/contact.py b/frappe/contacts/doctype/contact/contact.py
index 5be2cd086c..8240940d2f 100644
--- a/frappe/contacts/doctype/contact/contact.py
+++ b/frappe/contacts/doctype/contact/contact.py
@@ -193,13 +193,6 @@ def contact_query(doctype, txt, searchfield, start, page_len, filters):
 	link_doctype = filters.pop('link_doctype')
 	link_name = filters.pop('link_name')
 
-	condition = ""
-	for fieldname, value in iteritems(filters):
-		condition += " and {field}={value}".format(
-			field=fieldname,
-			value=value
-		)
-
 	return frappe.db.sql("""select
 			`tabContact`.name, `tabContact`.first_name, `tabContact`.last_name
 		from

From fc3816d2de4463b72c3612dc2f2d949b84449f22 Mon Sep 17 00:00:00 2001
From: Prssanna Desai <prssud@gmail.com>
Date: Mon, 20 Jul 2020 19:42:21 +0530
Subject: [PATCH 062/191] fix: update all required perms form doc perms

Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
---
 frappe/public/js/frappe/form/form.js | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/frappe/public/js/frappe/form/form.js b/frappe/public/js/frappe/form/form.js
index 843e5382dc..c0b76ee94d 100644
--- a/frappe/public/js/frappe/form/form.js
+++ b/frappe/public/js/frappe/form/form.js
@@ -1400,10 +1400,13 @@ frappe.ui.form.Form = class FrappeForm {
 		var docperms = frappe.perm.get_perm(this.doc.doctype);
 		for (var i=0, l=docperms.length; i<l; i++) {
 			var p = docperms[i];
-			perm[p.permlevel || 0] = {read:1, print:1, cancel:1, email:1};
-			if (p.share) {
-				perm[p.permlevel || 0].share = 1;
-			}
+			perm[p.permlevel || 0] = {
+				read: p.read,
+				cancel: p.cancel,
+				share: p.share,
+				print: p.print,
+				email: p.email
+			};
 		}
 		this.perm = perm;
 	}

From a3cc30437facf7087e5bfa654a0110d6c2110791 Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Mon, 20 Jul 2020 21:03:38 +0530
Subject: [PATCH 063/191] feat: compress build from theme generator

---
 generate_bootstrap_theme.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/generate_bootstrap_theme.js b/generate_bootstrap_theme.js
index bb2a121052..83955856f5 100644
--- a/generate_bootstrap_theme.js
+++ b/generate_bootstrap_theme.js
@@ -10,7 +10,7 @@ scss_content = scss_content.replace(/\\n/g, '\n');
 
 sass.render({
 	data: scss_content,
-	outputStyle: 'compact',
+	outputStyle: 'compressed',
 	importer: function(url) {
 		if (url.startsWith('~')) {
 			// strip ~ so that it can resolve from node_modules

From 0ae7d40ebe9268e9f08928f475bda7a920aa52db Mon Sep 17 00:00:00 2001
From: Mangesh-Khairnar <mkhairnar10@gmail.com>
Date: Mon, 20 Jul 2020 23:08:50 +0530
Subject: [PATCH 064/191] fix(paytm-integration): use checksum library to
 generate/verify checksum

---
 .../doctype/paytm_settings/checksum.py        | 80 -------------------
 .../doctype/paytm_settings/paytm_settings.py  |  2 +-
 requirements.txt                              |  2 +-
 3 files changed, 2 insertions(+), 82 deletions(-)
 delete mode 100644 frappe/integrations/doctype/paytm_settings/checksum.py

diff --git a/frappe/integrations/doctype/paytm_settings/checksum.py b/frappe/integrations/doctype/paytm_settings/checksum.py
deleted file mode 100644
index 32f976ae18..0000000000
--- a/frappe/integrations/doctype/paytm_settings/checksum.py
+++ /dev/null
@@ -1,80 +0,0 @@
-import base64
-import string
-import random
-import hashlib
-import sys
-
-from Crypto.Cipher import AES
-
-
-iv = '@@@@&&&&####$$$$'
-BLOCK_SIZE = 16
-
-if (sys.version_info > (3, 0)):
-	__pad__ = lambda s: bytes(s + (BLOCK_SIZE - len(s) % BLOCK_SIZE) * chr(BLOCK_SIZE - len(s) % BLOCK_SIZE), 'utf-8')
-else:
-	__pad__ = lambda s: s + (BLOCK_SIZE - len(s) % BLOCK_SIZE) * chr(BLOCK_SIZE - len(s) % BLOCK_SIZE)
-
-__unpad__ = lambda s: s[0:-ord(s[-1])]
-
-def encrypt(input, key):
-	input = __pad__(input)
-	c = AES.new(key.encode("utf8"), AES.MODE_CBC, iv.encode("utf8"))
-	input = c.encrypt(input)
-	input = base64.b64encode(input)
-	return input.decode("UTF-8")
-
-def decrypt(encrypted, key):
-	encrypted = base64.b64decode(encrypted)
-	c = AES.new(key.encode("utf8"), AES.MODE_CBC, iv.encode("utf8"))
-	param = c.decrypt(encrypted)
-	if type(param) == bytes:
-		param = param.decode()
-	return __unpad__(param)
-
-def generateSignature(params, key):
-	if not type(params) is dict and not type(params) is str:
-		raise Exception("string or dict expected, " + str(type(params)) + " given")
-	if type(params) is dict:
-		params = getStringByParams(params)
-	return generateSignatureByString(params, key)
-
-def verifySignature(params, key, checksum):
-	if not type(params) is dict and not type(params) is str:
-		raise Exception("string or dict expected, " + str(type(params)) + " given")
-	if "CHECKSUMHASH" in params:
-		del params["CHECKSUMHASH"]
-		
-	if type(params) is dict:
-		params = getStringByParams(params)
-	return verifySignatureByString(params, key, checksum)
-
-def generateSignatureByString(params, key):
-	salt = generateRandomString(4)
-	return calculateChecksum(params, key, salt)
-
-def verifySignatureByString(params, key, checksum):
-	paytm_hash = decrypt(checksum, key)    
-	salt = paytm_hash[-4:]
-	return paytm_hash == calculateHash(params, salt)
-
-def generateRandomString(length):
-	chars = string.ascii_uppercase + string.digits + string.ascii_lowercase
-	return ''.join(random.choice(chars) for _ in range(length))
-
-def getStringByParams(params):
-	params_string = []
-	for key in sorted(params.keys()):
-		value = params[key] if params[key] is not None and params[key].lower() != "null" else ""
-		params_string.append(str(value))
-	return '|'.join(params_string)
-
-def calculateHash(params, salt):
-	finalString = '%s|%s' % (params, salt)
-	hasher = hashlib.sha256(finalString.encode())
-	hashString = hasher.hexdigest() + salt
-	return hashString
-
-def calculateChecksum(params, key, salt): 
-	hashString = calculateHash(params, salt)
-	return encrypt(hashString, key)
\ No newline at end of file
diff --git a/frappe/integrations/doctype/paytm_settings/paytm_settings.py b/frappe/integrations/doctype/paytm_settings/paytm_settings.py
index c169a53246..bfa9b6b3eb 100644
--- a/frappe/integrations/doctype/paytm_settings/paytm_settings.py
+++ b/frappe/integrations/doctype/paytm_settings/paytm_settings.py
@@ -13,7 +13,7 @@ from frappe import _
 from frappe.utils import get_url, call_hook_method, cint, flt, cstr
 from frappe.integrations.utils import create_request_log, create_payment_gateway
 from frappe.utils import get_request_site_address
-from frappe.integrations.doctype.paytm_settings.checksum import generateSignature, verifySignature
+from paytmchecksum import generateSignature, verifySignature
 from frappe.utils.password import get_decrypted_password
 
 class PaytmSettings(Document):
diff --git a/requirements.txt b/requirements.txt
index e6f6f9fff9..d053f8f48c 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -66,5 +66,5 @@ watchdog==0.8.0
 Werkzeug==0.16.1
 xlrd==1.2.0
 zxcvbn-python==4.4.24
-pycryptodome==3.9.7
 Whoosh==2.7.4
+paytmchecksum==1.7.0
\ No newline at end of file

From 158da07c6ab6b125086d60f83082d8d208272d8f Mon Sep 17 00:00:00 2001
From: Mangesh-Khairnar <mkhairnar10@gmail.com>
Date: Tue, 21 Jul 2020 00:12:06 +0530
Subject: [PATCH 065/191] fix: make the checkout page responsive for mobile
 view

---
 .../pages/integrations/paytm_checkout.html       | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/frappe/templates/pages/integrations/paytm_checkout.html b/frappe/templates/pages/integrations/paytm_checkout.html
index 77a2045edf..168f6597e5 100644
--- a/frappe/templates/pages/integrations/paytm_checkout.html
+++ b/frappe/templates/pages/integrations/paytm_checkout.html
@@ -16,8 +16,9 @@
 
 {%- block page_content -%}
 <body>
-	<div style="margin: 30vh;">
-		<center><h2>Please do not refresh this page...</h2></center>
+	<div class="centered">
+		<h2>Please do not refresh this page...</h2>
+
 		<form method="post" action="{{ url }}" name="paytm_form">
 			{% for name, value in payment_details.items() %}
 				<input type="hidden" name="{{ name }}" value="{{ value }}">
@@ -29,9 +30,14 @@
 
 {% block style %}
 <style>
-	/* header,
-	footer {
+	.centered {
+		position: absolute;
+		top: 50%;
+		left: 50%;
+		transform: translate(-50%, -50%);
+	}
+	.web-footer {
 		display: none;
-	} */
+	}
 </style>
 {% endblock %}
\ No newline at end of file

From 2083224609f62b71b6e486dbe476be3e7783fb3c Mon Sep 17 00:00:00 2001
From: Abhishek Balam <abhishekbalam96@gmail.com>
Date: Tue, 21 Jul 2020 12:36:23 +0530
Subject: [PATCH 066/191] fix: add a confirmation dialog on enabling auto reply

Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
---
 .../doctype/email_account/email_account.js     | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/frappe/email/doctype/email_account/email_account.js b/frappe/email/doctype/email_account/email_account.js
index 71f9cccb0d..83896e0af7 100644
--- a/frappe/email/doctype/email_account/email_account.js
+++ b/frappe/email/doctype/email_account/email_account.js
@@ -95,6 +95,11 @@ frappe.ui.form.on("Email Account", {
 	enable_incoming: function(frm) {
 		frm.doc.no_remaining = null; //perform full sync
 		//frm.set_df_property("append_to", "reqd", frm.doc.enable_incoming);
+		frm.trigger("warn_autoreply_on_incoming");
+	},
+
+	enable_auto_reply: function(frm) {
+		frm.trigger("warn_autoreply_on_incoming");
 	},
 
 	notify_if_unreplied: function(frm) {
@@ -184,7 +189,18 @@ frappe.ui.form.on("Email Account", {
 				read as well as unread message from server. This may also cause the duplication\
 				of Communication (emails).");
 			frappe.confirm(msg, null, function() {
-				frm.set_value("email_sync_option", "ALL");
+				frm.set_value("email_sync_option", "UNSEEN");
+			});
+		}
+	},
+
+	warn_autoreply_on_incoming: function(frm) {
+		if (frm.doc.enable_incoming && frm.doc.enable_auto_reply && frm.doc.__islocal) {
+			var msg = __("Enabling auto reply on an incoming email account will send automated replies \
+				to all the synchronized emails. Do you wish to continue?");
+			frappe.confirm(msg, null, function() {
+				frm.set_value("enable_auto_reply", 0);
+				frappe.show_alert({message: __("Disabled Auto Reply"), indicator: "blue"});
 			});
 		}
 	}

From 146762767d462359350c519062bdf0d5947dbb17 Mon Sep 17 00:00:00 2001
From: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
Date: Tue, 21 Jul 2020 15:49:44 +0530
Subject: [PATCH 067/191] refactor: Rename is_custom to use_report_chart
 (#11051)

* refactor: Rename is_custom to use_report_chart

* fix: Patch to move is_custom data to use_report_chart

* fix: Import rename_field

* fix: Rename is_custom in depends_on

* fix: Reload doc before renaming field
---
 .../dashboard_chart/dashboard_chart.js        | 12 +++---
 .../dashboard_chart/dashboard_chart.json      | 42 ++++++++-----------
 ...eate_custom_dashboards_cards_and_charts.py |  5 +++
 3 files changed, 27 insertions(+), 32 deletions(-)

diff --git a/frappe/desk/doctype/dashboard_chart/dashboard_chart.js b/frappe/desk/doctype/dashboard_chart/dashboard_chart.js
index 738d77ae27..fd7e5764bc 100644
--- a/frappe/desk/doctype/dashboard_chart/dashboard_chart.js
+++ b/frappe/desk/doctype/dashboard_chart/dashboard_chart.js
@@ -187,14 +187,12 @@ frappe.ui.form.on('Dashboard Chart', {
 			}
 		).then(data => {
 			frm.report_data = data;
-			if (!data.chart) {
-				frm.set_value('is_custom', 0);
-				frm.set_df_property('is_custom', 'hidden', 1);
-			} else {
-				frm.set_df_property('is_custom', 'hidden', 0);
-			}
+			let report_has_chart = Boolean(data.chart);
 
-			if (!frm.doc.is_custom) {
+			frm.set_value('use_report_chart', 0);
+			frm.set_df_property('use_report_chart', 'hidden', !report_has_chart);
+
+			if (!frm.doc.use_report_chart) {
 				if (data.result.length) {
 					frm.field_options = frappe.report_utils.get_field_options_from_report(data.columns, data);
 					frm.set_df_property('x_field', 'options', frm.field_options.non_numeric_fields);
diff --git a/frappe/desk/doctype/dashboard_chart/dashboard_chart.json b/frappe/desk/doctype/dashboard_chart/dashboard_chart.json
index d67e725eb9..a049e2058c 100644
--- a/frappe/desk/doctype/dashboard_chart/dashboard_chart.json
+++ b/frappe/desk/doctype/dashboard_chart/dashboard_chart.json
@@ -12,7 +12,7 @@
   "chart_name",
   "chart_type",
   "report_name",
-  "is_custom",
+  "use_report_chart",
   "x_field",
   "y_axis",
   "source",
@@ -194,11 +194,11 @@
    "label": "To Date"
   },
   {
-   "depends_on": "eval:doc.chart_type == 'Report' && doc.report_name && !doc.is_custom",
+   "depends_on": "eval:doc.chart_type == 'Report' && doc.report_name && !doc.use_report_chart",
    "fieldname": "x_field",
    "fieldtype": "Select",
    "label": "X Field",
-   "mandatory_depends_on": "eval: doc.report_name && !doc.is_custom"
+   "mandatory_depends_on": "eval: doc.report_name && !doc.use_report_chart"
   },
   {
    "depends_on": "eval:doc.chart_type === 'Report'",
@@ -209,18 +209,11 @@
    "set_only_once": 1
   },
   {
-   "default": "0",
-   "depends_on": "eval: doc.report_name",
-   "fieldname": "is_custom",
-   "fieldtype": "Check",
-   "label": "Is Custom"
-  },
-  {
-   "depends_on": "eval:doc.chart_type == 'Report' && doc.report_name && !doc.is_custom",
+   "depends_on": "eval:doc.chart_type == 'Report' && doc.report_name && !doc.use_report_chart",
    "fieldname": "y_axis",
    "fieldtype": "Table",
    "label": "Y Axis",
-   "mandatory_depends_on": "eval:doc.report_name && !doc.is_custom",
+   "mandatory_depends_on": "eval:doc.report_name && !doc.use_report_chart",
    "options": "Dashboard Chart Field"
   },
   {
@@ -246,9 +239,7 @@
    "default": "0",
    "fieldname": "is_standard",
    "fieldtype": "Check",
-   "label": "Is Standard",
-   "show_days": 1,
-   "show_seconds": 1
+   "label": "Is Standard"
   },
   {
    "depends_on": "eval: doc.is_standard",
@@ -256,28 +247,29 @@
    "fieldtype": "Link",
    "label": "Module",
    "mandatory_depends_on": "eval: doc.is_standard",
-   "options": "Module Def",
-   "show_days": 1,
-   "show_seconds": 1
+   "options": "Module Def"
   },
   {
    "fieldname": "dynamic_filters_json",
    "fieldtype": "Code",
    "label": "Dynamic Filters JSON",
-   "options": "JSON",
-   "show_days": 1,
-   "show_seconds": 1
+   "options": "JSON"
   },
   {
    "fieldname": "dynamic_filters_section",
    "fieldtype": "Section Break",
-   "label": "Dynamic Filters",
-   "show_days": 1,
-   "show_seconds": 1
+   "label": "Dynamic Filters"
+  },
+  {
+   "default": "0",
+   "depends_on": "eval: doc.report_name",
+   "fieldname": "use_report_chart",
+   "fieldtype": "Check",
+   "label": "Use Report Chart"
   }
  ],
  "links": [],
- "modified": "2020-07-10 16:09:47.102062",
+ "modified": "2020-07-21 15:41:19.990283",
  "modified_by": "Administrator",
  "module": "Desk",
  "name": "Dashboard Chart",
diff --git a/frappe/patches/v13_0/create_custom_dashboards_cards_and_charts.py b/frappe/patches/v13_0/create_custom_dashboards_cards_and_charts.py
index 9a075a22cc..f61941bf01 100644
--- a/frappe/patches/v13_0/create_custom_dashboards_cards_and_charts.py
+++ b/frappe/patches/v13_0/create_custom_dashboards_cards_and_charts.py
@@ -1,6 +1,7 @@
 import frappe
 from frappe.model.naming import append_number_if_name_exists
 from frappe.utils.dashboard import get_dashboards_with_link
+from frappe.model.utils.rename_field import rename_field
 
 def execute():
 	if not frappe.db.table_exists('Dashboard Chart')\
@@ -8,10 +9,14 @@ def execute():
 		or not frappe.db.table_exists('Dashboard'):
 		return
 
+
 	frappe.reload_doc('desk', 'doctype', 'dashboard_chart')
 	frappe.reload_doc('desk', 'doctype', 'number_card')
 	frappe.reload_doc('desk', 'doctype', 'dashboard')
 
+	if frappe.db.has_column('Dashboard Chart', 'is_custom'):
+		rename_field('Dashboard Chart', 'is_custom', 'use_report_chart')
+
 	modified_charts = get_modified_docs('Dashboard Chart')
 	modified_cards = get_modified_docs('Number Card')
 	modified_dashboards = [doc.name for doc in get_modified_docs('Dashboard')]

From e3e94a5430ca90a16256c29faac07844d56143d3 Mon Sep 17 00:00:00 2001
From: marination <maricadsouza221197@gmail.com>
Date: Tue, 21 Jul 2020 16:22:19 +0530
Subject: [PATCH 068/191] fix: Rename pending 'is_custom' usage to
 'use_report_chart'

---
 frappe/desk/doctype/dashboard_chart/dashboard_chart.js | 4 ++--
 frappe/public/js/frappe/views/reports/query_report.js  | 4 ++--
 frappe/public/js/frappe/widgets/chart_widget.js        | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/frappe/desk/doctype/dashboard_chart/dashboard_chart.js b/frappe/desk/doctype/dashboard_chart/dashboard_chart.js
index fd7e5764bc..07b0b69345 100644
--- a/frappe/desk/doctype/dashboard_chart/dashboard_chart.js
+++ b/frappe/desk/doctype/dashboard_chart/dashboard_chart.js
@@ -148,6 +148,7 @@ frappe.ui.form.on('Dashboard Chart', {
 		frm.set_value('filters_json', '{}');
 		frm.set_value('dynamic_filters_json', '{}');
 		frm.trigger('set_chart_report_filters');
+		frm.set_value('use_report_chart', 0);
 	},
 
 
@@ -176,7 +177,7 @@ frappe.ui.form.on('Dashboard Chart', {
 	set_chart_field_options: function(frm) {
 		let filters = frm.doc.filters_json.length > 2 ? JSON.parse(frm.doc.filters_json) : null;
 		if (frm.doc.dynamic_filters_json.length > 2) {
-			filters = {...filters, ...JSON.parse(frm.doc.dynamic_filters_json)};
+			filters = frappe.dashboard_utils.get_all_filters(frm.doc)
 		}
 		frappe.xcall(
 			'frappe.desk.query_report.run',
@@ -189,7 +190,6 @@ frappe.ui.form.on('Dashboard Chart', {
 			frm.report_data = data;
 			let report_has_chart = Boolean(data.chart);
 
-			frm.set_value('use_report_chart', 0);
 			frm.set_df_property('use_report_chart', 'hidden', !report_has_chart);
 
 			if (!frm.doc.use_report_chart) {
diff --git a/frappe/public/js/frappe/views/reports/query_report.js b/frappe/public/js/frappe/views/reports/query_report.js
index 40ebd1c497..9b094149b8 100644
--- a/frappe/public/js/frappe/views/reports/query_report.js
+++ b/frappe/public/js/frappe/views/reports/query_report.js
@@ -292,7 +292,7 @@ frappe.views.QueryReport = class QueryReport extends frappe.views.BaseList {
 					'y_axis': chart_args.y_axis_fields.map(f => {
 						return {'y_field': f.y_field, 'color': f.color};
 					}),
-					'is_custom': 0
+					'use_report_chart': 0
 				}
 			);
 		} else {
@@ -300,7 +300,7 @@ frappe.views.QueryReport = class QueryReport extends frappe.views.BaseList {
 			Object.assign(args,
 				{
 					'chart_name': chart_name,
-					'is_custom': 1
+					'use_report_chart': 1
 				}
 			);
 		}
diff --git a/frappe/public/js/frappe/widgets/chart_widget.js b/frappe/public/js/frappe/widgets/chart_widget.js
index 674f53670e..4aa0b23a63 100644
--- a/frappe/public/js/frappe/widgets/chart_widget.js
+++ b/frappe/public/js/frappe/widgets/chart_widget.js
@@ -255,7 +255,7 @@ export default class ChartWidget extends Widget {
 	}
 
 	get_report_chart_data(result) {
-		if (result.chart && this.chart_doc.is_custom) {
+		if (result.chart && this.chart_doc.use_report_chart) {
 			return result.chart.data;
 		} else {
 			let y_fields = [];

From 660d27389c09325be39ca3f912bb0eb61f2f1d12 Mon Sep 17 00:00:00 2001
From: prssanna <prssud@gmail.com>
Date: Tue, 21 Jul 2020 16:39:26 +0530
Subject: [PATCH 069/191] fix: get_all_filters for number cards

---
 frappe/desk/doctype/dashboard_chart/dashboard_chart.js | 2 +-
 frappe/desk/doctype/number_card/number_card.js         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/frappe/desk/doctype/dashboard_chart/dashboard_chart.js b/frappe/desk/doctype/dashboard_chart/dashboard_chart.js
index 07b0b69345..fc3708c983 100644
--- a/frappe/desk/doctype/dashboard_chart/dashboard_chart.js
+++ b/frappe/desk/doctype/dashboard_chart/dashboard_chart.js
@@ -147,8 +147,8 @@ frappe.ui.form.on('Dashboard Chart', {
 		frm.set_df_property('x_field', 'options', []);
 		frm.set_value('filters_json', '{}');
 		frm.set_value('dynamic_filters_json', '{}');
-		frm.trigger('set_chart_report_filters');
 		frm.set_value('use_report_chart', 0);
+		frm.trigger('set_chart_report_filters');
 	},
 
 
diff --git a/frappe/desk/doctype/number_card/number_card.js b/frappe/desk/doctype/number_card/number_card.js
index d5a743818a..8e05a28783 100644
--- a/frappe/desk/doctype/number_card/number_card.js
+++ b/frappe/desk/doctype/number_card/number_card.js
@@ -216,7 +216,7 @@ frappe.ui.form.on('Number Card', {
 	set_report_field_options: function(frm) {
 		let filters = frm.doc.filters_json.length > 2 ? JSON.parse(frm.doc.filters_json) : null;
 		if (frm.doc.dynamic_filters_json.length > 2) {
-			filters = {...filters, ...JSON.parse(frm.doc.dynamic_filters_json)};
+			filters = frappe.dashboard_utils.get_all_filters(frm.doc);
 		}
 		frappe.xcall(
 			'frappe.desk.query_report.run',

From c709ebc9f103b726692c7901496051a780591b54 Mon Sep 17 00:00:00 2001
From: prssanna <prssud@gmail.com>
Date: Tue, 21 Jul 2020 16:39:58 +0530
Subject: [PATCH 070/191] fix: set report name as mandatory

---
 frappe/desk/doctype/dashboard_chart/dashboard_chart.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/frappe/desk/doctype/dashboard_chart/dashboard_chart.json b/frappe/desk/doctype/dashboard_chart/dashboard_chart.json
index a049e2058c..a25d0cc6c5 100644
--- a/frappe/desk/doctype/dashboard_chart/dashboard_chart.json
+++ b/frappe/desk/doctype/dashboard_chart/dashboard_chart.json
@@ -205,6 +205,7 @@
    "fieldname": "report_name",
    "fieldtype": "Link",
    "label": "Report Name",
+   "mandatory_depends_on": "eval:doc.chart_type === 'Report'",
    "options": "Report",
    "set_only_once": 1
   },
@@ -269,7 +270,7 @@
   }
  ],
  "links": [],
- "modified": "2020-07-21 15:41:19.990283",
+ "modified": "2020-07-21 16:37:07.763482",
  "modified_by": "Administrator",
  "module": "Desk",
  "name": "Dashboard Chart",

From 6e9fe40b0e0a81ccd23dac0f06e0a9fbea662304 Mon Sep 17 00:00:00 2001
From: prssanna <prssud@gmail.com>
Date: Tue, 21 Jul 2020 16:40:56 +0530
Subject: [PATCH 071/191] style: fix formatting

---
 frappe/desk/doctype/dashboard_chart/dashboard_chart.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frappe/desk/doctype/dashboard_chart/dashboard_chart.js b/frappe/desk/doctype/dashboard_chart/dashboard_chart.js
index fc3708c983..6d33d7717b 100644
--- a/frappe/desk/doctype/dashboard_chart/dashboard_chart.js
+++ b/frappe/desk/doctype/dashboard_chart/dashboard_chart.js
@@ -177,7 +177,7 @@ frappe.ui.form.on('Dashboard Chart', {
 	set_chart_field_options: function(frm) {
 		let filters = frm.doc.filters_json.length > 2 ? JSON.parse(frm.doc.filters_json) : null;
 		if (frm.doc.dynamic_filters_json.length > 2) {
-			filters = frappe.dashboard_utils.get_all_filters(frm.doc)
+			filters = frappe.dashboard_utils.get_all_filters(frm.doc);
 		}
 		frappe.xcall(
 			'frappe.desk.query_report.run',

From e3ce17a0c9ec989bd9cd2eddc9b975777d2eecbb Mon Sep 17 00:00:00 2001
From: prssanna <prssud@gmail.com>
Date: Tue, 21 Jul 2020 17:16:19 +0530
Subject: [PATCH 072/191] fix: check if dynamic filters exists

---
 frappe/desk/doctype/dashboard_chart/dashboard_chart.js | 2 +-
 frappe/desk/doctype/number_card/number_card.js         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/frappe/desk/doctype/dashboard_chart/dashboard_chart.js b/frappe/desk/doctype/dashboard_chart/dashboard_chart.js
index 6d33d7717b..ee6eb3289d 100644
--- a/frappe/desk/doctype/dashboard_chart/dashboard_chart.js
+++ b/frappe/desk/doctype/dashboard_chart/dashboard_chart.js
@@ -176,7 +176,7 @@ frappe.ui.form.on('Dashboard Chart', {
 
 	set_chart_field_options: function(frm) {
 		let filters = frm.doc.filters_json.length > 2 ? JSON.parse(frm.doc.filters_json) : null;
-		if (frm.doc.dynamic_filters_json.length > 2) {
+		if (frm.doc.dynamic_filters_json && frm.doc.dynamic_filters_json.length > 2) {
 			filters = frappe.dashboard_utils.get_all_filters(frm.doc);
 		}
 		frappe.xcall(
diff --git a/frappe/desk/doctype/number_card/number_card.js b/frappe/desk/doctype/number_card/number_card.js
index 8e05a28783..42899a4ebb 100644
--- a/frappe/desk/doctype/number_card/number_card.js
+++ b/frappe/desk/doctype/number_card/number_card.js
@@ -215,7 +215,7 @@ frappe.ui.form.on('Number Card', {
 
 	set_report_field_options: function(frm) {
 		let filters = frm.doc.filters_json.length > 2 ? JSON.parse(frm.doc.filters_json) : null;
-		if (frm.doc.dynamic_filters_json.length > 2) {
+		if (frm.doc.dynamic_filters_json && frm.doc.dynamic_filters_json.length > 2) {
 			filters = frappe.dashboard_utils.get_all_filters(frm.doc);
 		}
 		frappe.xcall(

From 48b835c1dc3757e7be6e741489b26916debe15a5 Mon Sep 17 00:00:00 2001
From: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
Date: Tue, 21 Jul 2020 18:26:42 +0530
Subject: [PATCH 073/191] fix: Text editor content style in email and website
 (#11003)

---
 frappe/public/css/email.css                     |  6 ++++++
 .../js/frappe/form/controls/text_editor.js      |  5 ++++-
 frappe/public/js/frappe/form/formatters.js      |  7 ++++++-
 frappe/public/less/email.less                   |  9 ++++++++-
 frappe/public/less/quill.less                   |  6 +++++-
 frappe/public/scss/website.scss                 | 17 ++++++++++++++++-
 .../print_formats/standard_macros.html          |  2 --
 7 files changed, 45 insertions(+), 7 deletions(-)

diff --git a/frappe/public/css/email.css b/frappe/public/css/email.css
index 40c6149927..5c398009ff 100644
--- a/frappe/public/css/email.css
+++ b/frappe/public/css/email.css
@@ -7,6 +7,12 @@ body {
 p {
   margin: 1em 0 !important;
 }
+.ql-editor {
+  white-space: normal;
+}
+.ql-editor p {
+  margin: 0 !important;
+}
 hr {
   border-top: 1px solid #d1d8dd;
 }
diff --git a/frappe/public/js/frappe/form/controls/text_editor.js b/frappe/public/js/frappe/form/controls/text_editor.js
index e367989b81..3fe0b60ae0 100644
--- a/frappe/public/js/frappe/form/controls/text_editor.js
+++ b/frappe/public/js/frappe/form/controls/text_editor.js
@@ -69,7 +69,6 @@ Quill.register(CustomColor, true);
 frappe.ui.form.ControlTextEditor = frappe.ui.form.ControlCode.extend({
 	make_wrapper() {
 		this._super();
-		this.$wrapper.find(".like-disabled-input").addClass('ql-editor');
 	},
 
 	make_input() {
@@ -201,6 +200,10 @@ frappe.ui.form.ControlTextEditor = frappe.ui.form.ControlCode.extend({
 		let value = this.quill ? this.quill.root.innerHTML : '';
 		// hack to retain space sequence.
 		value = value.replace(/(\s)(\s)/g, ' &nbsp;');
+
+		if (!$(value).find('.ql-editor').length) {
+			value = `<div class="ql-editor read-mode">${value}</div>`;
+		}
 		return value;
 	},
 
diff --git a/frappe/public/js/frappe/form/formatters.js b/frappe/public/js/frappe/form/formatters.js
index 4f9dd377c9..a7adc9175a 100644
--- a/frappe/public/js/frappe/form/formatters.js
+++ b/frappe/public/js/frappe/form/formatters.js
@@ -228,7 +228,12 @@ frappe.form.formatters = {
 		return frappe.form.formatters.Text(value);
 	},
 	TextEditor: function(value) {
-		return frappe.form.formatters.Text(value);
+		let formatted_value = frappe.form.formatters.Text(value);
+		// to use ql-editor styles
+		if (!$(formatted_value).find('.ql-editor').length) {
+			formatted_value = `<div class="ql-editor read-mode">${formatted_value}</div>`;
+		}
+		return formatted_value;
 	},
 	Code: function(value) {
 		return "<pre>" + (value==null ? "" : $("<div>").text(value).html()) + "</pre>"
diff --git a/frappe/public/less/email.less b/frappe/public/less/email.less
index b6d9540586..bf0507138b 100644
--- a/frappe/public/less/email.less
+++ b/frappe/public/less/email.less
@@ -10,6 +10,13 @@ p {
 	margin: 1em 0 !important;
 }
 
+.ql-editor {
+	white-space: normal;
+	p {
+		margin: 0 !important;
+	}
+}
+
 hr {
 	border-top: 1px solid @border-color;
 }
@@ -210,4 +217,4 @@ hr {
 .report-title {
 	margin-bottom: 20px;
 }
-/* csslint ignore:end */
+/* csslint ignore:end */
\ No newline at end of file
diff --git a/frappe/public/less/quill.less b/frappe/public/less/quill.less
index 98c762bb4a..514d8993cd 100644
--- a/frappe/public/less/quill.less
+++ b/frappe/public/less/quill.less
@@ -78,7 +78,7 @@
 	}
 }
 
-.ql-editor .mention {
+.ql-editor:not(.read-mode) .mention {
 	height: auto;
 	width: auto;
 	border-radius: 10px;
@@ -133,3 +133,7 @@
 	margin-top: 0px;
 	margin-bottom: 0px;
 }
+
+.ql-editor.read-mode {
+	padding: 0;
+}
\ No newline at end of file
diff --git a/frappe/public/scss/website.scss b/frappe/public/scss/website.scss
index c89641b238..3c11d23252 100644
--- a/frappe/public/scss/website.scss
+++ b/frappe/public/scss/website.scss
@@ -1,3 +1,4 @@
+@import '~quill/dist/quill.core';
 @import 'variables';
 @import 'frappe/public/css/font-awesome';
 @import '~bootstrap/scss/bootstrap';
@@ -11,6 +12,20 @@
 @import 'portal';
 @import 'doc';
 
+.ql-editor.read-mode {
+	padding: 0;
+	line-height: 1.6;
+
+	h1,
+	h2,
+	h3,
+	h4,
+	h5 {
+		margin-top: 0.5em;
+		margin-bottom: 0.25em;
+	}
+}
+
 .container {
 	padding-left: 1.25rem;
 	padding-right: 1.25rem;
@@ -338,4 +353,4 @@ h5.modal-title {
 	overflow: hidden;
 	white-space: nowrap;
 	text-overflow: ellipsis;
-}
\ No newline at end of file
+}
diff --git a/frappe/templates/print_formats/standard_macros.html b/frappe/templates/print_formats/standard_macros.html
index 07ef577aa7..3681a87f53 100644
--- a/frappe/templates/print_formats/standard_macros.html
+++ b/frappe/templates/print_formats/standard_macros.html
@@ -99,9 +99,7 @@ data-fieldname="{{ df.fieldname }}" data-fieldtype="{{ df.fieldtype }}"
 	{%- if df.fieldtype=="Code" %}
 		<pre class="value">{{ doc.get(df.fieldname) }}</pre>
 	{% else -%}
-		{%- if df.fieldtype=="Text Editor" -%}<div class='ql-editor'>{%- endif -%}
 		{{ doc.get_formatted(df.fieldname, parent_doc or doc, translated=df.translatable) }}
-		{%- if df.fieldtype=="Text Editor" -%}</div>{%- endif -%}
   {% endif -%}
 </div>
 {%- endif -%}

From 547bd77c207e2f1668de43889e540edb7d4a36c2 Mon Sep 17 00:00:00 2001
From: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
Date: Tue, 21 Jul 2020 18:46:51 +0530
Subject: [PATCH 074/191] fix: Do not check all attachments on adding new
 (#10926)

---
 .../public/js/frappe/views/communication.js   | 129 ++++++++----------
 1 file changed, 59 insertions(+), 70 deletions(-)

diff --git a/frappe/public/js/frappe/views/communication.js b/frappe/public/js/frappe/views/communication.js
index 53d946f75d..29b21242af 100755
--- a/frappe/public/js/frappe/views/communication.js
+++ b/frappe/public/js/frappe/views/communication.js
@@ -44,26 +44,6 @@ frappe.views.CommunicationComposer = Class.extend({
 			}
 		});
 
-		$(document).on("upload_complete", function(event, attachment) {
-			if(me.dialog.display) {
-				var wrapper = $(me.dialog.fields_dict.select_attachments.wrapper);
-
-				// find already checked items
-				var checked_items = wrapper.find('[data-file-name]:checked').map(function() {
-					return $(this).attr("data-file-name");
-				});
-
-				// reset attachment list
-				me.render_attach();
-
-				// check latest added
-				checked_items.push(attachment.name);
-
-				$.each(checked_items, function(i, filename) {
-					wrapper.find('[data-file-name="'+ filename +'"]').prop("checked", true);
-				});
-			}
-		})
 		this.prepare();
 		this.dialog.show();
 
@@ -387,77 +367,86 @@ frappe.views.CommunicationComposer = Class.extend({
 			folder: 'Home/Attachments',
 			on_success: attachment => {
 				this.attachments.push(attachment);
-				this.render_attach();
+				this.render_attachment_rows(attachment);
 			}
 		};
 
-		if(this.frm) {
+		if (this.frm) {
 			args = {
 				doctype: this.frm.doctype,
 				docname: this.frm.docname,
 				folder: 'Home/Attachments',
 				on_success: attachment => {
 					this.frm.attachments.attachment_uploaded(attachment);
-					this.render_attach();
+					this.render_attachment_rows(attachment);
 				}
-			}
+			};
 		}
 
-		$("<h6 class='text-muted add-attachment' style='margin-top: 12px; cursor:pointer;'>"
-			+__("Select Attachments")+"</h6><div class='attach-list'></div>\
-			<p class='add-more-attachments'>\
-			<a class='text-muted small'><i class='octicon octicon-plus' style='font-size: 12px'></i> "
-			+__("Add Attachment")+"</a></p>").appendTo(attach.empty())
+		$(`
+			<h6 class='text-muted add-attachment' style='margin-top: 12px; cursor:pointer;'>
+				${__("Select Attachments")}
+			</h6>
+			<div class='attach-list'></div>
+			<p class='add-more-attachments'>
+				<a class='text-muted small'>
+					<i class='octicon octicon-plus' style='font-size: 12px'></i>
+					${__("Add Attachment")}
+				</a>
+			</p>
+		`).appendTo(attach.empty());
+
 		attach
 			.find(".add-more-attachments a")
-			.on('click',() => new frappe.ui.FileUploader(args));
-		this.render_attach();
+			.on('click', () => new frappe.ui.FileUploader(args));
+		this.render_attachment_rows();
 	},
-	render_attach:function(){
-		var fields = this.dialog.fields_dict;
-		var attach = $(fields.select_attachments.wrapper).find(".attach-list").empty();
 
-		var files = [];
-		if (this.attachments && this.attachments.length) {
-			files = files.concat(this.attachments);
-		}
-		if (cur_frm) {
-			files = files.concat(cur_frm.get_files());
-		}
+	render_attachment_rows: function(attachment) {
+		const select_attachments = this.dialog.fields_dict.select_attachments;
+		const attachment_rows = $(select_attachments.wrapper).find(".attach-list");
+		if (attachment) {
+			attachment_rows.append(this.get_attachment_row(attachment, true));
+		} else {
+			let files = [];
+			if (this.attachments && this.attachments.length) {
+				files = files.concat(this.attachments);
+			}
+			if (this.frm) {
+				files = files.concat(this.frm.get_files());
+			}
 
-		if(files.length) {
-			$.each(files, function(i, f) {
-				if (!f.file_name) return;
-				f.file_url = frappe.urllib.get_full_url(f.file_url);
-
-				$(repl('<p class="checkbox">'
-					+	'<label><span><input type="checkbox" data-file-name="%(name)s"></input></span>'
-					+		'<span class="small">%(file_name)s</span>'
-					+	' <a href="%(file_url)s" target="_blank" class="text-muted small">'
-					+		'<i class="fa fa-share" style="vertical-align: middle; margin-left: 3px;"></i>'
-					+ '</label></p>', f))
-					.appendTo(attach)
-			});
-		}
-		this.select_attachments();
-	},
-	select_attachments:function(){
-		let me = this;
-		if(me.dialog.display) {
-			let wrapper = $(me.dialog.fields_dict.select_attachments.wrapper);
-
-			let unchecked_items = wrapper.find('[data-file-name]:not(:checked)').map(function() {
-				return $(this).attr("data-file-name");
-			});
-
-			$.each(unchecked_items, function(i, filename) {
-				wrapper.find('[data-file-name="'+ filename +'"]').prop("checked", true);
-			});
+			if (files.length) {
+				$.each(files, (i, f) => {
+					if (!f.file_name) return;
+					if (!attachment_rows.find(`[data-file-name="${f.name}"]`).length) {
+						f.file_url = frappe.urllib.get_full_url(f.file_url);
+						attachment_rows.append(this.get_attachment_row(f));
+					}
+				});
+			}
 		}
 	},
+
+	get_attachment_row(attachment, checked) {
+		return $(`<p class="checkbox">
+			<label>
+				<span>
+					<input
+						type="checkbox"
+						data-file-name="${attachment.name}"
+						${checked ? 'checked': ''}>
+					</input>
+				</span>
+				<span class="small">${attachment.file_name}</span>
+				<a href="${attachment.file_url}" target="_blank" class="text-muted small">
+				<i class="fa fa-share" style="vertical-align: middle; margin-left: 3px;"></i>
+			</label>
+		</p>`);
+	},
+
 	setup_email: function() {
 		// email
-		var me = this;
 		var fields = this.dialog.fields_dict;
 
 		if(this.attach_document_print) {

From 061c8d90886d319dea9b8fa6c8c13741b08e3640 Mon Sep 17 00:00:00 2001
From: Diksha Jadhav <dikshajadhav11.dj@gmail.com>
Date: Tue, 21 Jul 2020 19:14:07 +0530
Subject: [PATCH 075/191] fix(grid): trigger onchange on field

---
 frappe/public/js/frappe/form/grid_row.js | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/frappe/public/js/frappe/form/grid_row.js b/frappe/public/js/frappe/form/grid_row.js
index f5a06311e9..f4bcecc68e 100644
--- a/frappe/public/js/frappe/form/grid_row.js
+++ b/frappe/public/js/frappe/form/grid_row.js
@@ -392,8 +392,11 @@ export default class GridRow {
 
 		// sync get_query
 		field.get_query = this.grid.get_field(df.fieldname).get_query;
-		field.df.onchange = function() {
-			me.grid.grid_rows[this.doc.idx-1].refresh_field(this.df.fieldname);
+
+		var field_on_change_function = field.df.onchange;
+		field.df.onchange = function(e) {
+			field_on_change_function && field_on_change_function(e);
+			me.grid.grid_rows[this.doc.idx - 1].refresh_field(this.df.fieldname);
 		};
 		field.refresh();
 		if(field.$input) {

From 1d9903bfdd51a42dae0034c1a0ceecde4b7fe5f2 Mon Sep 17 00:00:00 2001
From: prssanna <prssud@gmail.com>
Date: Tue, 21 Jul 2020 20:45:27 +0530
Subject: [PATCH 076/191] fix: get value from filter lsit if base list doesn't
 exist

---
 frappe/public/js/frappe/ui/filters/filter.js      | 4 +++-
 frappe/public/js/frappe/ui/filters/filter_list.js | 7 ++++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/frappe/public/js/frappe/ui/filters/filter.js b/frappe/public/js/frappe/ui/filters/filter.js
index 5e41ed645e..d4fb6db436 100644
--- a/frappe/public/js/frappe/ui/filters/filter.js
+++ b/frappe/public/js/frappe/ui/filters/filter.js
@@ -249,7 +249,9 @@ frappe.ui.Filter = class {
 			let args = {};
 			if (this.filters_config[condition].depends_on) {
 				const field_name = this.filters_config[condition].depends_on;
-				const filter_value = this.base_list.get_filter_value(field_name);
+				const filter_value = this.base_list
+					? this.base_list.get_filter_value(field_name)
+					: this.filter_list.get_filter_value(field_name);
 				args[field_name] = filter_value;
 			}
 			frappe
diff --git a/frappe/public/js/frappe/ui/filters/filter_list.js b/frappe/public/js/frappe/ui/filters/filter_list.js
index ed9ddefe64..7ae48bc7d9 100644
--- a/frappe/public/js/frappe/ui/filters/filter_list.js
+++ b/frappe/public/js/frappe/ui/filters/filter_list.js
@@ -104,13 +104,18 @@ frappe.ui.FilterGroup = class {
 			filter_items: (doctype, fieldname) => {
 				return !this.filter_exists([doctype, fieldname]);
 			},
-			base_list: this.base_list
+			base_list: this.base_list,
+			filter_list: this,
 		};
 		let filter = new frappe.ui.Filter(args);
 		this.filters.push(filter);
 		return filter;
 	}
 
+	get_filter_value(fieldname) {
+		return this.filters.filter(f => f.fieldname == fieldname)[0].value;
+	}
+
 	filter_exists(filter_value) {
 		// filter_value of form: [doctype, fieldname, condition, value]
 		let exists = false;

From 220b56f0a08b3dc68e4837ededd6b3850ccbf1a6 Mon Sep 17 00:00:00 2001
From: Gavin D'souza <gavin18d@gmail.com>
Date: Tue, 21 Jul 2020 21:20:06 +0530
Subject: [PATCH 077/191] feat: API to fetch the latest backup available

Take a backup if it doesnt exist with the required expiry
---
 frappe/utils/backups.py | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/frappe/utils/backups.py b/frappe/utils/backups.py
index bb03c85bf9..707a9ac511 100644
--- a/frappe/utils/backups.py
+++ b/frappe/utils/backups.py
@@ -206,6 +206,31 @@ def get_backup():
 	recipient_list = odb.send_email()
 	frappe.msgprint(_("Download link for your backup will be emailed on the following email address: {0}").format(', '.join(recipient_list)))
 
+
+@frappe.whitelist()
+def fetch_latest_backups(with_files=True, recent=3):
+	"""Takes backup on-demand if doesnt exist satisfying the `recent` parameter
+	Only for: System Managers
+
+	Args:
+		with_files (bool, optional): If set, files will backuped up. Defaults to True.
+		recent (int, optional): Won't take a new backup if backup exists within this paramter. Defaults to 3 hours
+
+	Returns:
+		dict: relative Backup Paths
+	"""
+	frappe.only_for("System Manager")
+	odb = BackupGenerator(frappe.conf.db_name, frappe.conf.db_name, frappe.conf.db_password, db_host=frappe.db.host, db_type=frappe.conf.db_type, db_port=frappe.conf.db_port)
+	odb.get_backup(older_than=recent, ignore_files=not with_files)
+
+	return {
+		"database": odb.backup_path_files,
+		"public": odb.backup_path_db,
+		"private": odb.backup_path_private_files,
+		"config": odb.site_config_backup_path
+	}
+
+
 def scheduled_backup(older_than=6, ignore_files=False, backup_path_db=None, backup_path_files=None, backup_path_private_files=None, force=False, verbose=False):
 	"""this function is called from scheduler
 		deletes backups older than 7 days

From 3c4e1ea3a5fabb62f465a432760044b6db7529d2 Mon Sep 17 00:00:00 2001
From: Mangesh-Khairnar <mkhairnar10@gmail.com>
Date: Tue, 21 Jul 2020 22:20:27 +0530
Subject: [PATCH 078/191] fix: add pycryptodome for checksum generation

---
 requirements.txt | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/requirements.txt b/requirements.txt
index 0c57da9eac..33cd292bf6 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -68,4 +68,5 @@ Werkzeug==0.16.1
 Whoosh==2.7.4
 xlrd==1.2.0
 zxcvbn-python==4.4.24
-paytmchecksum==1.7.0
+pycryptodome==3.9.8
+paytmchecksum==1.7.0
\ No newline at end of file

From 06788762d60cad293c7ad34dc7525bed8aab6da4 Mon Sep 17 00:00:00 2001
From: Suraj Shetty <surajshetty3416@gmail.com>
Date: Wed, 22 Jul 2020 10:09:58 +0530
Subject: [PATCH 079/191] fix(website): Properly load colocated javascript and
 style

---
 frappe/templates/base.html | 12 ++++++++++--
 frappe/website/router.py   | 28 +++++++++++++---------------
 2 files changed, 23 insertions(+), 17 deletions(-)

diff --git a/frappe/templates/base.html b/frappe/templates/base.html
index 0b82b3dac2..8c843a44a4 100644
--- a/frappe/templates/base.html
+++ b/frappe/templates/base.html
@@ -42,7 +42,11 @@
 		{{ head_include or "" }}
 	{% endblock -%}
 
-	{%- block style %}{%- endblock -%}
+	{%- block style %}
+		{% if colocated_css -%}
+			<style>{{ colocated_css }}</style>
+		{%- endif %}
+	{%- endblock -%}
 
 	<script>
 		window.frappe = {};
@@ -86,7 +90,11 @@
 	<script type="text/javascript" src="{{ link | abs_url }}"></script>
 	{%- endfor -%}
 
-	{%- block script %}{%- endblock %}
+	{%- block script %}
+		{% if colocated_js -%}
+			<script>{{ colocated_js }}</script>
+		{%- endif %}
+	{%- endblock %}
 	<!-- csrf_token -->
 	{%- block body_include %}{{ body_include or "" }}{% endblock -%}
 </body>
diff --git a/frappe/website/router.py b/frappe/website/router.py
index db7e6f322c..fb9cae7d76 100644
--- a/frappe/website/router.py
+++ b/frappe/website/router.py
@@ -283,22 +283,20 @@ def setup_source(page_info):
 		# set the source only if it contains raw content
 		html = source
 
-		# load css/js files
-		js, css = '', ''
+	# load css/js files
+	js_path = os.path.join(page_info.basepath, (page_info.basename or 'index') + '.js')
+	if os.path.exists(js_path):
+		if not '{% block script %}' in html:
+			with io.open(js_path, 'r', encoding = 'utf-8') as f:
+				js = f.read()
+				page_info.colocated_js = js
 
-		js_path = os.path.join(page_info.basepath, (page_info.basename or 'index') + '.js')
-		if os.path.exists(js_path):
-			if not '{% block script %}' in html:
-				with io.open(js_path, 'r', encoding = 'utf-8') as f:
-					js = f.read()
-				html += '\n{% block script %}<script>' + js + '\n</script>\n{% endblock %}'
-
-		css_path = os.path.join(page_info.basepath, (page_info.basename or 'index') + '.css')
-		if os.path.exists(css_path):
-			if not '{% block style %}' in html:
-				with io.open(css_path, 'r', encoding='utf-8') as f:
-					css = f.read()
-				html += '\n{% block style %}\n<style>\n' + css + '\n</style>\n{% endblock %}'
+	css_path = os.path.join(page_info.basepath, (page_info.basename or 'index') + '.css')
+	if os.path.exists(css_path):
+		if not '{% block style %}' in html:
+			with io.open(css_path, 'r', encoding='utf-8') as f:
+				css = f.read()
+				page_info.colocated_css = css
 
 	if html:
 		page_info.source = html

From 2bf77cd82a3c14976cf4fe2fcd4073978338f4f0 Mon Sep 17 00:00:00 2001
From: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
Date: Wed, 22 Jul 2020 10:32:12 +0530
Subject: [PATCH 080/191] style: Fix sider

---
 frappe/website/router.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/frappe/website/router.py b/frappe/website/router.py
index fb9cae7d76..9a647e1030 100644
--- a/frappe/website/router.py
+++ b/frappe/website/router.py
@@ -286,14 +286,14 @@ def setup_source(page_info):
 	# load css/js files
 	js_path = os.path.join(page_info.basepath, (page_info.basename or 'index') + '.js')
 	if os.path.exists(js_path):
-		if not '{% block script %}' in html:
+		if '{% block script %}' not in html:
 			with io.open(js_path, 'r', encoding = 'utf-8') as f:
 				js = f.read()
 				page_info.colocated_js = js
 
 	css_path = os.path.join(page_info.basepath, (page_info.basename or 'index') + '.css')
 	if os.path.exists(css_path):
-		if not '{% block style %}' in html:
+		if '{% block style %}' not in html:
 			with io.open(css_path, 'r', encoding='utf-8') as f:
 				css = f.read()
 				page_info.colocated_css = css

From 2a068bad19a1fcae28921c9e4fd494b6209be527 Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Wed, 22 Jul 2020 11:17:04 +0530
Subject: [PATCH 081/191] fix: set page actions after setting read only

---
 frappe/public/js/frappe/form/form.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/frappe/public/js/frappe/form/form.js b/frappe/public/js/frappe/form/form.js
index c0b76ee94d..43128065bc 100644
--- a/frappe/public/js/frappe/form/form.js
+++ b/frappe/public/js/frappe/form/form.js
@@ -1409,6 +1409,7 @@ frappe.ui.form.Form = class FrappeForm {
 			};
 		}
 		this.perm = perm;
+		this.toolbar.set_page_action();
 	}
 
 	trigger(event, doctype, docname) {

From 8f6329de4953f99637c98c68ad94645560b51a73 Mon Sep 17 00:00:00 2001
From: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
Date: Wed, 22 Jul 2020 11:23:35 +0530
Subject: [PATCH 082/191] refactor: Simplify code

---
 frappe/website/router.py | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/frappe/website/router.py b/frappe/website/router.py
index 9a647e1030..263d5b0f07 100644
--- a/frappe/website/router.py
+++ b/frappe/website/router.py
@@ -285,18 +285,16 @@ def setup_source(page_info):
 
 	# load css/js files
 	js_path = os.path.join(page_info.basepath, (page_info.basename or 'index') + '.js')
-	if os.path.exists(js_path):
-		if '{% block script %}' not in html:
-			with io.open(js_path, 'r', encoding = 'utf-8') as f:
-				js = f.read()
-				page_info.colocated_js = js
+	if os.path.exists(js_path) and '{% block script %}' not in html:
+		with io.open(js_path, 'r', encoding = 'utf-8') as f:
+			js = f.read()
+			page_info.colocated_js = js
 
 	css_path = os.path.join(page_info.basepath, (page_info.basename or 'index') + '.css')
-	if os.path.exists(css_path):
-		if '{% block style %}' not in html:
-			with io.open(css_path, 'r', encoding='utf-8') as f:
-				css = f.read()
-				page_info.colocated_css = css
+	if os.path.exists(css_path) and '{% block style %}' not in html:
+		with io.open(css_path, 'r', encoding='utf-8') as f:
+			css = f.read()
+			page_info.colocated_css = css
 
 	if html:
 		page_info.source = html

From 1e56fcc85765681c79631116dd48bd13c1ff3368 Mon Sep 17 00:00:00 2001
From: prssanna <prssud@gmail.com>
Date: Wed, 22 Jul 2020 11:40:28 +0530
Subject: [PATCH 083/191] fix: filter out standard dashboards if not in
 developer mode

---
 .../dashboard_chart/dashboard_chart.js        | 36 +++-----------
 .../dashboard_chart/dashboard_chart.py        |  8 ++-
 .../desk/doctype/number_card/number_card.js   | 36 +++-----------
 .../desk/doctype/number_card/number_card.py   |  6 +++
 .../public/js/frappe/utils/dashboard_utils.js | 49 +++++++++++++++++++
 5 files changed, 75 insertions(+), 60 deletions(-)

diff --git a/frappe/desk/doctype/dashboard_chart/dashboard_chart.js b/frappe/desk/doctype/dashboard_chart/dashboard_chart.js
index ee6eb3289d..65db4839a1 100644
--- a/frappe/desk/doctype/dashboard_chart/dashboard_chart.js
+++ b/frappe/desk/doctype/dashboard_chart/dashboard_chart.js
@@ -28,38 +28,16 @@ frappe.ui.form.on('Dashboard Chart', {
 		}
 
 		frm.add_custom_button('Add Chart to Dashboard', () => {
-			const d = new frappe.ui.Dialog({
-				title: __('Add to Dashboard'),
-				fields: [
-					{
-						label: __('Select Dashboard'),
-						fieldtype: 'Link',
-						fieldname: 'dashboard',
-						options: 'Dashboard',
-					}
-				],
-				primary_action: (values) => {
-					values.chart_name = frm.doc.chart_name;
-					frappe.xcall(
-						'frappe.desk.doctype.dashboard_chart.dashboard_chart.add_chart_to_dashboard',
-						{args: values}
-					).then(()=> {
-						let dashboard_route_html =
-							`<a href = "#dashboard/${values.dashboard}">${values.dashboard}</a>`;
-						let message =
-							__(`Dashboard Chart ${values.chart_name} add to Dashboard ` + dashboard_route_html);
-
-						frappe.msgprint(message);
-					});
-
-					d.hide();
-				}
-			});
+			const dialog = frappe.dashboard_utils.get_add_to_dashboard_dialog(
+				frm.doc.name,
+				'Dashboard Chart',
+				'frappe.desk.doctype.dashboard_chart.dashboard_chart.add_chart_to_dashboard'
+			);
 
 			if (!frm.doc.chart_name) {
 				frappe.msgprint(__('Please create chart first'));
 			} else {
-				d.show();
+				dialog.show();
 			}
 		});
 
@@ -338,7 +316,7 @@ frappe.ui.form.on('Dashboard Chart', {
 		} else if (frm.chart_filters.length) {
 			fields = frm.chart_filters.filter(f => f.fieldname);
 
-			fields.map( f => {
+			fields.map(f => {
 				if (filters[f.fieldname]) {
 					let condition = '=';
 					const filter_row =
diff --git a/frappe/desk/doctype/dashboard_chart/dashboard_chart.py b/frappe/desk/doctype/dashboard_chart/dashboard_chart.py
index 70aece3ee7..a25e0cab9e 100644
--- a/frappe/desk/doctype/dashboard_chart/dashboard_chart.py
+++ b/frappe/desk/doctype/dashboard_chart/dashboard_chart.py
@@ -128,7 +128,13 @@ def add_chart_to_dashboard(args):
 
 	dashboard = frappe.get_doc('Dashboard', args.dashboard)
 	dashboard_link = frappe.new_doc('Dashboard Chart Link')
-	dashboard_link.chart = args.chart_name
+	dashboard_link.chart = args.chart_name or args.name
+
+	if args.set_standard:
+		chart = frappe.get_doc('Dashboard Chart', dashboard_link.chart)
+		chart.is_standard = 1
+		chart.module = dashboard.module
+		chart.save()
 
 	dashboard.append('charts', dashboard_link)
 	dashboard.save()
diff --git a/frappe/desk/doctype/number_card/number_card.js b/frappe/desk/doctype/number_card/number_card.js
index 42899a4ebb..2ae163d7aa 100644
--- a/frappe/desk/doctype/number_card/number_card.js
+++ b/frappe/desk/doctype/number_card/number_card.js
@@ -32,40 +32,16 @@ frappe.ui.form.on('Number Card', {
 
 	create_add_to_dashboard_button: function(frm) {
 		frm.add_custom_button('Add Card to Dashboard', () => {
-			const d = new frappe.ui.Dialog({
-				title: __('Add to Dashboard'),
-				fields: [
-					{
-						label: __('Select Dashboard'),
-						fieldtype: 'Link',
-						fieldname: 'dashboard',
-						options: 'Dashboard',
-					}
-				],
-				primary_action: (values) => {
-					values.name = frm.doc.name;
-					frappe.xcall(
-						'frappe.desk.doctype.number_card.number_card.add_card_to_dashboard',
-						{
-							args: values
-						}
-					).then(()=> {
-						let dashboard_route_html =
-							`<a href = "#dashboard/${values.dashboard}">${values.dashboard}</a>`;
-						let message =
-							__(`Number Card ${values.name} add to Dashboard ` + dashboard_route_html);
-
-						frappe.msgprint(message);
-					});
-
-					d.hide();
-				}
-			});
+			const dialog = frappe.dashboard_utils.get_add_to_dashboard_dialog(
+				frm.doc.name,
+				'Number Card',
+				'frappe.desk.doctype.number_card.number_card.add_card_to_dashboard'
+			);
 
 			if (!frm.doc.name) {
 				frappe.msgprint(__('Please create Card first'));
 			} else {
-				d.show();
+				dialog.show();
 			}
 		});
 	},
diff --git a/frappe/desk/doctype/number_card/number_card.py b/frappe/desk/doctype/number_card/number_card.py
index 5b52b60474..3eb08ec00a 100644
--- a/frappe/desk/doctype/number_card/number_card.py
+++ b/frappe/desk/doctype/number_card/number_card.py
@@ -172,5 +172,11 @@ def add_card_to_dashboard(args):
 	dashboard_link = frappe.new_doc('Number Card Link')
 	dashboard_link.card = args.name
 
+	if args.set_standard:
+		card = frappe.get_doc('Number Card', dashboard_link.card)
+		card.is_standard = 1
+		card.module = dashboard.module
+		card.save()
+
 	dashboard.append('cards', dashboard_link)
 	dashboard.save()
\ No newline at end of file
diff --git a/frappe/public/js/frappe/utils/dashboard_utils.js b/frappe/public/js/frappe/utils/dashboard_utils.js
index 8618f6dd59..4074404aa3 100644
--- a/frappe/public/js/frappe/utils/dashboard_utils.js
+++ b/frappe/public/js/frappe/utils/dashboard_utils.js
@@ -199,6 +199,55 @@ frappe.dashboard_utils = {
 		}
 
 		return filters;
+	},
+
+	get_dashboard_link_field() {
+		let field = {
+			label: __('Select Dashboard'),
+			fieldtype: 'Link',
+			fieldname: 'dashboard',
+			options: 'Dashboard',
+		}
+
+		if (!frappe.boot.developer_mode) {
+			field.get_query = () => {
+				return {
+					filters: {
+						is_standard: 0
+					}
+				};
+			};
+		}
+
+		return field;
+	},
+
+	get_add_to_dashboard_dialog(docname, doctype, method) {
+		const field = this.get_dashboard_link_field();
+
+		const dialog = new frappe.ui.Dialog({
+			title: __('Add to Dashboard'),
+			fields: [field],
+			primary_action: (values) => {
+				values.name = docname;
+				values.set_standard = frappe.boot.developer_mode;
+				frappe.xcall(
+					method,
+					{args: values}
+				).then(()=> {
+					let dashboard_route_html =
+						`<a href = "#dashboard/${values.dashboard}">${values.dashboard}</a>`;
+					let message =
+						__(`${doctype} ${values.name} added to Dashboard ` + dashboard_route_html);
+
+					frappe.msgprint(message);
+				});
+
+				dialog.hide();
+			}
+		});
+
+		return dialog;
 	}
 
 };
\ No newline at end of file

From cdd7cb2f177492e24423f3ac15bb575bbf94e22a Mon Sep 17 00:00:00 2001
From: prssanna <prssud@gmail.com>
Date: Wed, 22 Jul 2020 11:42:13 +0530
Subject: [PATCH 084/191] fix: filter out standard dashboards while creating
 from reports

---
 .../js/frappe/views/reports/query_report.js   | 35 +++++++++----------
 1 file changed, 17 insertions(+), 18 deletions(-)

diff --git a/frappe/public/js/frappe/views/reports/query_report.js b/frappe/public/js/frappe/views/reports/query_report.js
index 9b094149b8..777be2aaa1 100644
--- a/frappe/public/js/frappe/views/reports/query_report.js
+++ b/frappe/public/js/frappe/views/reports/query_report.js
@@ -157,6 +157,9 @@ frappe.views.QueryReport = class QueryReport extends frappe.views.BaseList {
 
 	add_card_to_dashboard() {
 		let field_options = frappe.report_utils.get_field_options_from_report(this.columns, this.raw_data);
+		const dashboard_field = frappe.dashboard_utils.get_dashboard_link_field();
+		const set_standard = frappe.boot.developer_mode;
+
 		const dialog = new frappe.ui.Dialog({
 			title: __('Create Card'),
 			fields: [
@@ -181,12 +184,7 @@ frappe.views.QueryReport = class QueryReport extends frappe.views.BaseList {
 					label: __('Add to Dashboard'),
 					fieldtype: 'Section Break'
 				},
-				{
-					fieldname: 'dashboard',
-					label: __('Choose Dashboard'),
-					fieldtype: 'Link',
-					options: 'Dashboard',
-				},
+				dashboard_field,
 				{
 					fieldname: 'cb_2',
 					fieldtype: 'Column Break'
@@ -202,7 +200,7 @@ frappe.views.QueryReport = class QueryReport extends frappe.views.BaseList {
 				if (!values.label) {
 					values.label = `${values.report_function} of ${toTitle(values.report_field)}`;
 				}
-				this.create_number_card(values, values.dashboard, values.label);
+				this.create_number_card(values, values.dashboard, values.label, set_standard);
 				dialog.hide();
 			}
 		});
@@ -213,27 +211,26 @@ frappe.views.QueryReport = class QueryReport extends frappe.views.BaseList {
 
 	add_chart_to_dashboard() {
 		if (this.chart_fields || this.chart_options) {
+			const dashboard_field = frappe.dashboard_utils.get_dashboard_link_field();
+			const set_standard = frappe.boot.developer_mode;
+
 			const dialog = new frappe.ui.Dialog({
 				title: __('Create Chart'),
 				fields: [
-					{
-						fieldname: 'dashboard',
-						label: 'Choose Dashboard',
-						fieldtype: 'Link',
-						options: 'Dashboard',
-					},
 					{
 						fieldname: 'dashboard_chart_name',
 						label: 'Chart Name',
 						fieldtype: 'Data',
-					}
+					},
+					dashboard_field,
 				],
 				primary_action_label: __('Add'),
 				primary_action: (values) => {
 					this.create_dashboard_chart(
 						this.chart_fields || this.chart_options,
 						values.dashboard,
-						values.dashboard_chart_name
+						values.dashboard_chart_name,
+						set_standard
 					);
 					dialog.hide();
 				}
@@ -245,12 +242,13 @@ frappe.views.QueryReport = class QueryReport extends frappe.views.BaseList {
 		}
 	}
 
-	create_number_card(values, dashboard_name, card_name) {
+	create_number_card(values, dashboard_name, card_name, set_standard) {
 		let args = {
 			'dashboard': dashboard_name || null,
 			'type': 'Report',
 			'report_name': this.report_name,
 			'filters_json': JSON.stringify(this.get_filter_values()),
+			set_standard: set_standard,
 		};
 		Object.assign(args, values);
 
@@ -263,7 +261,7 @@ frappe.views.QueryReport = class QueryReport extends frappe.views.BaseList {
 		);
 	}
 
-	create_dashboard_chart(chart_args, dashboard_name, chart_name) {
+	create_dashboard_chart(chart_args, dashboard_name, chart_name, set_standard) {
 		let args = {
 			'dashboard': dashboard_name || null,
 			'chart_type': 'Report',
@@ -271,7 +269,8 @@ frappe.views.QueryReport = class QueryReport extends frappe.views.BaseList {
 			'type': chart_args.chart_type || frappe.model.unscrub(chart_args.type),
 			'color': chart_args.color,
 			'filters_json': JSON.stringify(this.get_filter_values()),
-			'custom_options': {}
+			'custom_options': {},
+			'set_standard': set_standard,
 		};
 
 		for (let key in chart_args) {

From 7f1a5adb0e221452019076aa05b3dafae7d153e0 Mon Sep 17 00:00:00 2001
From: prssanna <prssud@gmail.com>
Date: Wed, 22 Jul 2020 11:43:37 +0530
Subject: [PATCH 085/191] fix: disable dashboard form only if doc is standard

---
 frappe/desk/doctype/dashboard/dashboard.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frappe/desk/doctype/dashboard/dashboard.js b/frappe/desk/doctype/dashboard/dashboard.js
index 237b549433..61300b920b 100644
--- a/frappe/desk/doctype/dashboard/dashboard.js
+++ b/frappe/desk/doctype/dashboard/dashboard.js
@@ -5,7 +5,7 @@ frappe.ui.form.on('Dashboard', {
 	refresh: function(frm) {
 		frm.add_custom_button(__("Show Dashboard"), () => frappe.set_route('dashboard', frm.doc.name));
 
-		if (!frappe.boot.developer_mode) {
+		if (!frappe.boot.developer_mode && frm.doc.is_standard) {
 			frm.disable_form();
 		}
 

From dd6a361058e425ec03d162f8e4f88a3251f5537a Mon Sep 17 00:00:00 2001
From: prssanna <prssud@gmail.com>
Date: Wed, 22 Jul 2020 11:44:21 +0530
Subject: [PATCH 086/191] fix: don't show is_standard if not in developer mode

---
 frappe/desk/doctype/dashboard/dashboard.json             | 3 ++-
 frappe/desk/doctype/dashboard_chart/dashboard_chart.json | 3 ++-
 frappe/desk/doctype/number_card/number_card.json         | 3 ++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/frappe/desk/doctype/dashboard/dashboard.json b/frappe/desk/doctype/dashboard/dashboard.json
index c7128823fe..0c54f1ee7f 100644
--- a/frappe/desk/doctype/dashboard/dashboard.json
+++ b/frappe/desk/doctype/dashboard/dashboard.json
@@ -52,6 +52,7 @@
   },
   {
    "default": "0",
+   "depends_on": "eval: frappe.boot.developer_mode",
    "fieldname": "is_standard",
    "fieldtype": "Check",
    "label": "Is Standard"
@@ -66,7 +67,7 @@
   }
  ],
  "links": [],
- "modified": "2020-07-10 17:48:19.468813",
+ "modified": "2020-07-22 11:23:37.858568",
  "modified_by": "Administrator",
  "module": "Desk",
  "name": "Dashboard",
diff --git a/frappe/desk/doctype/dashboard_chart/dashboard_chart.json b/frappe/desk/doctype/dashboard_chart/dashboard_chart.json
index a25d0cc6c5..f0616dddd0 100644
--- a/frappe/desk/doctype/dashboard_chart/dashboard_chart.json
+++ b/frappe/desk/doctype/dashboard_chart/dashboard_chart.json
@@ -238,6 +238,7 @@
   },
   {
    "default": "0",
+   "depends_on": "eval: frappe.boot.developer_mode",
    "fieldname": "is_standard",
    "fieldtype": "Check",
    "label": "Is Standard"
@@ -270,7 +271,7 @@
   }
  ],
  "links": [],
- "modified": "2020-07-21 16:37:07.763482",
+ "modified": "2020-07-22 11:32:51.185499",
  "modified_by": "Administrator",
  "module": "Desk",
  "name": "Dashboard Chart",
diff --git a/frappe/desk/doctype/number_card/number_card.json b/frappe/desk/doctype/number_card/number_card.json
index 333885a7f9..0d1cc279c8 100644
--- a/frappe/desk/doctype/number_card/number_card.json
+++ b/frappe/desk/doctype/number_card/number_card.json
@@ -113,6 +113,7 @@
   },
   {
    "default": "0",
+   "depends_on": "eval: frappe.boot.developer_mode",
    "fieldname": "is_standard",
    "fieldtype": "Check",
    "label": "Is Standard"
@@ -190,7 +191,7 @@
   }
  ],
  "links": [],
- "modified": "2020-07-18 17:08:22.882538",
+ "modified": "2020-07-22 11:26:32.039023",
  "modified_by": "Administrator",
  "module": "Desk",
  "name": "Number Card",

From 1bd610f858a29a0d32681d175b418bc675a2817d Mon Sep 17 00:00:00 2001
From: prssanna <prssud@gmail.com>
Date: Wed, 22 Jul 2020 11:51:32 +0530
Subject: [PATCH 087/191] fix: separate patch to rename is_custom field

---
 frappe/patches.txt                                    |  1 +
 .../create_custom_dashboards_cards_and_charts.py      |  5 -----
 .../rename_is_custom_field_in_dashboard_chart.py      | 11 +++++++++++
 3 files changed, 12 insertions(+), 5 deletions(-)
 create mode 100644 frappe/patches/v13_0/rename_is_custom_field_in_dashboard_chart.py

diff --git a/frappe/patches.txt b/frappe/patches.txt
index f8c767f5a3..b207a325cb 100644
--- a/frappe/patches.txt
+++ b/frappe/patches.txt
@@ -295,3 +295,4 @@ frappe.patches.v13_0.update_date_filters_in_user_settings
 frappe.patches.v13_0.update_duration_options
 frappe.patches.v13_0.replace_old_data_import # 2020-06-24
 frappe.patches.v13_0.create_custom_dashboards_cards_and_charts
+frappe.patches.v13_0.rename_is_custom_field_in_dashboard_chart
diff --git a/frappe/patches/v13_0/create_custom_dashboards_cards_and_charts.py b/frappe/patches/v13_0/create_custom_dashboards_cards_and_charts.py
index f61941bf01..9a075a22cc 100644
--- a/frappe/patches/v13_0/create_custom_dashboards_cards_and_charts.py
+++ b/frappe/patches/v13_0/create_custom_dashboards_cards_and_charts.py
@@ -1,7 +1,6 @@
 import frappe
 from frappe.model.naming import append_number_if_name_exists
 from frappe.utils.dashboard import get_dashboards_with_link
-from frappe.model.utils.rename_field import rename_field
 
 def execute():
 	if not frappe.db.table_exists('Dashboard Chart')\
@@ -9,14 +8,10 @@ def execute():
 		or not frappe.db.table_exists('Dashboard'):
 		return
 
-
 	frappe.reload_doc('desk', 'doctype', 'dashboard_chart')
 	frappe.reload_doc('desk', 'doctype', 'number_card')
 	frappe.reload_doc('desk', 'doctype', 'dashboard')
 
-	if frappe.db.has_column('Dashboard Chart', 'is_custom'):
-		rename_field('Dashboard Chart', 'is_custom', 'use_report_chart')
-
 	modified_charts = get_modified_docs('Dashboard Chart')
 	modified_cards = get_modified_docs('Number Card')
 	modified_dashboards = [doc.name for doc in get_modified_docs('Dashboard')]
diff --git a/frappe/patches/v13_0/rename_is_custom_field_in_dashboard_chart.py b/frappe/patches/v13_0/rename_is_custom_field_in_dashboard_chart.py
new file mode 100644
index 0000000000..90860e211b
--- /dev/null
+++ b/frappe/patches/v13_0/rename_is_custom_field_in_dashboard_chart.py
@@ -0,0 +1,11 @@
+import frappe
+from frappe.model.utils.rename_field import rename_field
+
+def execute():
+	if not frappe.db.table_exists('Dashboard Chart')
+		return
+
+	frappe.reload_doc('desk', 'doctype', 'dashboard_chart')
+
+	if frappe.db.has_column('Dashboard Chart', 'is_custom'):
+		rename_field('Dashboard Chart', 'is_custom', 'use_report_chart')
\ No newline at end of file

From c25100cb47260f2e898f85cd820b952735cd97e7 Mon Sep 17 00:00:00 2001
From: prssanna <prssud@gmail.com>
Date: Wed, 22 Jul 2020 11:59:17 +0530
Subject: [PATCH 088/191] style: fix formatting

---
 .../patches/v13_0/rename_is_custom_field_in_dashboard_chart.py  | 2 +-
 frappe/public/js/frappe/utils/dashboard_utils.js                | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/frappe/patches/v13_0/rename_is_custom_field_in_dashboard_chart.py b/frappe/patches/v13_0/rename_is_custom_field_in_dashboard_chart.py
index 90860e211b..4da0f8164a 100644
--- a/frappe/patches/v13_0/rename_is_custom_field_in_dashboard_chart.py
+++ b/frappe/patches/v13_0/rename_is_custom_field_in_dashboard_chart.py
@@ -2,7 +2,7 @@ import frappe
 from frappe.model.utils.rename_field import rename_field
 
 def execute():
-	if not frappe.db.table_exists('Dashboard Chart')
+	if not frappe.db.table_exists('Dashboard Chart'):
 		return
 
 	frappe.reload_doc('desk', 'doctype', 'dashboard_chart')
diff --git a/frappe/public/js/frappe/utils/dashboard_utils.js b/frappe/public/js/frappe/utils/dashboard_utils.js
index 4074404aa3..fca26d6ece 100644
--- a/frappe/public/js/frappe/utils/dashboard_utils.js
+++ b/frappe/public/js/frappe/utils/dashboard_utils.js
@@ -207,7 +207,7 @@ frappe.dashboard_utils = {
 			fieldtype: 'Link',
 			fieldname: 'dashboard',
 			options: 'Dashboard',
-		}
+		};
 
 		if (!frappe.boot.developer_mode) {
 			field.get_query = () => {

From 1f2cf125035185bd3c610702afa7de0969d7bbb8 Mon Sep 17 00:00:00 2001
From: Himanshu <himanshuwarekar@yahoo.com>
Date: Wed, 22 Jul 2020 14:14:05 +0530
Subject: [PATCH 089/191] Update
 frappe/website/doctype/help_article/templates/help_article.html

Co-authored-by: Prssanna Desai <prssud@gmail.com>
---
 frappe/website/doctype/help_article/templates/help_article.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frappe/website/doctype/help_article/templates/help_article.html b/frappe/website/doctype/help_article/templates/help_article.html
index f5583931e2..1b4bf123e6 100644
--- a/frappe/website/doctype/help_article/templates/help_article.html
+++ b/frappe/website/doctype/help_article/templates/help_article.html
@@ -24,7 +24,7 @@
 		<div class="text-muted small mr-2 mb-2">{{ _("Was this article helpful?") }}</div>
 		<button class="feedback btn btn-outline-primary btn-sm" data-value="Yes" style="width: 50px;">{{ _("Yes") }}</button>
 		<button class="feedback btn btn-outline-primary btn-sm" data-value="No" style="width: 50px;">{{ _("No") }}</button>
-		<button class="feedback-msg btn btn-sm disabled hide">{{ _("Thank you for your feedback!") }}</button>
+		<span class="feedback-msg small hidden">{{ _("Thank you for your feedback!") }}</span>
 	</div>
 </div>
 <div class="help-article-comments">

From 19ff07b53b4927fca53faae2f9adb82ad3159305 Mon Sep 17 00:00:00 2001
From: Deepesh Garg <deepeshgarg6@gmail.com>
Date: Wed, 22 Jul 2020 14:27:18 +0530
Subject: [PATCH 090/191] fix: Margin top for child table index checkboxes

---
 frappe/public/less/desk.less | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/frappe/public/less/desk.less b/frappe/public/less/desk.less
index 36ceed9bfa..d951178be0 100644
--- a/frappe/public/less/desk.less
+++ b/frappe/public/less/desk.less
@@ -789,6 +789,10 @@ li.user-progress {
 	position: relative;
 }
 
+.row-index input[type=checkbox] {
+	margin-top: 12px;
+}
+
 @checkbox-height: 14px;
 
 // custom font awesome checkbox

From 95aa4a72dcd81b98a9f318b35979964bdedbc032 Mon Sep 17 00:00:00 2001
From: prssanna <prssud@gmail.com>
Date: Wed, 22 Jul 2020 14:53:03 +0530
Subject: [PATCH 091/191] fix: reduce code complexity

---
 frappe/public/js/frappe/ui/filters/filter.js      | 8 +++++---
 frappe/public/js/frappe/ui/filters/filter_list.js | 3 +--
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/frappe/public/js/frappe/ui/filters/filter.js b/frappe/public/js/frappe/ui/filters/filter.js
index d4fb6db436..7c6d532f5c 100644
--- a/frappe/public/js/frappe/ui/filters/filter.js
+++ b/frappe/public/js/frappe/ui/filters/filter.js
@@ -249,9 +249,7 @@ frappe.ui.Filter = class {
 			let args = {};
 			if (this.filters_config[condition].depends_on) {
 				const field_name = this.filters_config[condition].depends_on;
-				const filter_value = this.base_list
-					? this.base_list.get_filter_value(field_name)
-					: this.filter_list.get_filter_value(field_name);
+				const filter_value = this.get_filter_value(field_name);
 				args[field_name] = filter_value;
 			}
 			frappe
@@ -267,6 +265,10 @@ frappe.ui.Filter = class {
 		}
 	}
 
+	get_filter_value(fieldname) {
+		return this.filter_list.get_filter_value(fieldname);
+	}
+
 	make_field(df, old_fieldtype) {
 		let old_text = this.field ? this.field.get_value() : null;
 		this.hide_invalid_conditions(df.fieldtype, df.original_type);
diff --git a/frappe/public/js/frappe/ui/filters/filter_list.js b/frappe/public/js/frappe/ui/filters/filter_list.js
index 7ae48bc7d9..9a35a9bb5f 100644
--- a/frappe/public/js/frappe/ui/filters/filter_list.js
+++ b/frappe/public/js/frappe/ui/filters/filter_list.js
@@ -104,8 +104,7 @@ frappe.ui.FilterGroup = class {
 			filter_items: (doctype, fieldname) => {
 				return !this.filter_exists([doctype, fieldname]);
 			},
-			base_list: this.base_list,
-			filter_list: this,
+			filter_list: this.base_list || this,
 		};
 		let filter = new frappe.ui.Filter(args);
 		this.filters.push(filter);

From 0c475792cd3f1860af674c9f0073855de4753665 Mon Sep 17 00:00:00 2001
From: prssanna <prssud@gmail.com>
Date: Wed, 22 Jul 2020 14:55:02 +0530
Subject: [PATCH 092/191] refactor: delete unused file filters.js

---
 frappe/public/js/frappe/ui/filters/filters.js | 684 ------------------
 1 file changed, 684 deletions(-)
 delete mode 100644 frappe/public/js/frappe/ui/filters/filters.js

diff --git a/frappe/public/js/frappe/ui/filters/filters.js b/frappe/public/js/frappe/ui/filters/filters.js
deleted file mode 100644
index a775413d39..0000000000
--- a/frappe/public/js/frappe/ui/filters/filters.js
+++ /dev/null
@@ -1,684 +0,0 @@
-// Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
-// MIT License. See license.txt
-
-frappe.ui.FilterList = Class.extend({
-	init: function(opts) {
-		$.extend(this, opts);
-		this.filters = [];
-		this.wrapper = this.parent;
-		this.stats = [];
-		this.make();
-		this.set_events();
-	},
-	make: function() {
-		this.wrapper.find('.show_filters, .filter_area').remove();
-		this.wrapper.append(`
-			<div class="show_filters">
-				<div class="set-filters">
-					<button
-						style="margin-right: 10px;"
-						class="btn btn-default btn-xs new-filter text-muted">
-						${__("Add Filter")}</button>
-				</div>
-			</div>
-			<div class="filter_area"></div>`);
-	},
-	set_events: function() {
-		var me = this;
-		// show filters
-		this.wrapper.find('.new-filter').bind('click', function() {
-			me.add_filter();
-		});
-
-		this.wrapper.find('.clear-filters').bind('click', function() {
-			me.clear_filters();
-			$('.date-range-picker').val('')
-			me.base_list.run();
-			$(this).addClass("hide");
-		});
-	},
-
-	show_filters: function() {
-		this.wrapper.find('.show_filters').toggle();
-		if(!this.filters.length) {
-			this.add_filter(this.doctype, 'name');
-			this.filters[0].wrapper.find(".filter_field input").focus();
-		}
-	},
-
-	clear_filters: function() {
-		$.each(this.filters, function(i, f) { f.remove(true); });
-		if(this.base_list.page.fields_dict) {
-			$.each(this.base_list.page.fields_dict, (key, value) => {
-				value.set_input('');
-			});
-		}
-		this.filters = [];
-	},
-
-	add_filter: function(doctype, fieldname, condition, value, hidden) {
-		// adds a new filter, returns true if filter has been added
-
-		// allow equal to be used as like
-		let base_filter = this.base_list.page.fields_dict[fieldname];
-		if (base_filter
-			&& (base_filter.df.condition==condition
-				|| (condition==='=' && base_filter.df.condition==='like'))) {
-			// if filter exists in base_list, then exit
-			this.base_list.page.fields_dict[fieldname].set_input(value);
-
-			return true;
-		}
-
-		if(doctype && fieldname
-			&& !frappe.meta.has_field(doctype, fieldname)
-			&& !in_list(frappe.model.std_fields_list, fieldname)) {
-			frappe.msgprint({
-				message: __('Filter {0} missing', [fieldname.bold()]),
-				title: 'Invalid Filter',
-				indicator: 'red'
-			});
-			return false;
-		}
-
-		this.wrapper.find('.show_filters').toggle(true);
-		var is_new_filter = arguments.length===0;
-
-		if (is_new_filter && this.wrapper.find(".is-new-filter:visible").length) {
-			// only allow 1 new filter at a time!
-			return false;
-		}
-
-		var filter = this.push_new_filter(doctype, fieldname, condition, value);
-		if (!filter) return;
-
-		if(this.wrapper.find('.clear-filters').hasClass("hide")) {
-			this.wrapper.find('.clear-filters').removeClass("hide");
-		}
-
-		if (filter && is_new_filter) {
-			filter.wrapper.addClass("is-new-filter");
-		} else {
-			filter.freeze();
-		}
-
-		if (hidden) {
-			filter.$btn_group.addClass("hide");
-		}
-
-		return true;
-	},
-	push_new_filter: function(doctype, fieldname, condition, value) {
-		if(this.filter_exists(doctype, fieldname, condition, value)) {
-			return;
-		}
-
-		// if standard filter exists, then clear it.
-		if(this.base_list.page.fields_dict[fieldname]) {
-			this.base_list.page.fields_dict[fieldname].set_input('');
-		}
-
-		var filter = new frappe.ui.Filter({
-			flist: this,
-			_doctype: doctype,
-			fieldname: fieldname,
-			condition: condition,
-			value: value
-		});
-
-		this.filters.push(filter);
-
-		return filter;
-	},
-
-	remove: function(filter) {
-		// remove `filter` from flist
-		for (var i in this.filters) {
-			if (this.filters[i] === filter) {
-				break;
-			}
-		}
-		if (i!==undefined) {
-			// remove index
-			this.filters.splice(i, 1);
-		}
-	},
-
-	filter_exists: function(doctype, fieldname, condition, value) {
-		var flag = false;
-		for(var i in this.filters) {
-			if(this.filters[i].field) {
-				var f = this.filters[i].get_value();
-
-				if(f[0]==doctype && f[1]==fieldname && f[2]==condition && f[3]==value) {
-					flag = true;
-				} else if($.isArray(value) && frappe.utils.arrays_equal(value, f[3])) {
-					flag = true;
-				}
-			}
-		}
-		return flag;
-	},
-
-	get_filters: function() {
-		// get filter values as dict
-		var values = [];
-		$.each(this.filters, function(i, filter) {
-			if(filter.field) {
-				filter.freeze();
-				values.push(filter.get_value());
-			}
-		});
-		this.base_list.update_standard_filters(values);
-
-		return values;
-	},
-
-	// remove hidden filters
-	update_filters: function() {
-		var fl = [];
-		$.each(this.filters, function(i, f) {
-			if(f.field) fl.push(f);
-		})
-		this.filters = fl;
-		if(this.filters.length === 0) {
-			this.wrapper.find('.clear-filters').addClass("hide");
-		}
-	},
-
-	get_filter: function(fieldname) {
-		for(var i in this.filters) {
-			if(this.filters[i].field && this.filters[i].field.df.fieldname==fieldname)
-				return this.filters[i];
-		}
-	},
-
-	get_formatted_value: function(field, val){
-		var value = val;
-
-		if(field.df.fieldname==="docstatus") {
-			value = {0:"Draft", 1:"Submitted", 2:"Cancelled"}[value] || value;
-		} else if(field.df.original_type==="Check") {
-			value = {0:"No", 1:"Yes"}[cint(value)];
-		} else if (field.df.original_type === "Duration") {
-			let duration_options = {
-				hide_days: field.df.hide_days,
-				hide_seconds: field.df.hide_seconds
-			};
-			value = frappe.utils.get_formatted_duration(value, duration_options);
-		}
-
-		value = frappe.format(value, field.df, {only_value: 1});
-		return value;
-	}
-});
-
-frappe.ui.Filter = Class.extend({
-	init: function(opts) {
-		$.extend(this, opts);
-
-		this.doctype = this.flist.doctype;
-		this.make();
-		this.make_select();
-		this.set_events();
-	},
-	make: function() {
-		this.wrapper = $(frappe.render_template("edit_filter", {}))
-			.appendTo(this.flist.wrapper.find('.filter_area'));
-	},
-	make_select: function() {
-		var me = this;
-		this.fieldselect = new frappe.ui.FieldSelect({
-			parent: this.wrapper.find('.fieldname_select_area'),
-			doctype: this.doctype,
-			filter_fields: this.filter_fields,
-			select: function(doctype, fieldname) {
-				me.set_field(doctype, fieldname);
-			}
-		});
-		if(this.fieldname) {
-			this.fieldselect.set_value(this._doctype || this.doctype, this.fieldname);
-		}
-	},
-	set_events: function() {
-		var me = this;
-
-		this.wrapper.find("a.remove-filter").on("click", function() {
-			me.remove();
-		});
-
-		this.wrapper.find(".set-filter-and-run").on("click", function() {
-			me.wrapper.removeClass("is-new-filter");
-			me.flist.base_list.run();
-			me.apply();
-		});
-
-		// add help for "in" codition
-		me.wrapper.find('.condition').change(function() {
-			if(!me.field) return;
-			var condition = $(this).val();
-			if(in_list(["in", "like", "not in", "not like"], condition)) {
-				me.set_field(me.field.df.parent, me.field.df.fieldname, 'Data', condition);
-				if(!me.field.desc_area) {
-					me.field.desc_area = $('<div class="text-muted small">').appendTo(me.field.wrapper);
-				}
-				// set description
-				me.field.desc_area.html((in_list(["in", "not in"], condition)==="in"
-					? __("values separated by commas")
-					: __("use % as wildcard"))+'</div>');
-			} else {
-				//if condition selected after refresh
-				me.set_field(me.field.df.parent, me.field.df.fieldname, null, condition);
-			}
-		});
-
-		// set the field
-		if(me.fieldname) {
-			// pre-sets given (could be via tags!)
-			return this.set_values(me._doctype, me.fieldname, me.condition, me.value);
-		} else {
-			me.set_field(me.doctype, 'name');
-		}
-	},
-
-	apply: function() {
-		var f = this.get_value();
-
-		this.flist.remove(this);
-		this.flist.push_new_filter(f[0], f[1], f[2], f[3]);
-		this.remove();
-	},
-
-	remove: function(dont_run) {
-		this.wrapper.remove();
-		this.$btn_group && this.$btn_group.remove();
-		this.field = null;
-		this.flist.update_filters();
-
-		if(!dont_run) {
-			this.flist.base_list.refresh(true);
-		}
-	},
-
-	set_values: function(doctype, fieldname, condition, value) {
-		// presents given (could be via tags!)
-		this.set_field(doctype, fieldname);
-
-		// change 0,1 to Yes, No for check field type
-		if(this.field.df.original_type==='Check') {
-			if(value==0) value = 'No';
-			else if(value==1) value = 'Yes';
-		}
-
-		if(condition) {
-			this.wrapper.find('.condition').val(condition).change();
-		}
-		if(value!=null) {
-			return this.field.set_value(value);
-		}
-	},
-
-	set_field: function(doctype, fieldname, fieldtype, condition) {
-		var me = this;
-
-		// set in fieldname (again)
-		var cur = me.field ? {
-			fieldname: me.field.df.fieldname,
-			fieldtype: me.field.df.fieldtype,
-			parent: me.field.df.parent,
-		} : {};
-
-		var original_docfield = me.fieldselect.fields_by_name[doctype][fieldname];
-		if(!original_docfield) {
-			frappe.msgprint(__("Field {0} is not selectable.", [fieldname]));
-			return;
-		}
-
-		var df = copy_dict(me.fieldselect.fields_by_name[doctype][fieldname]);
-
-		// filter field shouldn't be read only or hidden
-		df.read_only = 0;
-		df.hidden = 0;
-
-		if(!condition) this.set_default_condition(df, fieldtype);
-		this.set_fieldtype(df, fieldtype);
-
-		// called when condition is changed,
-		// don't change if all is well
-		if(me.field && cur.fieldname == fieldname && df.fieldtype == cur.fieldtype &&
-			df.parent == cur.parent) {
-			return;
-		}
-
-		// clear field area and make field
-		me.fieldselect.selected_doctype = doctype;
-		me.fieldselect.selected_fieldname = fieldname;
-
-		// save old text
-		var old_text = null;
-		if(me.field) {
-			old_text = me.field.get_value();
-		}
-
-		var field_area = me.wrapper.find('.filter_field').empty().get(0);
-		var f = frappe.ui.form.make_control({
-			df: df,
-			parent: field_area,
-			only_input: true,
-		})
-		f.refresh();
-
-		me.field = f;
-		if(old_text && me.field.df.fieldtype===cur.fieldtype) {
-			me.field.set_value(old_text);
-		}
-
-		// run on enter
-		$(me.field.wrapper).find(':input').keydown(function(ev) {
-			if(ev.which==13) {
-				me.flist.base_list.run();
-			}
-		})
-	},
-
-	set_fieldtype: function(df, fieldtype) {
-		// reset
-		if(df.original_type)
-			df.fieldtype = df.original_type;
-		else
-			df.original_type = df.fieldtype;
-
-		df.description = ''; df.reqd = 0;
-		df.ignore_link_validation = true;
-
-		// given
-		if(fieldtype) {
-			df.fieldtype = fieldtype;
-			return;
-		}
-
-		// scrub
-		if(df.fieldname=="docstatus") {
-			df.fieldtype="Select",
-			df.options=[
-				{value:0, label:__("Draft")},
-				{value:1, label:__("Submitted")},
-				{value:2, label:__("Cancelled")}
-			]
-		} else if(df.fieldtype=='Check') {
-			df.fieldtype='Select';
-			df.options='No\nYes';
-		} else if(['Text','Small Text','Text Editor','Code','Tag','Comments',
-			'Dynamic Link','Read Only','Assign'].indexOf(df.fieldtype)!=-1) {
-			df.fieldtype = 'Data';
-		} else if(df.fieldtype=='Link' && ['=', '!='].indexOf(this.wrapper.find('.condition').val())==-1) {
-			df.fieldtype = 'Data';
-		}
-		if(df.fieldtype==="Data" && (df.options || "").toLowerCase()==="email") {
-			df.options = null;
-		}
-		if(this.wrapper.find('.condition').val()== "Between" && (df.fieldtype == 'Date' || df.fieldtype == 'Datetime')){
-			df.fieldtype = 'DateRange';
-		}
-	},
-
-	set_default_condition: function(df, fieldtype) {
-		if(!fieldtype) {
-			// set as "like" for data fields
-			if (df.fieldtype == 'Data') {
-				this.wrapper.find('.condition').val('like');
-			} else if (df.fieldtype == 'Date' || df.fieldtype == 'Datetime'){
-				this.wrapper.find('.condition').val('Between');
-			}else{
-				this.wrapper.find('.condition').val('=');
-			}
-		}
-	},
-
-	get_value: function() {
-		return [this.fieldselect.selected_doctype,
-			this.field.df.fieldname, this.get_condition(), this.get_selected_value()];
-	},
-
-	get_selected_value: function() {
-		var val = this.field.get_value();
-
-		if(typeof val==='string') {
-			val = strip(val);
-		}
-
-		if(this.field.df.original_type == 'Check') {
-			val = (val=='Yes' ? 1 :0);
-		}
-
-		if(this.get_condition().indexOf('like', 'not like')!==-1) {
-			// automatically append wildcards
-			if(val) {
-				if(val.slice(0,1) !== "%") {
-					val = "%" + val;
-				}
-				if(val.slice(-1) !== "%") {
-					val = val + "%";
-				}
-			}
-		} else if(in_list(["in", "not in"], this.get_condition())) {
-			if(val) {
-				val = $.map(val.split(","), function(v) { return strip(v); });
-			}
-		} if(val === '%') {
-			val = "";
-		}
-
-		return val;
-	},
-
-	get_condition: function() {
-		return this.wrapper.find('.condition').val();
-	},
-
-	freeze: function() {
-		if(this.$btn_group) {
-			// already made, just hide the condition setter
-			this.set_filter_button_text();
-			this.wrapper.toggle(false);
-			return;
-		}
-
-		var me = this;
-
-		// add a button for new filter if missing
-		this.$btn_group = $(`<div class="btn-group">
-			<button class="btn btn-default btn-xs toggle-filter"
-				title="${ __("Edit Filter") }">
-			</button>
-			<button class="btn btn-default btn-xs remove-filter"
-				title="${ __("Remove Filter") }">
-				<i class="fa fa-remove text-muted"></i>
-			</button></div>`)
-			.insertAfter(this.flist.wrapper.find(".set-filters .new-filter"));
-
-		this.set_filter_button_text();
-
-		this.$btn_group.find(".remove-filter").on("click", function() {
-			me.remove();
-		});
-
-		this.$btn_group.find(".toggle-filter").on("click", function() {
-			$(this).closest('.show_filters').find('.filter_area').show();
-			me.wrapper.toggle();
-		})
-		this.wrapper.toggle(false);
-	},
-
-	set_filter_button_text: function() {
-		var value = this.get_selected_value();
-		value = this.flist.get_formatted_value(this.field, value);
-
-		// for translations
-		// __("like"), __("not like"), __("in")
-
-		this.$btn_group.find(".toggle-filter")
-			.html(repl('%(label)s %(condition)s "%(value)s"', {
-				label: __(this.field.df.label),
-				condition: __(this.get_condition()),
-				value: __(value),
-			}));
-	}
-
-});
-
-// <select> widget with all fields of a doctype as options
-frappe.ui.FieldSelect = Class.extend({
-	// opts parent, doctype, filter_fields, with_blank, select
-	init: function(opts) {
-		var me = this;
-		$.extend(this, opts);
-		this.fields_by_name = {};
-		this.options = [];
-		this.$select = $('<input class="form-control">')
-			.appendTo(this.parent)
-			.on("click", function () { $(this).select(); });
-		this.select_input = this.$select.get(0);
-		this.awesomplete = new Awesomplete(this.select_input, {
-			minChars: 0,
-			maxItems: 99,
-			autoFirst: true,
-			list: me.options,
-			item: function(item, input) {
-				return $(repl('<li class="filter-field-select"><p>%(label)s</p></li>', item))
-				.data("item.autocomplete", item)
-				.get(0);
-			}
-		});
-		this.$select.on("awesomplete-select", function(e) {
-			var o = e.originalEvent;
-			var value = o.text.value;
-			var item = me.awesomplete.get_item(value);
-			me.selected_doctype = item.doctype;
-			me.selected_fieldname = item.fieldname;
-			if(me.select) me.select(item.doctype, item.fieldname);
-		});
-		this.$select.on("awesomplete-selectcomplete", function(e) {
-			var o = e.originalEvent;
-			var value = o.text.value;
-			var item = me.awesomplete.get_item(value);
-			me.$select.val(item.label);
-		});
-
-		if(this.filter_fields) {
-			for(var i in this.filter_fields)
-				this.add_field_option(this.filter_fields[i])
-		} else {
-			this.build_options();
-		}
-		this.set_value(this.doctype, "name");
-		window.last_filter = this;
-	},
-	get_value: function() {
-		return this.selected_doctype ? this.selected_doctype + "." + this.selected_fieldname : null;
-	},
-	val: function(value) {
-		if(value===undefined) {
-			return this.get_value();
-		} else {
-			this.set_value(value);
-		}
-	},
-	clear: function() {
-		this.selected_doctype = null;
-		this.selected_fieldname = null;
-		this.$select.val("");
-	},
-	set_value: function(doctype, fieldname) {
-		var me = this;
-		this.clear();
-		if(!doctype) return;
-
-		// old style
-		if(doctype.indexOf(".")!==-1) {
-			var parts = doctype.split(".");
-			doctype = parts[0];
-			fieldname = parts[1];
-		}
-
-		$.each(this.options, function(i, v) {
-			if(v.doctype===doctype && v.fieldname===fieldname) {
-				me.selected_doctype = doctype;
-				me.selected_fieldname = fieldname;
-				me.$select.val(v.label);
-				return false;
-			}
-		});
-	},
-	build_options: function() {
-		var me = this;
-		me.table_fields = [];
-		var std_filters = $.map(frappe.model.std_fields, function(d) {
-			var opts = {parent: me.doctype}
-			if(d.fieldname=="name") opts.options = me.doctype;
-			return $.extend(copy_dict(d), opts);
-		});
-
-		// add parenttype column
-		var doctype_obj = locals['DocType'][me.doctype];
-		if(doctype_obj && cint(doctype_obj.istable)) {
-			std_filters = std_filters.concat([{
-				fieldname: 'parent',
-				fieldtype: 'Data',
-				label: 'Parent',
-				parent: me.doctype,
-			}]);
-		}
-
-		// blank
-		if(this.with_blank) {
-			this.options.push({
-				label:"",
-				value:"",
-			})
-		}
-
-		// main table
-		var main_table_fields = std_filters.concat(frappe.meta.docfield_list[me.doctype]);
-		$.each(frappe.utils.sort(main_table_fields, "label", "string"), function(i, df) {
-			// show fields where user has read access and if report hide flag is not set
-			if(frappe.perm.has_perm(me.doctype, df.permlevel, "read") && !df.report_hide)
-				me.add_field_option(df);
-		});
-
-		// child tables
-		$.each(me.table_fields, function(i, table_df) {
-			if(table_df.options) {
-				var child_table_fields = [].concat(frappe.meta.docfield_list[table_df.options]);
-				$.each(frappe.utils.sort(child_table_fields, "label", "string"), function(i, df) {
-					// show fields where user has read access and if report hide flag is not set
-					if(frappe.perm.has_perm(me.doctype, df.permlevel, "read") && !df.report_hide)
-						me.add_field_option(df);
-				});
-			}
-		});
-	},
-
-	add_field_option: function(df) {
-		var me = this;
-		if(me.doctype && df.parent==me.doctype) {
-			var label = __(df.label);
-			var table = me.doctype;
-			if(frappe.model.table_fields.includes(df.fieldtype)) me.table_fields.push(df);
-		} else {
-			var label = __(df.label) + ' (' + __(df.parent) + ')';
-			var table = df.parent;
-		}
-		if(frappe.model.no_value_type.indexOf(df.fieldtype) == -1 &&
-			!(me.fields_by_name[df.parent] && me.fields_by_name[df.parent][df.fieldname])) {
-			this.options.push({
-				label: label,
-				value: table + "." + df.fieldname,
-				fieldname: df.fieldname,
-				doctype: df.parent
-			});
-			if(!me.fields_by_name[df.parent]) me.fields_by_name[df.parent] = {};
-			me.fields_by_name[df.parent][df.fieldname] = df;
-		}
-	},
-})

From 64a03125460fec1ac6e6c7352a3f5e68c8f7ee08 Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Wed, 22 Jul 2020 15:51:07 +0530
Subject: [PATCH 093/191] feat: always render footer links layout

---
 frappe/templates/includes/footer/footer_links.html | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/frappe/templates/includes/footer/footer_links.html b/frappe/templates/includes/footer/footer_links.html
index fe9f69fed3..e8bfdadb7f 100644
--- a/frappe/templates/includes/footer/footer_links.html
+++ b/frappe/templates/includes/footer/footer_links.html
@@ -7,8 +7,6 @@
 	{%- endif -%}
 </a>
 {% endmacro %}
-
-{% if footer_items -%}
 <div class="footer-links">
 	<div class="row">
 		<div class="footer-col-left col-sm-6">
@@ -24,4 +22,3 @@
 		</div>
 	</div>
 </div>
-{% endif %}

From 0ba3fb5a92d3bfca9b781f5cebb984bf08328392 Mon Sep 17 00:00:00 2001
From: Gavin D'souza <gavin18d@gmail.com>
Date: Wed, 22 Jul 2020 15:53:10 +0530
Subject: [PATCH 094/191] fix: proper sequence of backups

---
 frappe/utils/backups.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/frappe/utils/backups.py b/frappe/utils/backups.py
index 707a9ac511..56f3b9cafb 100644
--- a/frappe/utils/backups.py
+++ b/frappe/utils/backups.py
@@ -224,8 +224,8 @@ def fetch_latest_backups(with_files=True, recent=3):
 	odb.get_backup(older_than=recent, ignore_files=not with_files)
 
 	return {
-		"database": odb.backup_path_files,
-		"public": odb.backup_path_db,
+		"database": odb.backup_path_db,
+		"public": odb.backup_path_files,
 		"private": odb.backup_path_private_files,
 		"config": odb.site_config_backup_path
 	}

From c64df2787f8328e6d7e46c4cb722ec27820eb722 Mon Sep 17 00:00:00 2001
From: prssanna <prssud@gmail.com>
Date: Wed, 22 Jul 2020 16:51:17 +0530
Subject: [PATCH 095/191] fix: use get_filter_value in filter_list

---
 frappe/public/js/frappe/ui/filters/filter.js | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/frappe/public/js/frappe/ui/filters/filter.js b/frappe/public/js/frappe/ui/filters/filter.js
index 7c6d532f5c..bfc0b1449d 100644
--- a/frappe/public/js/frappe/ui/filters/filter.js
+++ b/frappe/public/js/frappe/ui/filters/filter.js
@@ -249,7 +249,7 @@ frappe.ui.Filter = class {
 			let args = {};
 			if (this.filters_config[condition].depends_on) {
 				const field_name = this.filters_config[condition].depends_on;
-				const filter_value = this.get_filter_value(field_name);
+				const filter_value = this.filter_list.get_filter_value(fieldname);
 				args[field_name] = filter_value;
 			}
 			frappe
@@ -265,10 +265,6 @@ frappe.ui.Filter = class {
 		}
 	}
 
-	get_filter_value(fieldname) {
-		return this.filter_list.get_filter_value(fieldname);
-	}
-
 	make_field(df, old_fieldtype) {
 		let old_text = this.field ? this.field.get_value() : null;
 		this.hide_invalid_conditions(df.fieldtype, df.original_type);

From a2b2c9c926b1fd2be8192499dc8a21b250019eaa Mon Sep 17 00:00:00 2001
From: Faris Ansari <netchamp.faris@gmail.com>
Date: Wed, 22 Jul 2020 17:54:48 +0530
Subject: [PATCH 096/191] fix: Validate select values in Column

---
 frappe/core/doctype/data_import/importer.py | 29 ++++++++++++++++-----
 1 file changed, 22 insertions(+), 7 deletions(-)

diff --git a/frappe/core/doctype/data_import/importer.py b/frappe/core/doctype/data_import/importer.py
index 910e42af1a..729f4e8956 100644
--- a/frappe/core/doctype/data_import/importer.py
+++ b/frappe/core/doctype/data_import/importer.py
@@ -615,7 +615,7 @@ class Row:
 	def validate_value(self, value, col):
 		df = col.df
 		if df.fieldtype == "Select":
-			select_options = [d for d in (df.options or '').split('\n') if d]
+			select_options = get_select_options(df)
 			if select_options and value not in select_options:
 				options_string = ", ".join([frappe.bold(d) for d in select_options])
 				msg = _("Value must be one of {0}").format(options_string)
@@ -971,12 +971,23 @@ class Column:
 			# guess date format
 			self.date_format = self.guess_date_format_for_column()
 			if not self.date_format:
-				self.date_format = '%Y-%m-%d'
-				self.warnings.append({
-					'col': self.column_number,
-					'message': _("Date format could not determined from the values in this column. Defaulting to yyyy-mm-dd."),
-					'type': 'info'
-				})
+		elif self.df.fieldtype == "Select":
+			options = get_select_options(self.df)
+			if options:
+				values = list(set([cstr(v) for v in self.column_values[1:] if v]))
+				invalid = list(set(values) - set(options))
+				if invalid:
+					valid_values = ", ".join([frappe.bold(o) for o in options])
+					invalid_values = ", ".join([frappe.bold(i) for i in invalid])
+					self.warnings.append(
+						{
+							"col": self.column_number,
+							"message": (
+								"The following values are invalid: {0}. Values must be"
+								" one of {1}".format(invalid_values, valid_values)
+							),
+						}
+					)
 
 	def as_dict(self):
 		d = frappe._dict()
@@ -1170,3 +1181,7 @@ def df_as_json(df):
 		'parent': df.parent,
 		'default': df.default
 	}
+
+
+def get_select_options(df):
+	return [d for d in (df.options or "").split("\n") if d]

From 5dcb910ae9e040f76b1e7e18354e31c2dd7ce729 Mon Sep 17 00:00:00 2001
From: Faris Ansari <netchamp.faris@gmail.com>
Date: Wed, 22 Jul 2020 17:57:01 +0530
Subject: [PATCH 097/191] fix: Set default date format for parsed date values

---
 frappe/core/doctype/data_import/importer.py | 32 ++++++++++++++++-----
 1 file changed, 25 insertions(+), 7 deletions(-)

diff --git a/frappe/core/doctype/data_import/importer.py b/frappe/core/doctype/data_import/importer.py
index 729f4e8956..47113d35cd 100644
--- a/frappe/core/doctype/data_import/importer.py
+++ b/frappe/core/doctype/data_import/importer.py
@@ -7,7 +7,7 @@ import io
 import frappe
 import timeit
 import json
-from datetime import datetime
+from datetime import datetime, date
 from frappe import _
 from frappe.utils import cint, flt, update_progress_bar, cstr
 from frappe.utils.csvutils import read_csv_content, get_csv_content_from_google_sheets
@@ -668,7 +668,7 @@ class Row:
 
 	def parse_value(self, value, col):
 		df = col.df
-		if isinstance(value, datetime) and df.fieldtype in ["Date", "Datetime"]:
+		if isinstance(value, (datetime, date)) and df.fieldtype in ["Date", "Datetime"]:
 			return value
 
 		value = cstr(value)
@@ -689,7 +689,7 @@ class Row:
 		return value
 
 	def get_date(self, value, column):
-		if isinstance(value, datetime):
+		if isinstance(value, (datetime, date)):
 			return value
 
 		date_format = column.date_format
@@ -918,13 +918,20 @@ class Column:
 		self.skip_import = skip_import
 
 	def guess_date_format_for_column(self):
-		""" Guesses date format for a column by parsing all the values in the column,
+		"""Guesses date format for a column by parsing all the values in the column,
 		getting the date format and then returning the one which has the maximum frequency
 		"""
 
-		date_formats = [
-			frappe.utils.guess_date_format(d) for d in self.column_values if isinstance(d, str)
-		]
+		def guess_date_format(d):
+			if isinstance(d, (datetime, date)):
+				if self.df.fieldtype == "Date":
+					return "%Y-%m-%d"
+				if self.df.fieldtype == "Datetime":
+					return "%Y-%m-%d %H:%M:%S"
+			if isinstance(d, str):
+				return frappe.utils.guess_date_format(d)
+
+		date_formats = [guess_date_format(d) for d in self.column_values]
 		date_formats = [d for d in date_formats if d]
 		if not date_formats:
 			return
@@ -971,6 +978,17 @@ class Column:
 			# guess date format
 			self.date_format = self.guess_date_format_for_column()
 			if not self.date_format:
+				self.date_format = "%Y-%m-%d"
+				self.warnings.append(
+					{
+						"col": self.column_number,
+						"message": _(
+							"Date format could not be determined from the values in"
+							" this column. Defaulting to yyyy-mm-dd."
+						),
+						"type": "info",
+					}
+				)
 		elif self.df.fieldtype == "Select":
 			options = get_select_options(self.df)
 			if options:

From 015ab803a36355cd02df0e640dba0897515d8ebf Mon Sep 17 00:00:00 2001
From: Faris Ansari <netchamp.faris@gmail.com>
Date: Wed, 22 Jul 2020 17:57:13 +0530
Subject: [PATCH 098/191] style: formatting

---
 frappe/core/doctype/data_import/importer.py | 63 ++++++++++-----------
 1 file changed, 31 insertions(+), 32 deletions(-)

diff --git a/frappe/core/doctype/data_import/importer.py b/frappe/core/doctype/data_import/importer.py
index 47113d35cd..6bc8b0586f 100644
--- a/frappe/core/doctype/data_import/importer.py
+++ b/frappe/core/doctype/data_import/importer.py
@@ -233,7 +233,7 @@ class Importer:
 			return updated_doc
 		else:
 			# throw if no changes
-			frappe.throw('No changes to update')
+			frappe.throw("No changes to update")
 
 	def get_eta(self, current, total, processing_time):
 		self.last_eta = getattr(self, "last_eta", 0)
@@ -322,7 +322,7 @@ class ImportFile:
 		if isinstance(file, frappe.string_types):
 			if frappe.db.exists("File", {"file_url": file}):
 				self.file_doc = frappe.get_doc("File", {"file_url": file})
-			elif 'docs.google.com/spreadsheets' in file:
+			elif "docs.google.com/spreadsheets" in file:
 				self.google_sheets_url = file
 			elif os.path.exists(file):
 				self.file_path = file
@@ -348,7 +348,7 @@ class ImportFile:
 
 		elif self.google_sheets_url:
 			content = get_csv_content_from_google_sheets(self.google_sheets_url)
-			extension = 'csv'
+			extension = "csv"
 
 		if not content:
 			frappe.throw(_("Invalid or corrupted content for import"))
@@ -620,11 +620,7 @@ class Row:
 				options_string = ", ".join([frappe.bold(d) for d in select_options])
 				msg = _("Value must be one of {0}").format(options_string)
 				self.warnings.append(
-					{
-						"row": self.row_number,
-						"field": df_as_json(df),
-						"message": msg,
-					}
+					{"row": self.row_number, "field": df_as_json(df), "message": msg,}
 				)
 				return
 
@@ -635,11 +631,7 @@ class Row:
 					frappe.bold(value), frappe.bold(df.options)
 				)
 				self.warnings.append(
-					{
-						"row": self.row_number,
-						"field": df_as_json(df),
-						"message": msg,
-					}
+					{"row": self.row_number, "field": df_as_json(df), "message": msg,}
 				)
 				return
 		elif df.fieldtype in ["Date", "Datetime"]:
@@ -786,9 +778,7 @@ class Header(Row):
 		for j, header in enumerate(row):
 			column_values = [get_item_at_index(r, j) for r in raw_data]
 			map_to_field = column_to_field_map.get(str(j))
-			column = Column(
-				j, header, self.doctype, column_values, map_to_field, self.seen
-			)
+			column = Column(j, header, self.doctype, column_values, map_to_field, self.seen)
 			self.seen.append(header)
 			self.columns.append(column)
 
@@ -962,18 +952,26 @@ class Column:
 		if not self.df:
 			return
 
-		if self.df.fieldtype == 'Link':
+		if self.df.fieldtype == "Link":
 			# find all values that dont exist
 			values = list(set([cstr(v) for v in self.column_values[1:] if v]))
-			exists = [d.name for d in frappe.db.get_all(self.df.options, filters={'name': ('in', values)})]
+			exists = [
+				d.name for d in frappe.db.get_all(self.df.options, filters={"name": ("in", values)})
+			]
 			not_exists = list(set(values) - set(exists))
 			if not_exists:
-				missing_values = ', '.join(not_exists)
-				self.warnings.append({
-					'col': self.column_number,
-					'message': "The following values do not exist for {}: {}".format(self.df.options, missing_values),
-					'type': 'warning'
-				})
+				missing_values = ", ".join(not_exists)
+				self.warnings.append(
+					{
+						"col": self.column_number,
+						"message": (
+							"The following values do not exist for {}: {}".format(
+								self.df.options, missing_values
+							)
+						),
+						"type": "warning",
+					}
+				)
 		elif self.df.fieldtype in ("Date", "Time", "Datetime"):
 			# guess date format
 			self.date_format = self.guess_date_format_for_column()
@@ -1016,7 +1014,7 @@ class Column:
 		d.map_to_field = self.map_to_field
 		d.date_format = self.date_format
 		d.df = self.df
-		if hasattr(self.df, 'is_child_table_field'):
+		if hasattr(self.df, "is_child_table_field"):
 			d.is_child_table_field = self.df.is_child_table_field
 			d.child_table_df = self.df.child_table_df
 		d.skip_import = self.skip_import
@@ -1096,7 +1094,7 @@ def build_fields_dict_for_column_matching(parent_doctype):
 		# other fields
 		fields = get_standard_fields(doctype) + frappe.get_meta(doctype).fields
 		for df in fields:
-			label = (df.label or '').strip()
+			label = (df.label or "").strip()
 			fieldtype = df.fieldtype or "Data"
 			parent = df.parent or parent_doctype
 			if fieldtype not in no_value_fields:
@@ -1190,14 +1188,15 @@ def get_user_format(date_format):
 		.replace("%d", "dd")
 	)
 
+
 def df_as_json(df):
 	return {
-		'fieldname': df.fieldname,
-		'fieldtype': df.fieldtype,
-		'label': df.label,
-		'options': df.options,
-		'parent': df.parent,
-		'default': df.default
+		"fieldname": df.fieldname,
+		"fieldtype": df.fieldtype,
+		"label": df.label,
+		"options": df.options,
+		"parent": df.parent,
+		"default": df.default,
 	}
 
 

From e34e48bb2f503c20899b4f4e6f56ca74ffbbb1ee Mon Sep 17 00:00:00 2001
From: Faris Ansari <netchamp.faris@gmail.com>
Date: Wed, 22 Jul 2020 17:57:57 +0530
Subject: [PATCH 099/191] fix: Show Column Name in warnings header

---
 frappe/core/doctype/data_import/data_import.js | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/frappe/core/doctype/data_import/data_import.js b/frappe/core/doctype/data_import/data_import.js
index 6a922618cb..0e827a42d8 100644
--- a/frappe/core/doctype/data_import/data_import.js
+++ b/frappe/core/doctype/data_import/data_import.js
@@ -317,6 +317,7 @@ frappe.ui.form.on('Data Import', {
 	},
 
 	show_import_warnings(frm, preview_data) {
+		let columns = preview_data.columns;
 		let warnings = JSON.parse(frm.doc.template_warnings || '[]');
 		warnings = warnings.concat(preview_data.warnings || []);
 
@@ -367,11 +368,13 @@ frappe.ui.form.on('Data Import', {
 			.map(warning => {
 				let header = '';
 				if (warning.col) {
-					header = __('Column {0}', [warning.col]);
+					let column_number = `<span class="text-uppercase">${__('Column {0}', [warning.col])}</span>`;
+					let column_header = columns[warning.col].header_title;
+					header = `${column_number} (${column_header})`;
 				}
 				return `
 					<div class="warning" data-col="${warning.col}">
-						<h5 class="text-uppercase">${header}</h5>
+						<h5>${header}</h5>
 						<div class="body">${warning.message}</div>
 					</div>
 				`;

From de07437015dd3a21cb1a4db1bc0fdf68230a35a3 Mon Sep 17 00:00:00 2001
From: Faris Ansari <netchamp.faris@gmail.com>
Date: Wed, 22 Jul 2020 17:58:16 +0530
Subject: [PATCH 100/191] fix: Show Pending imports as Not Started

---
 frappe/core/doctype/data_import/data_import_list.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/frappe/core/doctype/data_import/data_import_list.js b/frappe/core/doctype/data_import/data_import_list.js
index 1dee4319f9..0eb05aa354 100644
--- a/frappe/core/doctype/data_import/data_import_list.js
+++ b/frappe/core/doctype/data_import/data_import_list.js
@@ -17,6 +17,7 @@ frappe.listview_settings['Data Import'] = {
 	get_indicator: function(doc) {
 		var colors = {
 			'Pending': 'orange',
+			'Not Started': 'orange',
 			'Partial Success': 'orange',
 			'Success': 'green',
 			'In Progress': 'orange',
@@ -26,6 +27,9 @@ frappe.listview_settings['Data Import'] = {
 		if (imports_in_progress.includes(doc.name)) {
 			status = 'In Progress';
 		}
+		if (status == 'Pending') {
+			status = 'Not Started';
+		}
 		return [__(status), colors[status], 'status,=,' + doc.status];
 	},
 	formatters: {

From b0786fd5e5ade05555f16d4e0a1b50a6bbe611d0 Mon Sep 17 00:00:00 2001
From: Faris Ansari <netchamp.faris@gmail.com>
Date: Wed, 22 Jul 2020 17:58:36 +0530
Subject: [PATCH 101/191] fix: Human friendly time format

---
 frappe/public/js/frappe/data_import/import_preview.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/frappe/public/js/frappe/data_import/import_preview.js b/frappe/public/js/frappe/data_import/import_preview.js
index 4edcb87aeb..6c17cb4351 100644
--- a/frappe/public/js/frappe/data_import/import_preview.js
+++ b/frappe/public/js/frappe/data_import/import_preview.js
@@ -98,6 +98,9 @@ frappe.data_import.ImportPreview = class ImportPreview {
 					.replace('%y', 'yy')
 					.replace('%m', 'mm')
 					.replace('%d', 'dd')
+					.replace('%H', 'HH')
+					.replace('%M', 'mm')
+					.replace('%S', 'ss')
 				: null;
 
 			let column_title = `<span class="indicator green">
@@ -354,4 +357,4 @@ function get_fields_as_options(doctype, column_map) {
 			});
 		})
 	);
-}
\ No newline at end of file
+}

From b541ffac68d0ff140c937d40a2a2648ff754b0c2 Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scmmishra@users.noreply.github.com>
Date: Wed, 22 Jul 2020 19:30:11 +0530
Subject: [PATCH 102/191] Revert "fix: set page actions after setting read
 only"

---
 frappe/public/js/frappe/form/form.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/frappe/public/js/frappe/form/form.js b/frappe/public/js/frappe/form/form.js
index 43128065bc..c0b76ee94d 100644
--- a/frappe/public/js/frappe/form/form.js
+++ b/frappe/public/js/frappe/form/form.js
@@ -1409,7 +1409,6 @@ frappe.ui.form.Form = class FrappeForm {
 			};
 		}
 		this.perm = perm;
-		this.toolbar.set_page_action();
 	}
 
 	trigger(event, doctype, docname) {

From 4b7e36f90da10a8c49fdbb827ea922e1f548e1e5 Mon Sep 17 00:00:00 2001
From: Faris Ansari <netchamp.faris@gmail.com>
Date: Wed, 22 Jul 2020 19:30:17 +0530
Subject: [PATCH 103/191] fix: Handle child table row additions

---
 frappe/core/doctype/data_import/importer.py | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/frappe/core/doctype/data_import/importer.py b/frappe/core/doctype/data_import/importer.py
index 6bc8b0586f..34e53488e5 100644
--- a/frappe/core/doctype/data_import/importer.py
+++ b/frappe/core/doctype/data_import/importer.py
@@ -602,12 +602,20 @@ class Row:
 
 		is_table = frappe.get_meta(doctype).istable
 		is_update = self.import_type == UPDATE
-		if is_table and is_update and doc.get("name") in INVALID_VALUES:
-			# for table rows being inserted in update
-			# create a new doc with defaults set
-			new_doc = frappe.new_doc(doctype, as_dict=True)
-			new_doc.update(doc)
-			doc = new_doc
+		if is_table and is_update:
+			# check if the row already exists
+			# if yes, fetch the original doc so that it is not updated
+			# if no, create a new doc
+			id_field = get_id_field(doctype)
+			id_value = doc.get(id_field.fieldname)
+			if id_value and frappe.db.exists(doctype, id_value):
+				doc = frappe.get_doc(doctype, id_value)
+			else:
+				# for table rows being inserted in update
+				# create a new doc with defaults set
+				new_doc = frappe.new_doc(doctype, as_dict=True)
+				new_doc.update(doc)
+				doc = new_doc
 
 		self.check_mandatory_fields(doctype, doc, table_df)
 		return doc

From dd038a0cc201f0b5061864b8960892a419b4c0d0 Mon Sep 17 00:00:00 2001
From: Faris Ansari <netchamp.faris@gmail.com>
Date: Wed, 22 Jul 2020 19:30:41 +0530
Subject: [PATCH 104/191] fix: Show autoname column instead of ID in export

---
 .../js/frappe/data_import/data_exporter.js    | 22 ++++++++++++-------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/frappe/public/js/frappe/data_import/data_exporter.js b/frappe/public/js/frappe/data_import/data_exporter.js
index f6af338235..8651f2083d 100644
--- a/frappe/public/js/frappe/data_import/data_exporter.js
+++ b/frappe/public/js/frappe/data_import/data_exporter.js
@@ -274,23 +274,29 @@ frappe.data_import.DataExporter = class DataExporter {
 			? this.column_map[child_fieldname]
 			: this.column_map[doctype];
 
-		let is_field_mandatory = df => (df.fieldname === 'name' && !child_fieldname)
-			|| (df.reqd && this.exporting_for == 'Insert New Records');
+		let is_field_mandatory = df => {
+			if (df.reqd && this.exporting_for == 'Insert New Records') {
+				return true;
+			}
+			if (autoname_field && df.fieldname == autoname_field.fieldname) {
+				return true;
+			}
+			if (df.fieldname === 'name') {
+				return true;
+			}
+			return false;
+		}
 
 		return fields
 			.filter(df => {
-				if (autoname_field && df.fieldname === autoname_field.fieldname) {
+				if (autoname_field && df.fieldname === 'name') {
 					return false;
 				}
 				return true;
 			})
 			.map(df => {
-				let label = __(df.label);
-				if (autoname_field && df.fieldname === 'name') {
-					label = label + ` (${__(autoname_field.label)})`;
-				}
 				return {
-					label,
+					label: __(df.label),
 					value: df.fieldname,
 					danger: is_field_mandatory(df),
 					checked: false,

From 5558b20834fa0800da42a6dbab71b1e308c8e863 Mon Sep 17 00:00:00 2001
From: Faris Ansari <netchamp.faris@gmail.com>
Date: Wed, 22 Jul 2020 19:52:56 +0530
Subject: [PATCH 105/191] style: missing semicolon

---
 frappe/public/js/frappe/data_import/data_exporter.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frappe/public/js/frappe/data_import/data_exporter.js b/frappe/public/js/frappe/data_import/data_exporter.js
index 8651f2083d..dee4839b34 100644
--- a/frappe/public/js/frappe/data_import/data_exporter.js
+++ b/frappe/public/js/frappe/data_import/data_exporter.js
@@ -285,7 +285,7 @@ frappe.data_import.DataExporter = class DataExporter {
 				return true;
 			}
 			return false;
-		}
+		};
 
 		return fields
 			.filter(df => {

From 51a473336a56fa559ba2b3b7438495b3dcc6604c Mon Sep 17 00:00:00 2001
From: Deepesh Garg <deepeshgarg6@gmail.com>
Date: Wed, 22 Jul 2020 21:55:56 +0530
Subject: [PATCH 106/191] fix: Margin top for child table index checkboxes

---
 frappe/public/less/desk.less      | 4 ----
 frappe/public/less/form_grid.less | 4 ++++
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/frappe/public/less/desk.less b/frappe/public/less/desk.less
index d951178be0..36ceed9bfa 100644
--- a/frappe/public/less/desk.less
+++ b/frappe/public/less/desk.less
@@ -789,10 +789,6 @@ li.user-progress {
 	position: relative;
 }
 
-.row-index input[type=checkbox] {
-	margin-top: 12px;
-}
-
 @checkbox-height: 14px;
 
 // custom font awesome checkbox
diff --git a/frappe/public/less/form_grid.less b/frappe/public/less/form_grid.less
index 5cb04a252c..d9e7d8bceb 100644
--- a/frappe/public/less/form_grid.less
+++ b/frappe/public/less/form_grid.less
@@ -98,6 +98,10 @@
 	text-align: right;
 }
 
+.grid-row .grid-row-check {
+	margin-top: 12px;
+}
+
 .grid-row > .row {
 	.col:last-child {
 		margin-right: -10px;

From 6187de8e3da34cc4f0f74198f1148170c3d9d83d Mon Sep 17 00:00:00 2001
From: prssanna <prssud@gmail.com>
Date: Thu, 23 Jul 2020 11:12:13 +0530
Subject: [PATCH 107/191] fix: make is_standard read only if not in developer
 mode

---
 frappe/desk/doctype/dashboard/dashboard.json             | 6 +++---
 frappe/desk/doctype/dashboard_chart/dashboard_chart.json | 6 +++---
 frappe/desk/doctype/number_card/number_card.json         | 6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/frappe/desk/doctype/dashboard/dashboard.json b/frappe/desk/doctype/dashboard/dashboard.json
index 0c54f1ee7f..95b0846452 100644
--- a/frappe/desk/doctype/dashboard/dashboard.json
+++ b/frappe/desk/doctype/dashboard/dashboard.json
@@ -52,10 +52,10 @@
   },
   {
    "default": "0",
-   "depends_on": "eval: frappe.boot.developer_mode",
    "fieldname": "is_standard",
    "fieldtype": "Check",
-   "label": "Is Standard"
+   "label": "Is Standard",
+   "read_only_depends_on": "eval: !frappe.boot.developer_mode"
   },
   {
    "depends_on": "eval: doc.is_standard",
@@ -67,7 +67,7 @@
   }
  ],
  "links": [],
- "modified": "2020-07-22 11:23:37.858568",
+ "modified": "2020-07-23 11:05:41.890459",
  "modified_by": "Administrator",
  "module": "Desk",
  "name": "Dashboard",
diff --git a/frappe/desk/doctype/dashboard_chart/dashboard_chart.json b/frappe/desk/doctype/dashboard_chart/dashboard_chart.json
index f0616dddd0..d4bba53068 100644
--- a/frappe/desk/doctype/dashboard_chart/dashboard_chart.json
+++ b/frappe/desk/doctype/dashboard_chart/dashboard_chart.json
@@ -238,10 +238,10 @@
   },
   {
    "default": "0",
-   "depends_on": "eval: frappe.boot.developer_mode",
    "fieldname": "is_standard",
    "fieldtype": "Check",
-   "label": "Is Standard"
+   "label": "Is Standard",
+   "read_only_depends_on": "eval: !frappe.boot.developer_mode"
   },
   {
    "depends_on": "eval: doc.is_standard",
@@ -271,7 +271,7 @@
   }
  ],
  "links": [],
- "modified": "2020-07-22 11:32:51.185499",
+ "modified": "2020-07-23 11:10:33.509497",
  "modified_by": "Administrator",
  "module": "Desk",
  "name": "Dashboard Chart",
diff --git a/frappe/desk/doctype/number_card/number_card.json b/frappe/desk/doctype/number_card/number_card.json
index 0d1cc279c8..d3e9598eb7 100644
--- a/frappe/desk/doctype/number_card/number_card.json
+++ b/frappe/desk/doctype/number_card/number_card.json
@@ -113,10 +113,10 @@
   },
   {
    "default": "0",
-   "depends_on": "eval: frappe.boot.developer_mode",
    "fieldname": "is_standard",
    "fieldtype": "Check",
-   "label": "Is Standard"
+   "label": "Is Standard",
+   "read_only_depends_on": "eval: !frappe.boot.developer_mode"
   },
   {
    "depends_on": "eval: doc.is_standard",
@@ -191,7 +191,7 @@
   }
  ],
  "links": [],
- "modified": "2020-07-22 11:26:32.039023",
+ "modified": "2020-07-23 11:11:03.391719",
  "modified_by": "Administrator",
  "module": "Desk",
  "name": "Number Card",

From 33e0b785764f873c75b20e43a1e940c6bc25e715 Mon Sep 17 00:00:00 2001
From: Mangesh-Khairnar <mkhairnar10@gmail.com>
Date: Thu, 23 Jul 2020 15:06:46 +0530
Subject: [PATCH 108/191] fix: validate recipients before sending newsletter

---
 frappe/email/doctype/newsletter/newsletter.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/frappe/email/doctype/newsletter/newsletter.py b/frappe/email/doctype/newsletter/newsletter.py
index a82b52a663..48688afdb6 100755
--- a/frappe/email/doctype/newsletter/newsletter.py
+++ b/frappe/email/doctype/newsletter/newsletter.py
@@ -107,6 +107,9 @@ class Newsletter(WebsiteGenerator):
 		if self.get("__islocal"):
 			throw(_("Please save the Newsletter before sending"))
 
+		if not self.recipients:
+			frappe.throw(_("Newsletter should have at least one recipient"))
+
 	def get_context(self, context):
 		newsletters = get_newsletter_list("Newsletter", None, None, 0)
 		if newsletters:

From 24adc8c3625f146ecae895ac57bdd8ff081d92b8 Mon Sep 17 00:00:00 2001
From: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
Date: Thu, 23 Jul 2020 17:34:18 +0530
Subject: [PATCH 109/191] fix: Use find instead of filter

---
 frappe/public/js/frappe/ui/filters/filter_list.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/frappe/public/js/frappe/ui/filters/filter_list.js b/frappe/public/js/frappe/ui/filters/filter_list.js
index 9a35a9bb5f..ee04fb6077 100644
--- a/frappe/public/js/frappe/ui/filters/filter_list.js
+++ b/frappe/public/js/frappe/ui/filters/filter_list.js
@@ -112,7 +112,8 @@ frappe.ui.FilterGroup = class {
 	}
 
 	get_filter_value(fieldname) {
-		return this.filters.filter(f => f.fieldname == fieldname)[0].value;
+		let filter_obj = this.filters.find(f => f.fieldname == filename) || {};
+		return filter_obj.value;
 	}
 
 	filter_exists(filter_value) {

From 5f5facfb0a0c6d7725c309708eadb90af50c7278 Mon Sep 17 00:00:00 2001
From: prssanna <prssud@gmail.com>
Date: Thu, 23 Jul 2020 17:40:51 +0530
Subject: [PATCH 110/191] fix: set frm.filters to empty array for number card

---
 frappe/desk/doctype/dashboard_chart/dashboard_chart.js | 2 +-
 frappe/desk/doctype/number_card/number_card.js         | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/frappe/desk/doctype/dashboard_chart/dashboard_chart.js b/frappe/desk/doctype/dashboard_chart/dashboard_chart.js
index 65db4839a1..8d89cc2f31 100644
--- a/frappe/desk/doctype/dashboard_chart/dashboard_chart.js
+++ b/frappe/desk/doctype/dashboard_chart/dashboard_chart.js
@@ -291,7 +291,7 @@ frappe.ui.form.on('Dashboard Chart', {
 			set_filters && frm.set_value('filters_json', JSON.stringify(filters));
 		}
 
-		let fields;
+		let fields = [];
 		if (is_document_type) {
 			fields = [
 				{
diff --git a/frappe/desk/doctype/number_card/number_card.js b/frappe/desk/doctype/number_card/number_card.js
index 2ae163d7aa..63b41b956e 100644
--- a/frappe/desk/doctype/number_card/number_card.js
+++ b/frappe/desk/doctype/number_card/number_card.js
@@ -116,6 +116,7 @@ frappe.ui.form.on('Number Card', {
 	},
 
 	report_name: function(frm) {
+		frm.filters = [];
 		frm.set_value('filters_json', '{}');
 		frm.set_value('dynamic_filters_json', '{}');
 		frm.set_df_property('report_field', 'options', []);
@@ -247,7 +248,7 @@ frappe.ui.form.on('Number Card', {
 			set_filters && frm.set_value('filters_json', JSON.stringify(filters));
 		}
 
-		let fields;
+		let fields = [];
 		if (is_document_type) {
 			fields = [
 				{

From 771feca0730a563cd3278fc4de11b10060389b27 Mon Sep 17 00:00:00 2001
From: prssanna <prssud@gmail.com>
Date: Thu, 23 Jul 2020 17:41:55 +0530
Subject: [PATCH 111/191] feat: remove restricted button in dashboard

---
 frappe/core/page/dashboard/dashboard.js                   | 7 -------
 frappe/public/js/frappe/views/dashboard/dashboard_view.js | 4 ----
 2 files changed, 11 deletions(-)

diff --git a/frappe/core/page/dashboard/dashboard.js b/frappe/core/page/dashboard/dashboard.js
index cee230265f..7e45163a7e 100644
--- a/frappe/core/page/dashboard/dashboard.js
+++ b/frappe/core/page/dashboard/dashboard.js
@@ -26,13 +26,6 @@ class Dashboard {
 		</div>`).appendTo(this.wrapper.find(".page-content").empty());
 		this.container = this.wrapper.find(".dashboard-graph");
 		this.page = wrapper.page;
-
-		this.page.set_title_sub(
-			$(`<button class="restricted-button">
-				<span class="octicon octicon-lock"></span>
-				<span>${__('Restricted')}</span>
-			</button>`)
-		);
 	}
 
 	show() {
diff --git a/frappe/public/js/frappe/views/dashboard/dashboard_view.js b/frappe/public/js/frappe/views/dashboard/dashboard_view.js
index 83f45da5be..6f6279fd08 100644
--- a/frappe/public/js/frappe/views/dashboard/dashboard_view.js
+++ b/frappe/public/js/frappe/views/dashboard/dashboard_view.js
@@ -44,10 +44,6 @@ frappe.views.DashboardView = class DashboardView extends frappe.views.ListView {
 				<div class="text-muted">
 					<span class="uppercase header-title"> ${dashboard_name} </span>
 				</div>
-				<button class="restricted-button">
-					<span class="octicon octicon-lock"></span>
-					<span>${__('Restricted')}</span>
-				</button>
 				<div class="text-muted customize-dashboard" data-action="customize">${__('Customize')}</div>
 				<div class="small text-muted customize-options small-bounce">
 					<span class="reset-customization customize-option" data-action="reset_dashboard_customization">${__('Reset')}</span>

From b95d28d5f126785e2198eae1b5eba556599dd814 Mon Sep 17 00:00:00 2001
From: prssanna <prssud@gmail.com>
Date: Thu, 23 Jul 2020 17:43:01 +0530
Subject: [PATCH 112/191] fix: remove unused style

---
 frappe/core/page/dashboard/dashboard.css | 5 -----
 frappe/public/less/dashboard_view.less   | 7 -------
 2 files changed, 12 deletions(-)
 delete mode 100644 frappe/core/page/dashboard/dashboard.css

diff --git a/frappe/core/page/dashboard/dashboard.css b/frappe/core/page/dashboard/dashboard.css
deleted file mode 100644
index b319cc1ed2..0000000000
--- a/frappe/core/page/dashboard/dashboard.css
+++ /dev/null
@@ -1,5 +0,0 @@
-.restricted-button {
-	cursor: default;
-	position: relative;
-	right: -5px;
-}
\ No newline at end of file
diff --git a/frappe/public/less/dashboard_view.less b/frappe/public/less/dashboard_view.less
index ab78fa5b2a..17fa52cc0f 100644
--- a/frappe/public/less/dashboard_view.less
+++ b/frappe/public/less/dashboard_view.less
@@ -33,13 +33,6 @@
 				line-height: 1.5em;
 				vertical-align: text-bottom;
 			}
-
-			.restricted-button {
-				cursor: default;
-				position: relative;
-				right: 5px;
-				top: -3px;
-			}
 		}
 
 		.customize-dashboard {

From 160a84cee4177cf4fa828fd098ebdae89d307040 Mon Sep 17 00:00:00 2001
From: Prssanna Desai <prssud@gmail.com>
Date: Thu, 23 Jul 2020 17:55:23 +0530
Subject: [PATCH 113/191] fix: use correct variable

---
 frappe/public/js/frappe/ui/filters/filter_list.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frappe/public/js/frappe/ui/filters/filter_list.js b/frappe/public/js/frappe/ui/filters/filter_list.js
index ee04fb6077..6c577aa0bc 100644
--- a/frappe/public/js/frappe/ui/filters/filter_list.js
+++ b/frappe/public/js/frappe/ui/filters/filter_list.js
@@ -112,7 +112,7 @@ frappe.ui.FilterGroup = class {
 	}
 
 	get_filter_value(fieldname) {
-		let filter_obj = this.filters.find(f => f.fieldname == filename) || {};
+		let filter_obj = this.filters.find(f => f.fieldname == fieldname) || {};
 		return filter_obj.value;
 	}
 

From 047280013dcc6b8c55fdf5ad4bf44270fc81b3bc Mon Sep 17 00:00:00 2001
From: gavin <gavin18d@gmail.com>
Date: Thu, 23 Jul 2020 18:42:44 +0530
Subject: [PATCH 114/191] fix: Fetch latest files filtered by names (#11056)

---
 frappe/utils/backups.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/frappe/utils/backups.py b/frappe/utils/backups.py
index bb03c85bf9..9f9a64f296 100644
--- a/frappe/utils/backups.py
+++ b/frappe/utils/backups.py
@@ -104,11 +104,11 @@ class BackupGenerator:
 			this_file = cstr(this_file)
 			this_file_path = os.path.join(get_backup_path(), this_file)
 			if not is_file_old(this_file_path, older_than):
-				if "_private_files" in this_file_path:
+				if "-private-files" in this_file_path:
 					backup_path_private_files = this_file_path
-				elif "_files" in this_file_path:
+				elif "-files" in this_file_path:
 					backup_path_files = this_file_path
-				elif "_database" in this_file_path:
+				elif "-database" in this_file_path:
 					backup_path_db = this_file_path
 				elif "site_config" in this_file_path:
 					site_config_backup_path = this_file_path

From 441630acc48bc58b71bd0fe100b73559e5180150 Mon Sep 17 00:00:00 2001
From: Mangesh-Khairnar <mkhairnar10@gmail.com>
Date: Thu, 23 Jul 2020 23:43:35 +0530
Subject: [PATCH 115/191] fix: check file backup config before backing up files

---
 .../doctype/google_drive/google_drive.py        | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/frappe/integrations/doctype/google_drive/google_drive.py b/frappe/integrations/doctype/google_drive/google_drive.py
index c110694dff..58f28f882a 100644
--- a/frappe/integrations/doctype/google_drive/google_drive.py
+++ b/frappe/integrations/doctype/google_drive/google_drive.py
@@ -189,14 +189,17 @@ def upload_system_backup_to_google_drive():
 	if frappe.flags.create_new_backup:
 		set_progress(1, "Backing up Data.")
 		backup = new_backup()
-		fileurl_backup = backup.backup_path_db
-		fileurl_site_config = backup.site_config_backup_path
-		fileurl_public_files = backup.backup_path_files
-		fileurl_private_files = backup.backup_path_private_files
-	else:
-		fileurl_backup, fileurl_site_config, fileurl_public_files, fileurl_private_files = get_latest_backup_file(with_files=True)
+		file_urls = []
+		file_urls.append(backup.backup_path_db)
+		file_urls.append(backup.site_config_backup_path)
 
-	for fileurl in [fileurl_backup, fileurl_site_config, fileurl_public_files, fileurl_private_files]:
+		if account.file_backup:
+			file_urls.append(backup.backup_path_files)
+			file_urls.append(backup.backup_path_private_files)
+	else:
+		file_urls = get_latest_backup_file(with_files=account.file_backup)
+
+	for fileurl in file_urls:
 		if not fileurl:
 			continue
 

From 47b0fb3de4882787a910938feff605f880cc44b3 Mon Sep 17 00:00:00 2001
From: Anupam K <anupamvns0099@gmail.com>
Date: Fri, 24 Jul 2020 03:31:58 +0530
Subject: [PATCH 116/191] fix: print format custom button

---
 .../doctype/print_format/print_format.js      | 21 ++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/frappe/printing/doctype/print_format/print_format.js b/frappe/printing/doctype/print_format/print_format.js
index 252c706e51..bb0ba27e38 100644
--- a/frappe/printing/doctype/print_format/print_format.js
+++ b/frappe/printing/doctype/print_format/print_format.js
@@ -35,13 +35,20 @@ frappe.ui.form.on("Print Format", {
 			else if (frm.doc.custom_format && !frm.doc.raw_printing) {
 				frm.set_df_property("html", "reqd", 1);
 			}
-			frm.add_custom_button(__("Make Default"), function () {
-				frappe.call({
-					method: "frappe.printing.doctype.print_format.print_format.make_default",
-					args: {
-						name: frm.doc.name
-					}
-				})
+			frappe.db.get_value('DocType', frm.doc.doc_type, ['default_print_format', 'custom'], (r) => {
+				if (r.default_print_format != frm.doc.name && r.custom) {
+					frm.add_custom_button(__("Set as Default"), function () {
+						frappe.call({
+							method: "frappe.printing.doctype.print_format.print_format.make_default",
+							args: {
+								name: frm.doc.name
+							},
+							callback: function() {
+								frm.refresh();
+							}
+						});
+					});
+				}
 			});
 		}
 	},

From 35f3b5b4051b9d0054c540e93e04606937048977 Mon Sep 17 00:00:00 2001
From: Wolfram Schmidt <wolfram.schmidt@tueit.de>
Date: Fri, 24 Jul 2020 14:11:24 +0200
Subject: [PATCH 117/191] fix: Allowing to rename DocType Tag (#11100)

---
 frappe/desk/doctype/tag/tag.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/frappe/desk/doctype/tag/tag.json b/frappe/desk/doctype/tag/tag.json
index 895516594e..ad9838d10f 100644
--- a/frappe/desk/doctype/tag/tag.json
+++ b/frappe/desk/doctype/tag/tag.json
@@ -1,4 +1,5 @@
 {
+ "allow_rename": 1,
  "autoname": "Prompt",
  "creation": "2016-05-25 09:43:44.767581",
  "doctype": "DocType",
@@ -46,4 +47,4 @@
  ],
  "sort_field": "modified",
  "sort_order": "DESC"
-}
\ No newline at end of file
+}

From bc56a596715c47ed73cb2ad76db8e090ac8536fd Mon Sep 17 00:00:00 2001
From: Mangesh-Khairnar <mkhairnar10@gmail.com>
Date: Fri, 24 Jul 2020 20:19:35 +0530
Subject: [PATCH 118/191] fix(paytm-integration): simplify code and remove
 additional loop

---
 .../doctype/paytm_settings/paytm_settings.py  | 20 +++++++------------
 .../pages/integrations/paytm_checkout.py      |  2 --
 2 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/frappe/integrations/doctype/paytm_settings/paytm_settings.py b/frappe/integrations/doctype/paytm_settings/paytm_settings.py
index bfa9b6b3eb..a166d245f5 100644
--- a/frappe/integrations/doctype/paytm_settings/paytm_settings.py
+++ b/frappe/integrations/doctype/paytm_settings/paytm_settings.py
@@ -25,7 +25,7 @@ class PaytmSettings(Document):
 
 	def validate_transaction_currency(self, currency):
 		if currency not in self.supported_currencies:
-			frappe.throw(_("Please select another payment method. Stripe does not support transactions in currency '{0}'").format(currency))
+			frappe.throw(_("Please select another payment method. Paytm does not support transactions in currency '{0}'").format(currency))
 
 	def get_payment_url(self, **kwargs):
 		'''Return payment url with several params'''
@@ -87,29 +87,23 @@ def get_paytm_params(payment_details, order_id, paytm_config):
 def verify_transaction(**kwargs):
 	'''Verify checksum for received data in the callback and then verify the transaction'''
 	paytm_config = get_paytm_config()
-	received_data = frappe._dict(kwargs)
+	paytm_params = frappe._dict(kwargs)
 	is_valid_checksum = False
 
-	paytm_params = {}
-	for key, value in received_data.items(): 
-		if key == 'CHECKSUMHASH':
-			paytm_checksum = value
-		elif key == 'cmd':
-			continue
-		else:
-			paytm_params[key] = value
+	paytm_params.pop('cmd', None)
+	paytm_checksum = paytm_params.pop('CHECKSUMHASH', None)
 
 	if paytm_params and paytm_config and paytm_checksum:
 		# Verify checksum
 		is_valid_checksum = verifySignature(paytm_params, paytm_config.merchant_key, paytm_checksum)
 
-	if is_valid_checksum and received_data['RESPCODE'] == '01':
-		verify_transaction_status(paytm_config, received_data['ORDERID'])
+	if is_valid_checksum and paytm_params.get('RESPCODE') == '01':
+		verify_transaction_status(paytm_config, paytm_params['ORDERID'])
 	else:
 		frappe.respond_as_web_page("Payment Failed",
 			"Transaction failed to complete. In case of any deductions, deducted amount will get refunded to your account.",
 			http_status_code=401, indicator_color='red')
-		frappe.log_error("Order unsuccessful. Failed Response:"+cstr(received_data), 'Paytm Payment Failed')
+		frappe.log_error("Order unsuccessful. Failed Response:"+cstr(paytm_params), 'Paytm Payment Failed')
 
 def verify_transaction_status(paytm_config, order_id):
 	'''Verify transaction completion after checksum has been verified'''
diff --git a/frappe/templates/pages/integrations/paytm_checkout.py b/frappe/templates/pages/integrations/paytm_checkout.py
index 3018a9d65b..bc385b5784 100644
--- a/frappe/templates/pages/integrations/paytm_checkout.py
+++ b/frappe/templates/pages/integrations/paytm_checkout.py
@@ -6,8 +6,6 @@ from frappe import _
 import json
 from frappe.integrations.doctype.paytm_settings.paytm_settings import get_paytm_params, get_paytm_config
 
-no_cache = 1
-
 def get_context(context):
 	context.no_cache = 1
 	paytm_config = get_paytm_config()

From ab8a63d6fe0fe892ac578edb7b4deeae29fcc4cf Mon Sep 17 00:00:00 2001
From: Mangesh-Khairnar <mkhairnar10@gmail.com>
Date: Fri, 24 Jul 2020 22:59:16 +0530
Subject: [PATCH 119/191] fix: minor changes

---
 frappe/integrations/doctype/paytm_settings/paytm_settings.py | 3 +--
 frappe/www/message.html                                      | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/frappe/integrations/doctype/paytm_settings/paytm_settings.py b/frappe/integrations/doctype/paytm_settings/paytm_settings.py
index a166d245f5..616c3837d4 100644
--- a/frappe/integrations/doctype/paytm_settings/paytm_settings.py
+++ b/frappe/integrations/doctype/paytm_settings/paytm_settings.py
@@ -84,10 +84,9 @@ def get_paytm_params(payment_details, order_id, paytm_config):
 	return paytm_params
 
 @frappe.whitelist(allow_guest=True)
-def verify_transaction(**kwargs):
+def verify_transaction(**paytm_params):
 	'''Verify checksum for received data in the callback and then verify the transaction'''
 	paytm_config = get_paytm_config()
-	paytm_params = frappe._dict(kwargs)
 	is_valid_checksum = False
 
 	paytm_params.pop('cmd', None)
diff --git a/frappe/www/message.html b/frappe/www/message.html
index 87d311d9cc..2919592901 100644
--- a/frappe/www/message.html
+++ b/frappe/www/message.html
@@ -24,7 +24,7 @@ html, body {
 		<span class='indicator {{ indicator_color or "blue" }}'>
 			{{ title or _("Message") }}</span>
 	</h5>
-	<div class="page-card-body ellipsis">
+	<div class="page-card-body">
 	{% block message_body %}
 		<p>{{ message or "" }}</p>
 		{% if primary_action %}

From 8844c2b690d2e6a1011963b1a63fd24c40445b22 Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Mon, 27 Jul 2020 15:37:01 +0530
Subject: [PATCH 120/191] fix: route to new doc 1 explicitly

---
 frappe/public/js/frappe/widgets/onboarding_widget.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/frappe/public/js/frappe/widgets/onboarding_widget.js b/frappe/public/js/frappe/widgets/onboarding_widget.js
index 9b4c9973e2..8c1d2cbb5b 100644
--- a/frappe/public/js/frappe/widgets/onboarding_widget.js
+++ b/frappe/public/js/frappe/widgets/onboarding_widget.js
@@ -136,7 +136,7 @@ export default class OnboardingWidget extends Widget {
 		if (step.is_single) {
 			route = `Form/${step.reference_document}`;
 		} else {
-			route = `Form/${step.reference_document}/${__('New')} ${__(step.reference_document)}`;
+			route = `Form/${step.reference_document}/${__('New')} ${__(step.reference_document)} 1`;
 		}
 
 		let current_route = frappe.get_route();
@@ -262,7 +262,7 @@ export default class OnboardingWidget extends Widget {
 			frappe.route_hooks.after_save = callback;
 		}
 
-		frappe.set_route(`Form/${step.reference_document}/${__('New')} ${__(step.reference_document)}`);
+		frappe.set_route(`Form/${step.reference_document}/${__('New')} ${__(step.reference_document)} 1`);
 	}
 
 	show_quick_entry(step) {

From 28605191b1f1359b4b71ae9fd9435d47d26e9ad1 Mon Sep 17 00:00:00 2001
From: prssanna <prssud@gmail.com>
Date: Mon, 27 Jul 2020 16:59:49 +0530
Subject: [PATCH 121/191] fix(Number Card): return value in promise

---
 frappe/public/js/frappe/widgets/number_card_widget.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frappe/public/js/frappe/widgets/number_card_widget.js b/frappe/public/js/frappe/widgets/number_card_widget.js
index 220394919c..6b38412ebd 100644
--- a/frappe/public/js/frappe/widgets/number_card_widget.js
+++ b/frappe/public/js/frappe/widgets/number_card_widget.js
@@ -164,7 +164,7 @@ export default class NumberCardWidget extends Widget {
 
 	get_number() {
 		return frappe.xcall(this.settings.method, this.settings.args).then(res => {
-			this.settings.get_number(res);
+			return this.settings.get_number(res);
 		});
 	}
 

From ad1152f8e8367f8d7c46d0e4e9a14ee9e2d0df9b Mon Sep 17 00:00:00 2001
From: Gavin D'souza <gavin18d@gmail.com>
Date: Mon, 27 Jul 2020 17:13:18 +0530
Subject: [PATCH 122/191] feat: override site name via _site

added filter parameter for logger
---
 frappe/__init__.py     |  4 ++--
 frappe/utils/logger.py | 16 +++++++++-------
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/frappe/__init__.py b/frappe/__init__.py
index 8c24980189..504ac96eb9 100644
--- a/frappe/__init__.py
+++ b/frappe/__init__.py
@@ -1559,10 +1559,10 @@ def get_doctype_app(doctype):
 
 loggers = {}
 log_level = None
-def logger(module=None, with_more_info=False, _site=None):
+def logger(module=None, with_more_info=False, _site=None, filter=None):
 	'''Returns a python logger that uses StreamHandler'''
 	from frappe.utils.logger import get_logger
-	return get_logger(module=module, with_more_info=with_more_info, _site=_site)
+	return get_logger(module=module, with_more_info=with_more_info, _site=_site, filter=filter)
 
 def log_error(message=None, title=_("Error")):
 	'''Log error to Error Log'''
diff --git a/frappe/utils/logger.py b/frappe/utils/logger.py
index 9254c0aedd..56fcf9857a 100755
--- a/frappe/utils/logger.py
+++ b/frappe/utils/logger.py
@@ -17,22 +17,20 @@ default_log_level = logging.DEBUG
 site = getattr(frappe.local, 'site', None)
 
 
-def get_logger(module, with_more_info=False, _site=None):
+def get_logger(module, with_more_info=False, _site=None, filter=None):
 	"""Application Logger for your given module
 
 	Args:
 		module (str): Name of your logger and consequently your log file.
 		with_more_info (bool, optional): Will log the form dict using the SiteContextFilter. Defaults to False.
-		_site (str, optional): If set, validates the current site context with the passed value. The `frappe.web` logger uses this to determine that the application is logging information related to the logger called. Defaults to None.
+		_site (str, optional): Overrides the global site variable set in this scope. Defaults to None.
+		filter (function, optional): Add a filter function for your logger
 
 	Returns:
 		<class 'logging.Logger'>: Returns a Python logger object with Site and Bench level logging capabilities.
 	"""
 	global site
 
-	def allow_site():
-		return (_site and _site == site) or bool(site)
-
 	if module in frappe.loggers:
 		return frappe.loggers[module]
 
@@ -42,6 +40,7 @@ def get_logger(module, with_more_info=False, _site=None):
 
 	logfile = module + '.log'
 	site = getattr(frappe.local, 'site', None)
+	equivalent_site = _site or site
 	LOG_FILENAME = os.path.join('..', 'logs', logfile)
 
 	logger = logging.getLogger(module)
@@ -52,8 +51,8 @@ def get_logger(module, with_more_info=False, _site=None):
 	handler = RotatingFileHandler(LOG_FILENAME, maxBytes=100_000, backupCount=20)
 	logger.addHandler(handler)
 
-	if allow_site():
-		SITELOG_FILENAME = os.path.join(site, 'logs', logfile)
+	if equivalent_site:
+		SITELOG_FILENAME = os.path.join(equivalent_site, 'logs', logfile)
 		site_handler = RotatingFileHandler(SITELOG_FILENAME, maxBytes=100_000, backupCount=20)
 		site_handler.setFormatter(formatter)
 		logger.addHandler(site_handler)
@@ -61,6 +60,9 @@ def get_logger(module, with_more_info=False, _site=None):
 	if with_more_info:
 		handler.addFilter(SiteContextFilter())
 
+	if filter:
+		logger.addFilter(filter)
+
 	handler.setFormatter(formatter)
 
 	frappe.loggers[module] = logger

From 1345c2feb311bf7abb06b3f1969c4a2a43dc9b94 Mon Sep 17 00:00:00 2001
From: Gavin D'souza <gavin18d@gmail.com>
Date: Mon, 27 Jul 2020 17:31:12 +0530
Subject: [PATCH 123/191] feat: Allow_site flag in frappe.logger

---
 frappe/__init__.py     |  4 ++--
 frappe/app.py          |  2 +-
 frappe/utils/logger.py | 22 +++++++++++++---------
 3 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/frappe/__init__.py b/frappe/__init__.py
index 504ac96eb9..7ea95ec3db 100644
--- a/frappe/__init__.py
+++ b/frappe/__init__.py
@@ -1559,10 +1559,10 @@ def get_doctype_app(doctype):
 
 loggers = {}
 log_level = None
-def logger(module=None, with_more_info=False, _site=None, filter=None):
+def logger(module=None, with_more_info=False, allow_site=True, filter=None):
 	'''Returns a python logger that uses StreamHandler'''
 	from frappe.utils.logger import get_logger
-	return get_logger(module=module, with_more_info=with_more_info, _site=_site, filter=filter)
+	return get_logger(module=module, with_more_info=with_more_info, allow_site=allow_site, filter=filter)
 
 def log_error(message=None, title=_("Error")):
 	'''Log error to Error Log'''
diff --git a/frappe/app.py b/frappe/app.py
index 83a9b8c149..100b10e9ef 100644
--- a/frappe/app.py
+++ b/frappe/app.py
@@ -100,7 +100,7 @@ def application(request):
 		frappe.recorder.dump()
 
 		_site = get_site_name(request.host)
-		frappe.logger("frappe.web", _site=_site).info({
+		frappe.logger("frappe.web", allow_site=_site).info({
 			"site": _site,
 			"remote_addr": getattr(request, "remote_addr", "NOTFOUND"),
 			"base_url": getattr(request, "base_url", "NOTFOUND"),
diff --git a/frappe/utils/logger.py b/frappe/utils/logger.py
index 56fcf9857a..e7058ce42d 100755
--- a/frappe/utils/logger.py
+++ b/frappe/utils/logger.py
@@ -14,22 +14,20 @@ import frappe
 
 
 default_log_level = logging.DEBUG
-site = getattr(frappe.local, 'site', None)
 
 
-def get_logger(module, with_more_info=False, _site=None, filter=None):
+def get_logger(module, with_more_info=False, allow_site=True, filter=None):
 	"""Application Logger for your given module
 
 	Args:
 		module (str): Name of your logger and consequently your log file.
 		with_more_info (bool, optional): Will log the form dict using the SiteContextFilter. Defaults to False.
-		_site (str, optional): Overrides the global site variable set in this scope. Defaults to None.
+		allow_site ((str, bool), optional): Pass site name to explicitly log under it's logs. If True and unspecified, guesses which site the logs would be saved under. Defaults to True.
 		filter (function, optional): Add a filter function for your logger
 
 	Returns:
 		<class 'logging.Logger'>: Returns a Python logger object with Site and Bench level logging capabilities.
 	"""
-	global site
 
 	if module in frappe.loggers:
 		return frappe.loggers[module]
@@ -39,8 +37,14 @@ def get_logger(module, with_more_info=False, _site=None, filter=None):
 		with_more_info = True
 
 	logfile = module + '.log'
-	site = getattr(frappe.local, 'site', None)
-	equivalent_site = _site or site
+
+	if allow_site == True:
+		site = getattr(frappe.local, 'site', None)
+	elif allow_site:
+		site = allow_site
+	else:
+		site = False
+
 	LOG_FILENAME = os.path.join('..', 'logs', logfile)
 
 	logger = logging.getLogger(module)
@@ -51,8 +55,8 @@ def get_logger(module, with_more_info=False, _site=None, filter=None):
 	handler = RotatingFileHandler(LOG_FILENAME, maxBytes=100_000, backupCount=20)
 	logger.addHandler(handler)
 
-	if equivalent_site:
-		SITELOG_FILENAME = os.path.join(equivalent_site, 'logs', logfile)
+	if site:
+		SITELOG_FILENAME = os.path.join(site, 'logs', logfile)
 		site_handler = RotatingFileHandler(SITELOG_FILENAME, maxBytes=100_000, backupCount=20)
 		site_handler.setFormatter(formatter)
 		logger.addHandler(site_handler)
@@ -73,7 +77,7 @@ class SiteContextFilter(logging.Filter):
 	"""This is a filter which injects request information (if available) into the log."""
 	def filter(self, record):
 		if "Form Dict" not in text_type(record.msg):
-			record.msg = text_type(record.msg) + "\nSite: {0}\nForm Dict: {1}".format(site, getattr(frappe.local, 'form_dict', None))
+			record.msg = text_type(record.msg) + "\nSite: {0}\nForm Dict: {1}".format(getattr(frappe.local, 'site', None), getattr(frappe.local, 'form_dict', None))
 			return True
 
 def set_log_level(level):

From dc46450f89a2d95163eda8002f047ba3e6b04630 Mon Sep 17 00:00:00 2001
From: prssanna <prssud@gmail.com>
Date: Mon, 27 Jul 2020 18:14:02 +0530
Subject: [PATCH 124/191] fix: push fieldtype in invalid conditions map

---
 frappe/public/js/frappe/ui/filters/filter.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frappe/public/js/frappe/ui/filters/filter.js b/frappe/public/js/frappe/ui/filters/filter.js
index bfc0b1449d..4dedfb32fe 100644
--- a/frappe/public/js/frappe/ui/filters/filter.js
+++ b/frappe/public/js/frappe/ui/filters/filter.js
@@ -57,7 +57,7 @@ frappe.ui.Filter = class {
 				this.conditions.push([key, __(`{0}`, [filter.label])]);
 				for (let fieldtype of Object.keys(this.invalid_condition_map)) {
 					if (!filter.valid_for_fieldtypes.includes(fieldtype)) {
-						this.invalid_condition_map[fieldtype].push(filter.label);
+						this.invalid_condition_map[fieldtype].push(key);
 					}
 				}
 			}

From 59ab9249cc3a9e7abeb5f6e599133f705ea6d8e6 Mon Sep 17 00:00:00 2001
From: Anupam K <anupamvns0099@gmail.com>
Date: Mon, 27 Jul 2020 19:40:11 +0530
Subject: [PATCH 125/191] fix: print format custom button

---
 frappe/printing/doctype/print_format/print_format.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/frappe/printing/doctype/print_format/print_format.js b/frappe/printing/doctype/print_format/print_format.js
index bb0ba27e38..e6599b2496 100644
--- a/frappe/printing/doctype/print_format/print_format.js
+++ b/frappe/printing/doctype/print_format/print_format.js
@@ -35,8 +35,8 @@ frappe.ui.form.on("Print Format", {
 			else if (frm.doc.custom_format && !frm.doc.raw_printing) {
 				frm.set_df_property("html", "reqd", 1);
 			}
-			frappe.db.get_value('DocType', frm.doc.doc_type, ['default_print_format', 'custom'], (r) => {
-				if (r.default_print_format != frm.doc.name && r.custom) {
+			frappe.db.get_value('DocType', frm.doc.doc_type, 'default_print_format', (r) => {
+				if (r.default_print_format != frm.doc.name) {
 					frm.add_custom_button(__("Set as Default"), function () {
 						frappe.call({
 							method: "frappe.printing.doctype.print_format.print_format.make_default",

From 786625a92a94536b749f0b02acc9fc4cf56516c7 Mon Sep 17 00:00:00 2001
From: Rucha Mahabal <ruchamahabal2@gmail.com>
Date: Mon, 27 Jul 2020 21:34:56 +0530
Subject: [PATCH 126/191] fix: regex for youtube video help link

---
 frappe/public/js/frappe/utils/help.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frappe/public/js/frappe/utils/help.js b/frappe/public/js/frappe/utils/help.js
index 336d1ef526..f88849d212 100644
--- a/frappe/public/js/frappe/utils/help.js
+++ b/frappe/public/js/frappe/utils/help.js
@@ -17,7 +17,7 @@ frappe.help.show = function(doctype) {
 
 frappe.help.show_video = function(youtube_id, title) {
 	if (frappe.utils.is_url(youtube_id)) {
-		const expression = '(?:youtube.com/(?:[^/]+/.+/|(?:v|e(?:mbed)?)/|.*[?&]v=)|youtu.be/)([^\"&?/s]{11})';
+		const expression = '(?:youtube.com/(?:[^/]+/.+/|(?:v|e(?:mbed)?)/|.*[?&]v=)|youtu.be/)([^\"&?\\s]{11})';
 		youtube_id = youtube_id.match(expression)[1];
 	}
 

From c8817e52210f526c8b71a4989bc65ad05e2e4e79 Mon Sep 17 00:00:00 2001
From: Rucha Mahabal <ruchamahabal2@gmail.com>
Date: Mon, 27 Jul 2020 21:39:00 +0530
Subject: [PATCH 127/191] fix: check for empty report filters while creating
 report type dashboard chart

---
 frappe/public/js/frappe/widgets/chart_widget.js | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/frappe/public/js/frappe/widgets/chart_widget.js b/frappe/public/js/frappe/widgets/chart_widget.js
index 4aa0b23a63..5d2c89b739 100644
--- a/frappe/public/js/frappe/widgets/chart_widget.js
+++ b/frappe/public/js/frappe/widgets/chart_widget.js
@@ -656,14 +656,15 @@ export default class ChartWidget extends Widget {
 	}
 
 	update_default_date_filters(report_filters, chart_filters) {
-		report_filters.map(f => {
-			if (['Date', 'DateRange'].includes(f.fieldtype) && f.default) {
-				if (f.reqd || chart_filters[f.fieldname]) {
-					chart_filters[f.fieldname] = f.default;
+		if (report_filters) {
+			report_filters.map(f => {
+				if (['Date', 'DateRange'].includes(f.fieldtype) && f.default) {
+					if (f.reqd || chart_filters[f.fieldname]) {
+						chart_filters[f.fieldname] = f.default;
+					}
 				}
-			}
-		});
-
+			});
+		}
 		return chart_filters;
 	}
 

From a11496f05ca1270abf51574489dd19f0b6ffbb6f Mon Sep 17 00:00:00 2001
From: Rucha Mahabal <ruchamahabal2@gmail.com>
Date: Mon, 27 Jul 2020 23:35:19 +0530
Subject: [PATCH 128/191] fix: translation syntax

---
 frappe/public/js/frappe/widgets/chart_widget.js | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/frappe/public/js/frappe/widgets/chart_widget.js b/frappe/public/js/frappe/widgets/chart_widget.js
index 5d2c89b739..ccec5b3ef4 100644
--- a/frappe/public/js/frappe/widgets/chart_widget.js
+++ b/frappe/public/js/frappe/widgets/chart_widget.js
@@ -615,9 +615,7 @@ export default class ChartWidget extends Widget {
 	}
 
 	update_last_synced() {
-		let last_synced_text = __("Last synced {0}", [
-			comment_when(this.chart_doc.last_synced_on)
-		]);
+		let last_synced_text = __("Last synced {0}", [comment_when(this.chart_doc.last_synced_on)]);
 		this.footer.html(last_synced_text);
 	}
 

From 7383a55c9adb9af62590ba18738609784b4ea8b3 Mon Sep 17 00:00:00 2001
From: Rucha Mahabal <ruchamahabal2@gmail.com>
Date: Tue, 28 Jul 2020 11:29:22 +0530
Subject: [PATCH 129/191] fix: remove useless escape character

---
 frappe/public/js/frappe/utils/help.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frappe/public/js/frappe/utils/help.js b/frappe/public/js/frappe/utils/help.js
index f88849d212..ec6f7c8158 100644
--- a/frappe/public/js/frappe/utils/help.js
+++ b/frappe/public/js/frappe/utils/help.js
@@ -17,7 +17,7 @@ frappe.help.show = function(doctype) {
 
 frappe.help.show_video = function(youtube_id, title) {
 	if (frappe.utils.is_url(youtube_id)) {
-		const expression = '(?:youtube.com/(?:[^/]+/.+/|(?:v|e(?:mbed)?)/|.*[?&]v=)|youtu.be/)([^\"&?\\s]{11})';
+		const expression = '(?:youtube.com/(?:[^/]+/.+/|(?:v|e(?:mbed)?)/|.*[?&]v=)|youtu.be/)([^"&?\\s]{11})';
 		youtube_id = youtube_id.match(expression)[1];
 	}
 

From d9c8b6b66281946ee504c240c84a8819e60bc903 Mon Sep 17 00:00:00 2001
From: Faris Ansari <netchamp.faris@gmail.com>
Date: Tue, 28 Jul 2020 13:09:24 +0530
Subject: [PATCH 130/191] fix: Don't render meta tags if no value

---
 frappe/templates/includes/meta_block.html | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/frappe/templates/includes/meta_block.html b/frappe/templates/includes/meta_block.html
index 3d867aaef3..1aef8a160e 100644
--- a/frappe/templates/includes/meta_block.html
+++ b/frappe/templates/includes/meta_block.html
@@ -1,5 +1,8 @@
 {%- if metatags -%}
 {%- for name in metatags %}
-<meta {% if name.startswith('og:') %}property="{{ name }}"{% else %}name="{{ name }}"{% endif %} content="{{ metatags[name] | striptags | escape }}">
+{%- set content = metatags.get(name, '') -%}
+{%- if content -%}
+<meta {% if name.startswith('og:') %}property="{{ name }}"{% else %}name="{{ name }}"{% endif %} content="{{ content | striptags | escape }}">
+{%- endif -%}
 {%- endfor -%}
 {%- endif -%}

From 8ce340046ee27fccb1232e80d1aa3d3d5f8d4128 Mon Sep 17 00:00:00 2001
From: Sahil Khan <sahilkhan28297@gmail.com>
Date: Tue, 28 Jul 2020 19:33:44 +0530
Subject: [PATCH 131/191] fix: do not sanitize code field

Co-authored-by: Chinmay D. Pai <chinmaydpai@gmail.com>
---
 frappe/model/base_document.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/frappe/model/base_document.py b/frappe/model/base_document.py
index 7d56736cdc..09d303bec7 100644
--- a/frappe/model/base_document.py
+++ b/frappe/model/base_document.py
@@ -703,8 +703,8 @@ class BaseDocument(object):
 			sanitized_value = value
 
 			if df and (df.get("ignore_xss_filter")
-				or (df.get("fieldtype")=="Code" and df.get("options")!="Email")
-				or df.get("fieldtype") in ("Attach", "Attach Image", "Barcode")
+				or (df.get("fieldtype") in ("Data", "Small Text", "Text") and df.get("options")=="Email")
+				or df.get("fieldtype") in ("Attach", "Attach Image", "Barcode", "Code")
 
 				# cancelled and submit but not update after submit should be ignored
 				or self.docstatus==2

From ac2493b391a4213f3412390b88b157a2fcf2bbd7 Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scmmishra@users.noreply.github.com>
Date: Wed, 29 Jul 2020 11:00:59 +0530
Subject: [PATCH 132/191] style: use 1tbs braces for if-else

---
 frappe/public/js/frappe/views/reports/query_report.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/frappe/public/js/frappe/views/reports/query_report.js b/frappe/public/js/frappe/views/reports/query_report.js
index 609e1feb46..0701a34b76 100644
--- a/frappe/public/js/frappe/views/reports/query_report.js
+++ b/frappe/public/js/frappe/views/reports/query_report.js
@@ -869,8 +869,7 @@ frappe.views.QueryReport = class QueryReport extends frappe.views.BaseList {
 					if (column.colIndex === index && !value) {
 						value = "Total";
 						column.fieldtype = "Data"; // avoid type issues for value if Date column
-					}
-					else if (in_list(["Currency", "Float"], column.fieldtype)) {
+					} else if (in_list(["Currency", "Float"], column.fieldtype)) {
 						// proxy for currency and float
 						data = this.data[0];
 					}

From ae3ee5b2eb5c64fa00f4461ad1a11841ced65c54 Mon Sep 17 00:00:00 2001
From: Gavin D'souza <gavin18d@gmail.com>
Date: Wed, 29 Jul 2020 13:33:04 +0530
Subject: [PATCH 133/191] fix: save frappe loggers site wise

---
 frappe/utils/logger.py | 24 ++++++++++++++++--------
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/frappe/utils/logger.py b/frappe/utils/logger.py
index e7058ce42d..c38e0e6997 100755
--- a/frappe/utils/logger.py
+++ b/frappe/utils/logger.py
@@ -29,8 +29,18 @@ def get_logger(module, with_more_info=False, allow_site=True, filter=None):
 		<class 'logging.Logger'>: Returns a Python logger object with Site and Bench level logging capabilities.
 	"""
 
+	if allow_site == True:
+		site = getattr(frappe.local, 'site', None)
+	elif allow_site:
+		site = allow_site
+	else:
+		site = False
+
 	if module in frappe.loggers:
-		return frappe.loggers[module]
+		try:
+			return frappe.loggers[module][site or "all"]
+		except:
+			pass
 
 	if not module:
 		module = "frappe"
@@ -38,12 +48,6 @@ def get_logger(module, with_more_info=False, allow_site=True, filter=None):
 
 	logfile = module + '.log'
 
-	if allow_site == True:
-		site = getattr(frappe.local, 'site', None)
-	elif allow_site:
-		site = allow_site
-	else:
-		site = False
 
 	LOG_FILENAME = os.path.join('..', 'logs', logfile)
 
@@ -69,7 +73,11 @@ def get_logger(module, with_more_info=False, allow_site=True, filter=None):
 
 	handler.setFormatter(formatter)
 
-	frappe.loggers[module] = logger
+	try:
+		frappe.loggers[module][site or "all"] = logger
+	except KeyError:
+		frappe.loggers[module] = {}
+		frappe.loggers[module][site or "all"] = logger
 
 	return logger
 

From 727a2b13bf3050c8dd4e2bed9bf6f1911864dcd5 Mon Sep 17 00:00:00 2001
From: Gavin D'souza <gavin18d@gmail.com>
Date: Wed, 29 Jul 2020 14:28:45 +0530
Subject: [PATCH 134/191] fix: fetch latest backups

updated behaviour of fetch latest backups. doesnt take new backups
and accepts no args
---
 frappe/utils/backups.py | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/frappe/utils/backups.py b/frappe/utils/backups.py
index 3b905de6bd..7eb00ceccd 100644
--- a/frappe/utils/backups.py
+++ b/frappe/utils/backups.py
@@ -208,26 +208,22 @@ def get_backup():
 
 
 @frappe.whitelist()
-def fetch_latest_backups(with_files=True, recent=3):
-	"""Takes backup on-demand if doesnt exist satisfying the `recent` parameter
+def fetch_latest_backups():
+	"""Fetches paths of the latest backup taken in the last 30 days
 	Only for: System Managers
 
-	Args:
-		with_files (bool, optional): If set, files will backuped up. Defaults to True.
-		recent (int, optional): Won't take a new backup if backup exists within this paramter. Defaults to 3 hours
-
 	Returns:
 		dict: relative Backup Paths
 	"""
 	frappe.only_for("System Manager")
 	odb = BackupGenerator(frappe.conf.db_name, frappe.conf.db_name, frappe.conf.db_password, db_host=frappe.db.host, db_type=frappe.conf.db_type, db_port=frappe.conf.db_port)
-	odb.get_backup(older_than=recent, ignore_files=not with_files)
+	database, public, private, config = odb.get_recent_backup(older_than=24 * 30)
 
 	return {
-		"database": odb.backup_path_db,
-		"public": odb.backup_path_files,
-		"private": odb.backup_path_private_files,
-		"config": odb.site_config_backup_path
+		"database": database,
+		"public": public,
+		"private": private,
+		"config": config
 	}
 
 

From d3e4a97b6fc96f2003c1fad3c14a99b105ade5ed Mon Sep 17 00:00:00 2001
From: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
Date: Wed, 29 Jul 2020 17:17:53 +0530
Subject: [PATCH 135/191] test: Make email account is email account test
 (#11139)

---
 frappe/core/doctype/server_script/test_server_script.py  | 7 ++++---
 frappe/email/doctype/email_account/test_email_account.py | 5 ++++-
 frappe/model/workflow.py                                 | 2 +-
 frappe/tests/test_naming.py                              | 1 +
 frappe/workflow/doctype/workflow/test_workflow.py        | 3 ++-
 5 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/frappe/core/doctype/server_script/test_server_script.py b/frappe/core/doctype/server_script/test_server_script.py
index 3e6b7a3a98..5c12858e8a 100644
--- a/frappe/core/doctype/server_script/test_server_script.py
+++ b/frappe/core/doctype/server_script/test_server_script.py
@@ -52,9 +52,10 @@ class TestServerScript(unittest.TestCase):
 
 		frappe.db.commit()
 
-	# @classmethod
-	# def tearDownClass(cls):
-	# 	frappe.db.sql('truncate `tabServer Script`')
+	@classmethod
+	def tearDownClass(cls):
+		frappe.db.commit()
+		frappe.db.sql('truncate `tabServer Script`')
 
 	def setUp(self):
 		frappe.cache().delete_value('server_script_map')
diff --git a/frappe/email/doctype/email_account/test_email_account.py b/frappe/email/doctype/email_account/test_email_account.py
index 29b54d7f8b..f87ee32bb1 100644
--- a/frappe/email/doctype/email_account/test_email_account.py
+++ b/frappe/email/doctype/email_account/test_email_account.py
@@ -5,7 +5,10 @@ from __future__ import unicode_literals
 import frappe, os
 import unittest, email
 
-test_records = frappe.get_test_records('Email Account')
+from frappe.test_runner import make_test_records
+
+make_test_records("User")
+make_test_records("Email Account")
 
 from frappe.core.doctype.communication.email import make
 from frappe.desk.form.load import get_attachments
diff --git a/frappe/model/workflow.py b/frappe/model/workflow.py
index ea563dfc13..32919b3333 100644
--- a/frappe/model/workflow.py
+++ b/frappe/model/workflow.py
@@ -307,4 +307,4 @@ def set_workflow_state_on_action(doc, workflow_name, action):
 	for state in workflow.states:
 		if state.doc_status == docstatus:
 			doc.set(workflow_state_field, state.state)
-			return
\ No newline at end of file
+			return
diff --git a/frappe/tests/test_naming.py b/frappe/tests/test_naming.py
index 90ab6a6a94..b47fb809ca 100644
--- a/frappe/tests/test_naming.py
+++ b/frappe/tests/test_naming.py
@@ -88,6 +88,7 @@ class TestNaming(unittest.TestCase):
 		series = 'TEST-'
 		key = 'TEST-'
 		name = 'TEST-00003'
+		frappe.db.sql("DELETE FROM `tabSeries` WHERE `name`=%s", series)
 		frappe.db.sql("""INSERT INTO `tabSeries` (name, current) values (%s, 3)""", (series,))
 		revert_series_if_last(key, name)
 		count = frappe.db.sql("""SELECT current from `tabSeries` where name = %s""", series, as_dict=True)[0]
diff --git a/frappe/workflow/doctype/workflow/test_workflow.py b/frappe/workflow/doctype/workflow/test_workflow.py
index 9999df40cb..2719bc7cf0 100644
--- a/frappe/workflow/doctype/workflow/test_workflow.py
+++ b/frappe/workflow/doctype/workflow/test_workflow.py
@@ -10,6 +10,7 @@ from frappe.model.workflow import apply_workflow, WorkflowTransitionError, Workf
 class TestWorkflow(unittest.TestCase):
 	def setUp(self):
 		frappe.db.sql('DELETE FROM `tabToDo`')
+		frappe.db.sql("DELETE FROM `tabHas Role` WHERE `role`='Test Approver'")
 		if not getattr(self, 'workflow', None):
 			self.workflow = create_todo_workflow()
 		frappe.set_user('Administrator')
@@ -146,4 +147,4 @@ def create_todo_workflow():
 		return workflow
 
 def create_new_todo():
-	return frappe.get_doc(dict(doctype='ToDo', description='workflow ' + random_string(10))).insert()
\ No newline at end of file
+	return frappe.get_doc(dict(doctype='ToDo', description='workflow ' + random_string(10))).insert()

From 219fbc8e88d8505391fe8259b0fbeda86844f42d Mon Sep 17 00:00:00 2001
From: Matteo D <md@lab51.org>
Date: Wed, 29 Jul 2020 17:28:46 +0200
Subject: [PATCH 136/191] fix: Added AWS S3 missing regions (#11109)

---
 .gitignore                                                | 5 ++++-
 .../doctype/s3_backup_settings/s3_backup_settings.json    | 8 ++++----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index 7df673c1f1..900ae1c7b7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -188,4 +188,7 @@ typings/
 
 # cypress
 cypress/screenshots
-cypress/videos
\ No newline at end of file
+cypress/videos
+
+# JetBrains IDEs
+.idea/
diff --git a/frappe/integrations/doctype/s3_backup_settings/s3_backup_settings.json b/frappe/integrations/doctype/s3_backup_settings/s3_backup_settings.json
index 830afbae53..123bb21e88 100755
--- a/frappe/integrations/doctype/s3_backup_settings/s3_backup_settings.json
+++ b/frappe/integrations/doctype/s3_backup_settings/s3_backup_settings.json
@@ -74,11 +74,11 @@
   },
   {
    "default": "us-east-1",
-   "description": "See https://docs.aws.amazon.com/de_de/general/latest/gr/rande.html#s3_region for details.",
+   "description": "See https://docs.aws.amazon.com/general/latest/gr/s3.html for details.",
    "fieldname": "region",
    "fieldtype": "Select",
    "label": "Region",
-   "options": "us-east-1\nus-east-2\nus-west-1\nus-west-2\nap-south-1\nap-southeast-1\nap-southeast-2\nap-northeast-1\nap-northeast-2\nap-northeast-3\nca-central-1\ncn-north-1\ncn-northwest-1\neu-central-1\neu-west-1\neu-west-2\neu-west-3\neu-north-1\nsa-east-1"
+   "options": "us-east-1\nus-east-2\nus-west-1\nus-west-2\naf-south-1\nap-east-1\nap-south-1\nap-southeast-1\nap-southeast-2\nap-northeast-1\nap-northeast-2\nap-northeast-3\nca-central-1\ncn-north-1\ncn-northwest-1\neu-central-1\neu-west-1\neu-west-2\neu-west-3\neu-south-1\neu-north-1\nme-south-1\nsa-east-1"
   },
   {
    "fieldname": "endpoint_url",
@@ -151,7 +151,7 @@
  "hide_toolbar": 1,
  "issingle": 1,
  "links": [],
- "modified": "2020-04-13 20:57:24.432183",
+ "modified": "2020-07-27 17:27:21.400000",
  "modified_by": "Administrator",
  "module": "Integrations",
  "name": "S3 Backup Settings",
@@ -172,4 +172,4 @@
  "sort_field": "modified",
  "sort_order": "DESC",
  "track_changes": 1
-}
\ No newline at end of file
+}

From 8d18fb43230c80b40c00732850b5631c4346d54a Mon Sep 17 00:00:00 2001
From: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
Date: Wed, 29 Jul 2020 17:48:39 +0200
Subject: [PATCH 137/191] fix(oauth provider): parse cookies correctly (#11066)

---
 frappe/oauth.py | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/frappe/oauth.py b/frappe/oauth.py
index 4dc50366be..122c806072 100644
--- a/frappe/oauth.py
+++ b/frappe/oauth.py
@@ -4,6 +4,7 @@ import pytz
 
 from frappe import _
 from frappe.auth import LoginManager
+from http import cookies
 from oauthlib.oauth2.rfc6749.tokens import BearerToken
 from oauthlib.oauth2.rfc6749.grant_types import AuthorizationCodeGrant, ImplicitGrant, ResourceOwnerPasswordCredentialsGrant, ClientCredentialsGrant,  RefreshTokenGrant
 from oauthlib.oauth2 import RequestValidator
@@ -130,15 +131,12 @@ class OAuthWebRequestValidator(RequestValidator):
 		oac.scopes = get_url_delimiter().join(request.scopes)
 		oac.redirect_uri_bound_to_authorization_code = request.redirect_uri
 		oac.client = client_id
-		oac.user = unquote(cookie_dict['user_id'])
+		oac.user = unquote(cookie_dict['user_id'].value)
 		oac.authorization_code = code['code']
 		oac.save(ignore_permissions=True)
 		frappe.db.commit()
 
 	def authenticate_client(self, request, *args, **kwargs):
-
-		cookie_dict = get_cookie_dict_from_headers(request)
-
 		#Get ClientID in URL
 		if request.client_id:
 			oc = frappe.get_doc("OAuth Client", request.client_id)
@@ -155,7 +153,9 @@ class OAuthWebRequestValidator(RequestValidator):
 		except Exception as e:
 			print("Failed body authentication: Application %s does not exist".format(cid=request.client_id))
 
-		return frappe.session.user == unquote(cookie_dict.get('user_id', "Guest"))
+		cookie_dict = get_cookie_dict_from_headers(request)
+		user_id = unquote(cookie_dict['user_id']) if 'user_id' in cookie_dict else "Guest"
+		return frappe.session.user == user_id
 
 	def authenticate_client_id(self, client_id, request, *args, **kwargs):
 		cli_id = frappe.db.get_value('OAuth Client', client_id, 'name')
@@ -400,13 +400,10 @@ class OAuthWebRequestValidator(RequestValidator):
 		return True
 
 def get_cookie_dict_from_headers(r):
+	cookie = cookies.BaseCookie()
 	if r.headers.get('Cookie'):
-		cookie = r.headers.get('Cookie')
-		cookie = cookie.split("; ")
-		cookie_dict = {k:v for k,v in (x.split('=') for x in cookie)}
-		return cookie_dict
-	else:
-		return {}
+		cookie.load(r.headers.get('Cookie'))
+	return cookie
 
 def calculate_at_hash(access_token, hash_alg):
 	"""Helper method for calculating an access token

From 9cef385005e68221cc2d4b628f9080b81a434da2 Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Thu, 30 Jul 2020 14:37:22 +0530
Subject: [PATCH 138/191] refactor: refer to frappe.boot.single_types instead
 of db call

---
 .../public/js/frappe/widgets/widget_dialog.js  | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/frappe/public/js/frappe/widgets/widget_dialog.js b/frappe/public/js/frappe/widgets/widget_dialog.js
index 054159116f..1089d7e629 100644
--- a/frappe/public/js/frappe/widgets/widget_dialog.js
+++ b/frappe/public/js/frappe/widgets/widget_dialog.js
@@ -174,18 +174,12 @@ class ShortcutDialog extends WidgetDialog {
 				onchange: () => {
 					if (this.dialog.get_value("type") == "DocType") {
 						let doctype = this.dialog.get_value("link_to");
-
-						doctype &&
-							frappe.db
-								.get_value("DocType", doctype, "issingle")
-								.then((res) => {
-									if (res.message && res.message.issingle) {
-										this.hide_filters();
-									} else {
-										this.setup_filter(doctype);
-										this.show_filters();
-									}
-								});
+						if (frappe.boot.single_types.includes("Stock Settings")) {
+							this.hide_filters();
+						} else {
+							this.setup_filter(doctype);
+							this.show_filters();
+						}
 					} else {
 						this.hide_filters();
 					}

From 2ad15ee9f75dca2391e45b83f5298b1e7e90e163 Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scmmishra@users.noreply.github.com>
Date: Thu, 30 Jul 2020 14:57:01 +0530
Subject: [PATCH 139/191] fix: use doctype variable

---
 frappe/public/js/frappe/widgets/widget_dialog.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frappe/public/js/frappe/widgets/widget_dialog.js b/frappe/public/js/frappe/widgets/widget_dialog.js
index 1089d7e629..e3b4cc1d8c 100644
--- a/frappe/public/js/frappe/widgets/widget_dialog.js
+++ b/frappe/public/js/frappe/widgets/widget_dialog.js
@@ -174,7 +174,7 @@ class ShortcutDialog extends WidgetDialog {
 				onchange: () => {
 					if (this.dialog.get_value("type") == "DocType") {
 						let doctype = this.dialog.get_value("link_to");
-						if (frappe.boot.single_types.includes("Stock Settings")) {
+						if (frappe.boot.single_types.includes(doctype)) {
 							this.hide_filters();
 						} else {
 							this.setup_filter(doctype);

From 7427fb9cd3b9589d8366f330b968a9f5e8c6f310 Mon Sep 17 00:00:00 2001
From: Faris Ansari <netchamp.faris@gmail.com>
Date: Thu, 30 Jul 2020 15:56:38 +0530
Subject: [PATCH 140/191] fix: Dont validate skipped columns

---
 frappe/core/doctype/data_import/importer.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/frappe/core/doctype/data_import/importer.py b/frappe/core/doctype/data_import/importer.py
index 910e42af1a..14626eb5e3 100644
--- a/frappe/core/doctype/data_import/importer.py
+++ b/frappe/core/doctype/data_import/importer.py
@@ -955,6 +955,9 @@ class Column:
 		if not self.df:
 			return
 
+		if self.skip_import:
+			return
+
 		if self.df.fieldtype == 'Link':
 			# find all values that dont exist
 			values = list(set([cstr(v) for v in self.column_values[1:] if v]))

From 84a15407a733a57ce5d1b13c2c1fefd80f12b198 Mon Sep 17 00:00:00 2001
From: Faris Ansari <netchamp.faris@gmail.com>
Date: Thu, 30 Jul 2020 16:06:10 +0530
Subject: [PATCH 141/191] fix: Respect hostname config in sitemap.xml

---
 frappe/www/sitemap.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/frappe/www/sitemap.py b/frappe/www/sitemap.py
index 8b93270ab5..f8f03c45f8 100644
--- a/frappe/www/sitemap.py
+++ b/frappe/www/sitemap.py
@@ -5,7 +5,7 @@ from __future__ import unicode_literals
 
 import frappe
 from frappe.model.document import get_controller
-from frappe.utils import get_request_site_address, get_datetime, nowdate
+from frappe.utils import get_datetime, nowdate, get_url
 from frappe.website.router import get_pages, get_all_page_context_from_doctypes
 from six import iteritems
 from six.moves.urllib.parse import quote, urljoin
@@ -25,13 +25,13 @@ def get_context(context):
 	for route, page in iteritems(get_pages()):
 		if page.sitemap:
 			links.append({
-				"loc": urljoin(host, quote(page.name.encode("utf-8"))),
+				"loc": get_url(quote(page.name.encode("utf-8"))),
 				"lastmod": nowdate()
 			})
 
 	for route, data in iteritems(get_public_pages_from_doctypes()):
 		links.append({
-			"loc": urljoin(host, quote((route or "").encode("utf-8"))),
+			"loc": get_url(quote((route or "").encode("utf-8"))),
 			"lastmod": get_datetime(data.get("modified")).strftime("%Y-%m-%d")
 		})
 

From 7bf69c62c1cc942d394d40484502c51b96e98b9f Mon Sep 17 00:00:00 2001
From: Gavin D'souza <gavin18d@gmail.com>
Date: Thu, 30 Jul 2020 17:47:01 +0530
Subject: [PATCH 142/191] fix: suffix logger name with site

---
 frappe/utils/logger.py | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/frappe/utils/logger.py b/frappe/utils/logger.py
index c38e0e6997..1fbd54dd38 100755
--- a/frappe/utils/logger.py
+++ b/frappe/utils/logger.py
@@ -36,9 +36,11 @@ def get_logger(module, with_more_info=False, allow_site=True, filter=None):
 	else:
 		site = False
 
-	if module in frappe.loggers:
+	LOGGER_NAME = "{}-{}".format(module, site or "all")
+
+	if LOGGER_NAME in frappe.loggers:
 		try:
-			return frappe.loggers[module][site or "all"]
+			return frappe.loggers[LOGGER_NAME]
 		except:
 			pass
 
@@ -51,7 +53,7 @@ def get_logger(module, with_more_info=False, allow_site=True, filter=None):
 
 	LOG_FILENAME = os.path.join('..', 'logs', logfile)
 
-	logger = logging.getLogger(module)
+	logger = logging.getLogger(LOGGER_NAME)
 	logger.setLevel(frappe.log_level or default_log_level)
 	logger.propagate = False
 
@@ -73,11 +75,7 @@ def get_logger(module, with_more_info=False, allow_site=True, filter=None):
 
 	handler.setFormatter(formatter)
 
-	try:
-		frappe.loggers[module][site or "all"] = logger
-	except KeyError:
-		frappe.loggers[module] = {}
-		frappe.loggers[module][site or "all"] = logger
+	frappe.loggers[LOGGER_NAME] = logger
 
 	return logger
 

From 090b81f2f268447581eac496bb245af3a17224c5 Mon Sep 17 00:00:00 2001
From: Gavin D'souza <gavin18d@gmail.com>
Date: Thu, 30 Jul 2020 17:59:01 +0530
Subject: [PATCH 143/191] style: black + restructure

---
 frappe/utils/logger.py | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/frappe/utils/logger.py b/frappe/utils/logger.py
index 1fbd54dd38..79ea93e3bd 100755
--- a/frappe/utils/logger.py
+++ b/frappe/utils/logger.py
@@ -30,7 +30,7 @@ def get_logger(module, with_more_info=False, allow_site=True, filter=None):
 	"""
 
 	if allow_site == True:
-		site = getattr(frappe.local, 'site', None)
+		site = getattr(frappe.local, "site", None)
 	elif allow_site:
 		site = allow_site
 	else:
@@ -48,21 +48,21 @@ def get_logger(module, with_more_info=False, allow_site=True, filter=None):
 		module = "frappe"
 		with_more_info = True
 
-	logfile = module + '.log'
+	logfile = module + ".log"
 
-
-	LOG_FILENAME = os.path.join('..', 'logs', logfile)
+	LOG_FILENAME = os.path.join("..", "logs", logfile)
 
 	logger = logging.getLogger(LOGGER_NAME)
 	logger.setLevel(frappe.log_level or default_log_level)
 	logger.propagate = False
 
-	formatter = logging.Formatter('%(asctime)s %(levelname)s %(name)s %(message)s')
+	formatter = logging.Formatter("%(asctime)s %(levelname)s %(name)s %(message)s")
 	handler = RotatingFileHandler(LOG_FILENAME, maxBytes=100_000, backupCount=20)
+	handler.setFormatter(formatter)
 	logger.addHandler(handler)
 
 	if site:
-		SITELOG_FILENAME = os.path.join(site, 'logs', logfile)
+		SITELOG_FILENAME = os.path.join(site, "logs", logfile)
 		site_handler = RotatingFileHandler(SITELOG_FILENAME, maxBytes=100_000, backupCount=20)
 		site_handler.setFormatter(formatter)
 		logger.addHandler(site_handler)
@@ -73,20 +73,23 @@ def get_logger(module, with_more_info=False, allow_site=True, filter=None):
 	if filter:
 		logger.addFilter(filter)
 
-	handler.setFormatter(formatter)
-
 	frappe.loggers[LOGGER_NAME] = logger
 
 	return logger
 
+
 class SiteContextFilter(logging.Filter):
 	"""This is a filter which injects request information (if available) into the log."""
+
 	def filter(self, record):
 		if "Form Dict" not in text_type(record.msg):
-			record.msg = text_type(record.msg) + "\nSite: {0}\nForm Dict: {1}".format(getattr(frappe.local, 'site', None), getattr(frappe.local, 'form_dict', None))
+			site = getattr(frappe.local, "site", None)
+			form_dict = getattr(frappe.local, "form_dict", None)
+			record.msg = text_type(record.msg) + "\nSite: {0}\nForm Dict: {1}".format(site, form_dict)
 			return True
 
+
 def set_log_level(level):
-	'''Use this method to set log level to something other than the default DEBUG'''
-	frappe.log_level = getattr(logging, (level or '').upper(), None) or default_log_level
+	"""Use this method to set log level to something other than the default DEBUG"""
+	frappe.log_level = getattr(logging, (level or "").upper(), None) or default_log_level
 	frappe.loggers = {}

From fac7f359ae0b49064003e7424989579d580b7535 Mon Sep 17 00:00:00 2001
From: Gavin D'souza <gavin18d@gmail.com>
Date: Thu, 30 Jul 2020 18:49:59 +0530
Subject: [PATCH 144/191] fix: original log format + EAFP

---
 frappe/utils/logger.py | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/frappe/utils/logger.py b/frappe/utils/logger.py
index 79ea93e3bd..46269fe909 100755
--- a/frappe/utils/logger.py
+++ b/frappe/utils/logger.py
@@ -38,26 +38,24 @@ def get_logger(module, with_more_info=False, allow_site=True, filter=None):
 
 	LOGGER_NAME = "{}-{}".format(module, site or "all")
 
-	if LOGGER_NAME in frappe.loggers:
-		try:
-			return frappe.loggers[LOGGER_NAME]
-		except:
-			pass
+	try:
+		return frappe.loggers[LOGGER_NAME]
+	except KeyError:
+		pass
 
 	if not module:
 		module = "frappe"
 		with_more_info = True
 
 	logfile = module + ".log"
-
-	LOG_FILENAME = os.path.join("..", "logs", logfile)
+	log_filename = os.path.join("..", "logs", logfile)
 
 	logger = logging.getLogger(LOGGER_NAME)
 	logger.setLevel(frappe.log_level or default_log_level)
 	logger.propagate = False
 
-	formatter = logging.Formatter("%(asctime)s %(levelname)s %(name)s %(message)s")
-	handler = RotatingFileHandler(LOG_FILENAME, maxBytes=100_000, backupCount=20)
+	formatter = logging.Formatter("%(asctime)s %(levelname)s {0} %(message)s".format(module))
+	handler = RotatingFileHandler(log_filename, maxBytes=100_000, backupCount=20)
 	handler.setFormatter(formatter)
 	logger.addHandler(handler)
 

From faa9a5466eacc4d07e19286309f36aeb8468f7ec Mon Sep 17 00:00:00 2001
From: Gavin D'souza <gavin18d@gmail.com>
Date: Thu, 30 Jul 2020 19:04:04 +0530
Subject: [PATCH 145/191] fix: Slider

---
 frappe/utils/logger.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frappe/utils/logger.py b/frappe/utils/logger.py
index 46269fe909..6d24eef9d3 100755
--- a/frappe/utils/logger.py
+++ b/frappe/utils/logger.py
@@ -29,7 +29,7 @@ def get_logger(module, with_more_info=False, allow_site=True, filter=None):
 		<class 'logging.Logger'>: Returns a Python logger object with Site and Bench level logging capabilities.
 	"""
 
-	if allow_site == True:
+	if allow_site is True:
 		site = getattr(frappe.local, "site", None)
 	elif allow_site:
 		site = allow_site

From 444e8225a46188137028f99cb12efcab195559b5 Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Thu, 30 Jul 2020 19:50:36 +0530
Subject: [PATCH 146/191] fix: setup filters only if doctype is available

---
 frappe/public/js/frappe/widgets/widget_dialog.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/frappe/public/js/frappe/widgets/widget_dialog.js b/frappe/public/js/frappe/widgets/widget_dialog.js
index e3b4cc1d8c..2ca26d59e1 100644
--- a/frappe/public/js/frappe/widgets/widget_dialog.js
+++ b/frappe/public/js/frappe/widgets/widget_dialog.js
@@ -174,9 +174,9 @@ class ShortcutDialog extends WidgetDialog {
 				onchange: () => {
 					if (this.dialog.get_value("type") == "DocType") {
 						let doctype = this.dialog.get_value("link_to");
-						if (frappe.boot.single_types.includes(doctype)) {
+						if (doctype && frappe.boot.single_types.includes(doctype)) {
 							this.hide_filters();
-						} else {
+						} else if (doctype) {
 							this.setup_filter(doctype);
 							this.show_filters();
 						}

From 94116ae93c416958619e98aa47ad979481ec9dd1 Mon Sep 17 00:00:00 2001
From: Gavin D'souza <gavin18d@gmail.com>
Date: Fri, 31 Jul 2020 16:07:51 +0530
Subject: [PATCH 147/191] feat(logger): allow max_size and file_count params

---
 frappe/__init__.py     |  4 ++--
 frappe/utils/logger.py | 20 +++++++++++---------
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/frappe/__init__.py b/frappe/__init__.py
index 7ea95ec3db..45f40f7783 100644
--- a/frappe/__init__.py
+++ b/frappe/__init__.py
@@ -1559,10 +1559,10 @@ def get_doctype_app(doctype):
 
 loggers = {}
 log_level = None
-def logger(module=None, with_more_info=False, allow_site=True, filter=None):
+def logger(module=None, with_more_info=False, allow_site=True, filter=None, max_size=100_000, file_count=20):
 	'''Returns a python logger that uses StreamHandler'''
 	from frappe.utils.logger import get_logger
-	return get_logger(module=module, with_more_info=with_more_info, allow_site=allow_site, filter=filter)
+	return get_logger(module=module, with_more_info=with_more_info, allow_site=allow_site, filter=filter, max_size=max_size, file_count=file_count)
 
 def log_error(message=None, title=_("Error")):
 	'''Log error to Error Log'''
diff --git a/frappe/utils/logger.py b/frappe/utils/logger.py
index 6d24eef9d3..b3295cccdf 100755
--- a/frappe/utils/logger.py
+++ b/frappe/utils/logger.py
@@ -16,14 +16,16 @@ import frappe
 default_log_level = logging.DEBUG
 
 
-def get_logger(module, with_more_info=False, allow_site=True, filter=None):
+def get_logger(module, with_more_info=False, allow_site=True, filter=None, max_size=100_000, file_count=20):
 	"""Application Logger for your given module
 
 	Args:
 		module (str): Name of your logger and consequently your log file.
 		with_more_info (bool, optional): Will log the form dict using the SiteContextFilter. Defaults to False.
 		allow_site ((str, bool), optional): Pass site name to explicitly log under it's logs. If True and unspecified, guesses which site the logs would be saved under. Defaults to True.
-		filter (function, optional): Add a filter function for your logger
+		filter (function, optional): Add a filter function for your logger. Defaults to None.
+		max_size (int, optional): Max file size of each log file in kB. Defaults to 100_000.
+		file_count (int, optional): Max count of log files to be retained via Log Rotation. Defaults to 20.
 
 	Returns:
 		<class 'logging.Logger'>: Returns a Python logger object with Site and Bench level logging capabilities.
@@ -36,10 +38,10 @@ def get_logger(module, with_more_info=False, allow_site=True, filter=None):
 	else:
 		site = False
 
-	LOGGER_NAME = "{}-{}".format(module, site or "all")
+	logger_name = "{0}-{1}".format(module, site or "all")
 
 	try:
-		return frappe.loggers[LOGGER_NAME]
+		return frappe.loggers[logger_name]
 	except KeyError:
 		pass
 
@@ -50,18 +52,18 @@ def get_logger(module, with_more_info=False, allow_site=True, filter=None):
 	logfile = module + ".log"
 	log_filename = os.path.join("..", "logs", logfile)
 
-	logger = logging.getLogger(LOGGER_NAME)
+	logger = logging.getLogger(logger_name)
 	logger.setLevel(frappe.log_level or default_log_level)
 	logger.propagate = False
 
 	formatter = logging.Formatter("%(asctime)s %(levelname)s {0} %(message)s".format(module))
-	handler = RotatingFileHandler(log_filename, maxBytes=100_000, backupCount=20)
+	handler = RotatingFileHandler(log_filename, maxBytes=max_size, backupCount=file_count)
 	handler.setFormatter(formatter)
 	logger.addHandler(handler)
 
 	if site:
-		SITELOG_FILENAME = os.path.join(site, "logs", logfile)
-		site_handler = RotatingFileHandler(SITELOG_FILENAME, maxBytes=100_000, backupCount=20)
+		sitelog_filename = os.path.join(site, "logs", logfile)
+		site_handler = RotatingFileHandler(sitelog_filename, maxBytes=max_size, backupCount=file_count)
 		site_handler.setFormatter(formatter)
 		logger.addHandler(site_handler)
 
@@ -71,7 +73,7 @@ def get_logger(module, with_more_info=False, allow_site=True, filter=None):
 	if filter:
 		logger.addFilter(filter)
 
-	frappe.loggers[LOGGER_NAME] = logger
+	frappe.loggers[logger_name] = logger
 
 	return logger
 

From f04ce5dd7a7957d46ef12d2d5e2216bb93e753e1 Mon Sep 17 00:00:00 2001
From: Gavin D'souza <gavin18d@gmail.com>
Date: Fri, 31 Jul 2020 16:11:39 +0530
Subject: [PATCH 148/191] chore: Typo

---
 frappe/utils/logger.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frappe/utils/logger.py b/frappe/utils/logger.py
index b3295cccdf..451211b74b 100755
--- a/frappe/utils/logger.py
+++ b/frappe/utils/logger.py
@@ -24,7 +24,7 @@ def get_logger(module, with_more_info=False, allow_site=True, filter=None, max_s
 		with_more_info (bool, optional): Will log the form dict using the SiteContextFilter. Defaults to False.
 		allow_site ((str, bool), optional): Pass site name to explicitly log under it's logs. If True and unspecified, guesses which site the logs would be saved under. Defaults to True.
 		filter (function, optional): Add a filter function for your logger. Defaults to None.
-		max_size (int, optional): Max file size of each log file in kB. Defaults to 100_000.
+		max_size (int, optional): Max file size of each log file in bytes. Defaults to 100_000.
 		file_count (int, optional): Max count of log files to be retained via Log Rotation. Defaults to 20.
 
 	Returns:

From a87531e1d0a808f69ce9d12a7e2fc9a9bb962641 Mon Sep 17 00:00:00 2001
From: Gavin D'souza <gavin18d@gmail.com>
Date: Fri, 31 Jul 2020 17:26:37 +0530
Subject: [PATCH 149/191] fix(get_logger): allow None for module

---
 frappe/utils/logger.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/frappe/utils/logger.py b/frappe/utils/logger.py
index 451211b74b..398cdd0bfc 100755
--- a/frappe/utils/logger.py
+++ b/frappe/utils/logger.py
@@ -16,11 +16,11 @@ import frappe
 default_log_level = logging.DEBUG
 
 
-def get_logger(module, with_more_info=False, allow_site=True, filter=None, max_size=100_000, file_count=20):
+def get_logger(module=None, with_more_info=False, allow_site=True, filter=None, max_size=100_000, file_count=20):
 	"""Application Logger for your given module
 
 	Args:
-		module (str): Name of your logger and consequently your log file.
+		module (str, optional): Name of your logger and consequently your log file. Defaults to None.
 		with_more_info (bool, optional): Will log the form dict using the SiteContextFilter. Defaults to False.
 		allow_site ((str, bool), optional): Pass site name to explicitly log under it's logs. If True and unspecified, guesses which site the logs would be saved under. Defaults to True.
 		filter (function, optional): Add a filter function for your logger. Defaults to None.

From c423eb7288623fb770216d712e923ee96c22e88f Mon Sep 17 00:00:00 2001
From: prssanna <prssud@gmail.com>
Date: Fri, 31 Jul 2020 18:05:23 +0530
Subject: [PATCH 150/191] fix: text in MultiSelectList doesn't get truncated

---
 frappe/public/js/frappe/form/controls/multiselect_list.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frappe/public/js/frappe/form/controls/multiselect_list.js b/frappe/public/js/frappe/form/controls/multiselect_list.js
index cd86bdd767..2a7ee5cb10 100644
--- a/frappe/public/js/frappe/form/controls/multiselect_list.js
+++ b/frappe/public/js/frappe/form/controls/multiselect_list.js
@@ -3,7 +3,7 @@ frappe.ui.form.ControlMultiSelectList = frappe.ui.form.ControlData.extend({
 		let template  = `
 			<div class="multiselect-list dropdown">
 				<div class="form-control cursor-pointer dropdown-toggle input-sm" data-toggle="dropdown" tabindex=0>
-					<span class="status-text ellipsis"></span>
+					<div class="status-text ellipsis"></div>
 				</div>
 				<ul class="dropdown-menu">
 					<li class="dropdown-input-wrapper">

From eab96ab904d9f39739111f8c486d0cecf4240638 Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scmmishra@users.noreply.github.com>
Date: Sat, 1 Aug 2020 13:42:33 +0530
Subject: [PATCH 151/191] Revert "fix(image-with-blur): Set width, height in
 CSS"

---
 frappe/templates/includes/image_with_blur.html | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/frappe/templates/includes/image_with_blur.html b/frappe/templates/includes/image_with_blur.html
index dbddb9d8ef..20b0380b88 100644
--- a/frappe/templates/includes/image_with_blur.html
+++ b/frappe/templates/includes/image_with_blur.html
@@ -1,9 +1,7 @@
 {%- set res = frappe.utils.get_thumbnail_base64_for_image(src) if src else false -%}
 {%- if res and res['base64'].startswith('data:') -%}
 <img src="{{ res['base64'] }}" class="image-with-blur {{ resolve_class(class) }}"
-	data-src="{{ src or '' }}" alt="{{ alt or '' }}"
-	width="{{ res['width'] }}" height="{{ res['height'] }}"
-	style="width: {{ res['width'] }}px; height: {{ res['height'] }}px;" />
+	alt="{{ alt or '' }}" width="{{ res['width'] }}" height="{{ res['height'] }}" data-src="{{ src or '' }}" />
 {%- else -%}
 <img src="{{ src or '' }}" class="{{ resolve_class(class) }}" alt="{{ alt or '' }}" />
 {%- endif -%}

From 0bc2e6e9c808126feee66b6da7b592fe451ab7ae Mon Sep 17 00:00:00 2001
From: Suraj Shetty <surajshetty3416@gmail.com>
Date: Mon, 3 Aug 2020 10:44:51 +0530
Subject: [PATCH 152/191] chore: Run test in verbose mode

---
 .travis.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 63895675ea..3ae844bc3a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -31,12 +31,12 @@ matrix:
   - name: "Python 3.7 MariaDB"
     python: 3.7
     env: DB=mariadb TYPE=server
-    script: bench --site test_site run-tests --coverage
+    script: bench --site test_site --versbose run-tests --coverage
 
   - name: "Python 3.7 PostgreSQL"
     python: 3.7
     env: DB=postgres TYPE=server
-    script: bench --site test_site run-tests --coverage
+    script: bench --site test_site --versbose run-tests --coverage
 
   - name: "Cypress"
     python: 3.7

From 817e90d17111b4618f4e3c44e623222e62255f51 Mon Sep 17 00:00:00 2001
From: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
Date: Mon, 3 Aug 2020 10:54:20 +0530
Subject: [PATCH 153/191] fix: Typo

---
 .travis.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 3ae844bc3a..eb35e0cca2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -31,12 +31,12 @@ matrix:
   - name: "Python 3.7 MariaDB"
     python: 3.7
     env: DB=mariadb TYPE=server
-    script: bench --site test_site --versbose run-tests --coverage
+    script: bench --site test_site --verbose run-tests --coverage
 
   - name: "Python 3.7 PostgreSQL"
     python: 3.7
     env: DB=postgres TYPE=server
-    script: bench --site test_site --versbose run-tests --coverage
+    script: bench --site test_site --verbose run-tests --coverage
 
   - name: "Cypress"
     python: 3.7

From f0729ff6a8a58239e68c5c0810becc3ec27b056e Mon Sep 17 00:00:00 2001
From: Suraj Shetty <surajshetty3416@gmail.com>
Date: Mon, 3 Aug 2020 12:00:44 +0530
Subject: [PATCH 154/191] test: Reset workflow doc

---
 frappe/workflow/doctype/workflow/test_workflow.py | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/frappe/workflow/doctype/workflow/test_workflow.py b/frappe/workflow/doctype/workflow/test_workflow.py
index 2719bc7cf0..b8c40d4d3b 100644
--- a/frappe/workflow/doctype/workflow/test_workflow.py
+++ b/frappe/workflow/doctype/workflow/test_workflow.py
@@ -78,7 +78,7 @@ class TestWorkflow(unittest.TestCase):
 		frappe.set_user('test2@example.com')
 
 		doc = self.test_default_condition()
-		workflow_actions = frappe.get_all('Workflow Action', fields=['status'])
+		workflow_actions = frappe.get_all('Workflow Action', fields=['status', 'reference_name'])
 		self.assertEqual(len(workflow_actions), 1)
 
 		# test if status of workflow actions are updated on approval
@@ -102,6 +102,9 @@ class TestWorkflow(unittest.TestCase):
 		todo.reload()
 		self.assertEqual(todo.docstatus, 1)
 
+		self.workflow.states[1].doc_status = 0
+		self.workflow.save()
+
 	def test_if_workflow_set_on_action(self):
 		self.workflow.states[1].doc_status = 1
 		self.workflow.save()
@@ -111,6 +114,9 @@ class TestWorkflow(unittest.TestCase):
 		self.assertEqual(todo.docstatus, 1)
 		self.assertEqual(todo.workflow_state, 'Approved')
 
+		self.workflow.states[1].doc_status = 0
+		self.workflow.save()
+
 def create_todo_workflow():
 	if frappe.db.exists('Workflow', 'Test ToDo'):
 		return frappe.get_doc('Workflow', 'Test ToDo').save(ignore_permissions=True)

From 9445c115ecdf9ffbf5386adaf279935648a96754 Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scmmishra@users.noreply.github.com>
Date: Mon, 3 Aug 2020 15:51:30 +0530
Subject: [PATCH 155/191] fix: check if is_standard is "Yes" (#11180)

---
 frappe/core/doctype/report/report.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frappe/core/doctype/report/report.js b/frappe/core/doctype/report/report.js
index b4c30f5bbd..c410e9aa1a 100644
--- a/frappe/core/doctype/report/report.js
+++ b/frappe/core/doctype/report/report.js
@@ -1,6 +1,6 @@
 frappe.ui.form.on('Report', {
 	refresh: function(frm) {
-		if (frm.doc.is_standard && !frappe.boot.developer_mode) {
+		if (frm.doc.is_standard === "Yes" && !frappe.boot.developer_mode) {
 			// make the document read-only
 			frm.set_read_only();
 		}

From 4b93f75eba40625bba5b83cca2470aa179e3f082 Mon Sep 17 00:00:00 2001
From: Gavin D'souza <gavin18d@gmail.com>
Date: Mon, 3 Aug 2020 17:23:32 +0530
Subject: [PATCH 156/191] fix: Log site only if exists

---
 frappe/app.py          | 5 ++---
 frappe/utils/logger.py | 3 ++-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/frappe/app.py b/frappe/app.py
index 100b10e9ef..450e3b5f17 100644
--- a/frappe/app.py
+++ b/frappe/app.py
@@ -99,9 +99,8 @@ def application(request):
 		frappe.monitor.stop(response)
 		frappe.recorder.dump()
 
-		_site = get_site_name(request.host)
-		frappe.logger("frappe.web", allow_site=_site).info({
-			"site": _site,
+		frappe.logger("frappe.web", allow_site=frappe.local.site).info({
+			"site": get_site_name(request.host),
 			"remote_addr": getattr(request, "remote_addr", "NOTFOUND"),
 			"base_url": getattr(request, "base_url", "NOTFOUND"),
 			"full_path": getattr(request, "full_path", "NOTFOUND"),
diff --git a/frappe/utils/logger.py b/frappe/utils/logger.py
index 398cdd0bfc..364ffa776d 100755
--- a/frappe/utils/logger.py
+++ b/frappe/utils/logger.py
@@ -11,6 +11,7 @@ from six import text_type
 
 # imports - module imports
 import frappe
+from frappe.utils import get_sites
 
 
 default_log_level = logging.DEBUG
@@ -33,7 +34,7 @@ def get_logger(module=None, with_more_info=False, allow_site=True, filter=None,
 
 	if allow_site is True:
 		site = getattr(frappe.local, "site", None)
-	elif allow_site:
+	elif allow_site in get_sites():
 		site = allow_site
 	else:
 		site = False

From 00a8edf910b4c328aeb69f674db31439e206fd54 Mon Sep 17 00:00:00 2001
From: Suraj Shetty <surajshetty3416@gmail.com>
Date: Mon, 3 Aug 2020 23:53:01 +0530
Subject: [PATCH 157/191] test: Make User records before executing test

---
 frappe/workflow/doctype/workflow/test_workflow.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/frappe/workflow/doctype/workflow/test_workflow.py b/frappe/workflow/doctype/workflow/test_workflow.py
index b8c40d4d3b..fc12832e57 100644
--- a/frappe/workflow/doctype/workflow/test_workflow.py
+++ b/frappe/workflow/doctype/workflow/test_workflow.py
@@ -5,7 +5,10 @@ from __future__ import unicode_literals
 import frappe
 import unittest
 from frappe.utils import random_string
-from frappe.model.workflow import apply_workflow, WorkflowTransitionError, WorkflowPermissionError, get_common_transition_actions
+from frappe.model.workflow import apply_workflow, WorkflowTransitionError, WorkflowPermissionError, get_common_transition_actions, get_workflow
+from frappe.test_runner import make_test_records
+
+make_test_records("User")
 
 class TestWorkflow(unittest.TestCase):
 	def setUp(self):

From e555970485467b69cddcbc7fce990f94c722f1cc Mon Sep 17 00:00:00 2001
From: Suraj Shetty <surajshetty3416@gmail.com>
Date: Mon, 3 Aug 2020 23:53:44 +0530
Subject: [PATCH 158/191] chore: Comment out possibly problematic test

---
 .../event_producer/test_event_producer.py     | 80 +++++++++----------
 1 file changed, 40 insertions(+), 40 deletions(-)

diff --git a/frappe/event_streaming/doctype/event_producer/test_event_producer.py b/frappe/event_streaming/doctype/event_producer/test_event_producer.py
index 0d414f5d63..cda4ca8bf6 100644
--- a/frappe/event_streaming/doctype/event_producer/test_event_producer.py
+++ b/frappe/event_streaming/doctype/event_producer/test_event_producer.py
@@ -203,49 +203,49 @@ class TestEventProducer(unittest.TestCase):
 
 		reset_configuration(producer_url)
 
-	def test_inner_mapping(self):
-		producer = get_remote_site()
-		event_producer = frappe.get_doc('Event Producer', producer_url)
-		event_producer.producer_doctypes = []
-		inner_mapping = [
-			{
-				'local_fieldname':'role_name',
-				'remote_fieldname':'title'
-			}
-		]
-		inner_map = get_mapping('Role to Note Dependency Creation', 'Role', 'Note', inner_mapping)
-		mapping = [
-			{
-				'local_fieldname':'description',
-				'remote_fieldname':'content',
-			},
-			{
-				'local_fieldname': 'role',
-				'remote_fieldname': 'title',
-				'mapping_type': 'Document',
-				'mapping': inner_map,
-				'remote_value_filters': json.dumps({'title': 'title'})
-			}
-		]
-		event_producer.append('producer_doctypes', {
-			'ref_doctype': 'ToDo',
-			'use_same_name': 1,
-			'has_mapping': 1,
-			'mapping': get_mapping('ToDo to Note Mapping', 'ToDo', 'Note', mapping)
-		})
-		event_producer.save()
+	# def test_inner_mapping(self):
+	# 	producer = get_remote_site()
+	# 	event_producer = frappe.get_doc('Event Producer', producer_url)
+	# 	event_producer.producer_doctypes = []
+	# 	inner_mapping = [
+	# 		{
+	# 			'local_fieldname':'role_name',
+	# 			'remote_fieldname':'title'
+	# 		}
+	# 	]
+	# 	inner_map = get_mapping('Role to Note Dependency Creation', 'Role', 'Note', inner_mapping)
+	# 	mapping = [
+	# 		{
+	# 			'local_fieldname':'description',
+	# 			'remote_fieldname':'content',
+	# 		},
+	# 		{
+	# 			'local_fieldname': 'role',
+	# 			'remote_fieldname': 'title',
+	# 			'mapping_type': 'Document',
+	# 			'mapping': inner_map,
+	# 			'remote_value_filters': json.dumps({'title': 'title'})
+	# 		}
+	# 	]
+	# 	event_producer.append('producer_doctypes', {
+	# 		'ref_doctype': 'ToDo',
+	# 		'use_same_name': 1,
+	# 		'has_mapping': 1,
+	# 		'mapping': get_mapping('ToDo to Note Mapping', 'ToDo', 'Note', mapping)
+	# 	})
+	# 	event_producer.save()
 
-		producer_note = frappe._dict(doctype='Note', title='Inner Mapping Tester', content='Test Inner Mapping')
-		delete_on_remote_if_exists(producer, 'Note', {'title': producer_note.title})
-		producer_note = producer.insert(producer_note)
-		self.pull_producer_data()
+	# 	producer_note = frappe._dict(doctype='Note', title='Inner Mapping Tester', content='Test Inner Mapping')
+	# 	delete_on_remote_if_exists(producer, 'Note', {'title': producer_note.title})
+	# 	producer_note = producer.insert(producer_note)
+	# 	self.pull_producer_data()
 
-		#check dependency inserted
-		self.assertTrue(frappe.db.exists('Role', {'role_name': producer_note.title}))
-		#check doc inserted
-		self.assertTrue(frappe.db.exists('ToDo', {'description': producer_note.content}))
+	# 	#check dependency inserted
+	# 	self.assertTrue(frappe.db.exists('Role', {'role_name': producer_note.title}))
+	# 	#check doc inserted
+	# 	self.assertTrue(frappe.db.exists('ToDo', {'description': producer_note.content}))
 
-		reset_configuration(producer_url)
+	# 	reset_configuration(producer_url)
 
 
 def insert_into_producer(producer, description):

From 88b68c6cf51061b4b1a37b93b5426279fc1dfe9d Mon Sep 17 00:00:00 2001
From: Suraj Shetty <surajshetty3416@gmail.com>
Date: Tue, 4 Aug 2020 00:11:48 +0530
Subject: [PATCH 159/191] chore: Remove unwanted changes

---
 .travis.yml                                       | 4 ++--
 frappe/workflow/doctype/workflow/test_workflow.py | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index eb35e0cca2..63895675ea 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -31,12 +31,12 @@ matrix:
   - name: "Python 3.7 MariaDB"
     python: 3.7
     env: DB=mariadb TYPE=server
-    script: bench --site test_site --verbose run-tests --coverage
+    script: bench --site test_site run-tests --coverage
 
   - name: "Python 3.7 PostgreSQL"
     python: 3.7
     env: DB=postgres TYPE=server
-    script: bench --site test_site --verbose run-tests --coverage
+    script: bench --site test_site run-tests --coverage
 
   - name: "Cypress"
     python: 3.7
diff --git a/frappe/workflow/doctype/workflow/test_workflow.py b/frappe/workflow/doctype/workflow/test_workflow.py
index fc12832e57..253f95dab7 100644
--- a/frappe/workflow/doctype/workflow/test_workflow.py
+++ b/frappe/workflow/doctype/workflow/test_workflow.py
@@ -5,7 +5,7 @@ from __future__ import unicode_literals
 import frappe
 import unittest
 from frappe.utils import random_string
-from frappe.model.workflow import apply_workflow, WorkflowTransitionError, WorkflowPermissionError, get_common_transition_actions, get_workflow
+from frappe.model.workflow import apply_workflow, WorkflowTransitionError, WorkflowPermissionError, get_common_transition_actions
 from frappe.test_runner import make_test_records
 
 make_test_records("User")

From 89dfd82134d02d1a88444d02f858be820371129b Mon Sep 17 00:00:00 2001
From: Suraj Shetty <surajshetty3416@gmail.com>
Date: Tue, 4 Aug 2020 00:36:42 +0530
Subject: [PATCH 160/191] chore: Add debug statement - Uncomment innocent test

---
 .../event_producer/test_event_producer.py     | 80 +++++++++----------
 .../doctype/workflow/test_workflow.py         |  3 +
 2 files changed, 43 insertions(+), 40 deletions(-)

diff --git a/frappe/event_streaming/doctype/event_producer/test_event_producer.py b/frappe/event_streaming/doctype/event_producer/test_event_producer.py
index cda4ca8bf6..0d414f5d63 100644
--- a/frappe/event_streaming/doctype/event_producer/test_event_producer.py
+++ b/frappe/event_streaming/doctype/event_producer/test_event_producer.py
@@ -203,49 +203,49 @@ class TestEventProducer(unittest.TestCase):
 
 		reset_configuration(producer_url)
 
-	# def test_inner_mapping(self):
-	# 	producer = get_remote_site()
-	# 	event_producer = frappe.get_doc('Event Producer', producer_url)
-	# 	event_producer.producer_doctypes = []
-	# 	inner_mapping = [
-	# 		{
-	# 			'local_fieldname':'role_name',
-	# 			'remote_fieldname':'title'
-	# 		}
-	# 	]
-	# 	inner_map = get_mapping('Role to Note Dependency Creation', 'Role', 'Note', inner_mapping)
-	# 	mapping = [
-	# 		{
-	# 			'local_fieldname':'description',
-	# 			'remote_fieldname':'content',
-	# 		},
-	# 		{
-	# 			'local_fieldname': 'role',
-	# 			'remote_fieldname': 'title',
-	# 			'mapping_type': 'Document',
-	# 			'mapping': inner_map,
-	# 			'remote_value_filters': json.dumps({'title': 'title'})
-	# 		}
-	# 	]
-	# 	event_producer.append('producer_doctypes', {
-	# 		'ref_doctype': 'ToDo',
-	# 		'use_same_name': 1,
-	# 		'has_mapping': 1,
-	# 		'mapping': get_mapping('ToDo to Note Mapping', 'ToDo', 'Note', mapping)
-	# 	})
-	# 	event_producer.save()
+	def test_inner_mapping(self):
+		producer = get_remote_site()
+		event_producer = frappe.get_doc('Event Producer', producer_url)
+		event_producer.producer_doctypes = []
+		inner_mapping = [
+			{
+				'local_fieldname':'role_name',
+				'remote_fieldname':'title'
+			}
+		]
+		inner_map = get_mapping('Role to Note Dependency Creation', 'Role', 'Note', inner_mapping)
+		mapping = [
+			{
+				'local_fieldname':'description',
+				'remote_fieldname':'content',
+			},
+			{
+				'local_fieldname': 'role',
+				'remote_fieldname': 'title',
+				'mapping_type': 'Document',
+				'mapping': inner_map,
+				'remote_value_filters': json.dumps({'title': 'title'})
+			}
+		]
+		event_producer.append('producer_doctypes', {
+			'ref_doctype': 'ToDo',
+			'use_same_name': 1,
+			'has_mapping': 1,
+			'mapping': get_mapping('ToDo to Note Mapping', 'ToDo', 'Note', mapping)
+		})
+		event_producer.save()
 
-	# 	producer_note = frappe._dict(doctype='Note', title='Inner Mapping Tester', content='Test Inner Mapping')
-	# 	delete_on_remote_if_exists(producer, 'Note', {'title': producer_note.title})
-	# 	producer_note = producer.insert(producer_note)
-	# 	self.pull_producer_data()
+		producer_note = frappe._dict(doctype='Note', title='Inner Mapping Tester', content='Test Inner Mapping')
+		delete_on_remote_if_exists(producer, 'Note', {'title': producer_note.title})
+		producer_note = producer.insert(producer_note)
+		self.pull_producer_data()
 
-	# 	#check dependency inserted
-	# 	self.assertTrue(frappe.db.exists('Role', {'role_name': producer_note.title}))
-	# 	#check doc inserted
-	# 	self.assertTrue(frappe.db.exists('ToDo', {'description': producer_note.content}))
+		#check dependency inserted
+		self.assertTrue(frappe.db.exists('Role', {'role_name': producer_note.title}))
+		#check doc inserted
+		self.assertTrue(frappe.db.exists('ToDo', {'description': producer_note.content}))
 
-	# 	reset_configuration(producer_url)
+		reset_configuration(producer_url)
 
 
 def insert_into_producer(producer, description):
diff --git a/frappe/workflow/doctype/workflow/test_workflow.py b/frappe/workflow/doctype/workflow/test_workflow.py
index 253f95dab7..f94193fab9 100644
--- a/frappe/workflow/doctype/workflow/test_workflow.py
+++ b/frappe/workflow/doctype/workflow/test_workflow.py
@@ -30,6 +30,9 @@ class TestWorkflow(unittest.TestCase):
 	def test_approve(self, doc=None):
 		'''test simple workflow'''
 		todo = doc or self.test_default_condition()
+		print(frappe.db.sql("select name from `tabRole`"))
+		print('------------')
+		print(frappe.get_roles(), frappe.session.user)
 
 		apply_workflow(todo, 'Approve')
 		# default condition is set

From 6e9169a0aadc6b05af83432293297220e633631d Mon Sep 17 00:00:00 2001
From: Suraj Shetty <surajshetty3416@gmail.com>
Date: Tue, 4 Aug 2020 10:12:41 +0530
Subject: [PATCH 161/191] test: Remove debug statements & clear-cache

---
 frappe/workflow/doctype/workflow/test_workflow.py | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/frappe/workflow/doctype/workflow/test_workflow.py b/frappe/workflow/doctype/workflow/test_workflow.py
index f94193fab9..fb42e6fd6e 100644
--- a/frappe/workflow/doctype/workflow/test_workflow.py
+++ b/frappe/workflow/doctype/workflow/test_workflow.py
@@ -30,9 +30,6 @@ class TestWorkflow(unittest.TestCase):
 	def test_approve(self, doc=None):
 		'''test simple workflow'''
 		todo = doc or self.test_default_condition()
-		print(frappe.db.sql("select name from `tabRole`"))
-		print('------------')
-		print(frappe.get_roles(), frappe.session.user)
 
 		apply_workflow(todo, 'Approve')
 		# default condition is set
@@ -129,6 +126,7 @@ def create_todo_workflow():
 	else:
 		frappe.get_doc(dict(doctype='Role',
 			role_name='Test Approver')).insert(ignore_if_duplicate=True)
+		frappe.cache().hdel('roles', 'Administrator')
 		workflow = frappe.new_doc('Workflow')
 		workflow.workflow_name = 'Test ToDo'
 		workflow.document_type = 'ToDo'

From 744a9413fdc7ffee3ac26883add9a950c3f0ab19 Mon Sep 17 00:00:00 2001
From: Suraj Shetty <surajshetty3416@gmail.com>
Date: Tue, 4 Aug 2020 10:36:16 +0530
Subject: [PATCH 162/191] fix: Use common function to get_roles

---
 frappe/__init__.py                                | 6 +-----
 frappe/workflow/doctype/workflow/test_workflow.py | 1 -
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/frappe/__init__.py b/frappe/__init__.py
index d644d2a473..f91317584d 100644
--- a/frappe/__init__.py
+++ b/frappe/__init__.py
@@ -437,11 +437,7 @@ def get_roles(username=None):
 	if not local.session:
 		return ["Guest"]
 
-	if username:
-		import frappe.permissions
-		return frappe.permissions.get_roles(username)
-	else:
-		return get_user().get_roles()
+	return frappe.permissions.get_roles(username or local.session.user)
 
 def get_request_header(key, default=None):
 	"""Return HTTP request header.
diff --git a/frappe/workflow/doctype/workflow/test_workflow.py b/frappe/workflow/doctype/workflow/test_workflow.py
index fb42e6fd6e..253f95dab7 100644
--- a/frappe/workflow/doctype/workflow/test_workflow.py
+++ b/frappe/workflow/doctype/workflow/test_workflow.py
@@ -126,7 +126,6 @@ def create_todo_workflow():
 	else:
 		frappe.get_doc(dict(doctype='Role',
 			role_name='Test Approver')).insert(ignore_if_duplicate=True)
-		frappe.cache().hdel('roles', 'Administrator')
 		workflow = frappe.new_doc('Workflow')
 		workflow.workflow_name = 'Test ToDo'
 		workflow.document_type = 'ToDo'

From 3c3b1037eaf9b7e92a52dd7c391d18f969d06102 Mon Sep 17 00:00:00 2001
From: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
Date: Tue, 4 Aug 2020 10:44:45 +0530
Subject: [PATCH 163/191] fix: Import frappe.permissions

---
 frappe/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frappe/__init__.py b/frappe/__init__.py
index f91317584d..31ce00e440 100644
--- a/frappe/__init__.py
+++ b/frappe/__init__.py
@@ -436,7 +436,7 @@ def get_roles(username=None):
 	"""Returns roles of current user."""
 	if not local.session:
 		return ["Guest"]
-
+	import frappe.permissions
 	return frappe.permissions.get_roles(username or local.session.user)
 
 def get_request_header(key, default=None):

From 86a9ceb29b93a0df1db233bb461adbcd0b005739 Mon Sep 17 00:00:00 2001
From: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
Date: Tue, 4 Aug 2020 11:16:18 +0530
Subject: [PATCH 164/191] test: Clear role cache

---
 frappe/workflow/doctype/workflow/test_workflow.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/frappe/workflow/doctype/workflow/test_workflow.py b/frappe/workflow/doctype/workflow/test_workflow.py
index 253f95dab7..d7f7939d3d 100644
--- a/frappe/workflow/doctype/workflow/test_workflow.py
+++ b/frappe/workflow/doctype/workflow/test_workflow.py
@@ -126,6 +126,7 @@ def create_todo_workflow():
 	else:
 		frappe.get_doc(dict(doctype='Role',
 			role_name='Test Approver')).insert(ignore_if_duplicate=True)
+		frappe.cache().hdel('roles', frappe.session.user)
 		workflow = frappe.new_doc('Workflow')
 		workflow.workflow_name = 'Test ToDo'
 		workflow.document_type = 'ToDo'

From 645331799af44feb4629ccc50f214278579be200 Mon Sep 17 00:00:00 2001
From: Prssanna Desai <prssud@gmail.com>
Date: Tue, 4 Aug 2020 12:17:33 +0530
Subject: [PATCH 165/191] fix: whitelist functions called through search widget
 (#11153)

---
 frappe/core/doctype/user_permission/user_permission.py        | 1 +
 .../permitted_documents_for_user.py                           | 1 +
 frappe/desk/doctype/dashboard_chart/dashboard_chart.py        | 1 +
 frappe/desk/doctype/number_card/number_card.py                | 4 ++++
 frappe/email/__init__.py                                      | 1 +
 5 files changed, 8 insertions(+)

diff --git a/frappe/core/doctype/user_permission/user_permission.py b/frappe/core/doctype/user_permission/user_permission.py
index 48d4fcb5d4..325c41622d 100644
--- a/frappe/core/doctype/user_permission/user_permission.py
+++ b/frappe/core/doctype/user_permission/user_permission.py
@@ -119,6 +119,7 @@ def user_permission_exists(user, allow, for_value, applicable_for=None):
 
 	return has_same_user_permission
 
+@frappe.whitelist()
 def get_applicable_for_doctype_list(doctype, txt, searchfield, start, page_len, filters):
 	linked_doctypes_map = get_linked_doctypes(doctype, True)
 
diff --git a/frappe/core/report/permitted_documents_for_user/permitted_documents_for_user.py b/frappe/core/report/permitted_documents_for_user/permitted_documents_for_user.py
index 8b2d1e01fa..5ca21b811e 100644
--- a/frappe/core/report/permitted_documents_for_user/permitted_documents_for_user.py
+++ b/frappe/core/report/permitted_documents_for_user/permitted_documents_for_user.py
@@ -41,6 +41,7 @@ def get_columns_and_fields(doctype):
 
 	return columns, fields
 
+@frappe.whitelist()
 def query_doctypes(doctype, txt, searchfield, start, page_len, filters):
 	user = filters.get("user")
 	user_perms = frappe.utils.user.UserPermissions(user)
diff --git a/frappe/desk/doctype/dashboard_chart/dashboard_chart.py b/frappe/desk/doctype/dashboard_chart/dashboard_chart.py
index a25e0cab9e..7547efa234 100644
--- a/frappe/desk/doctype/dashboard_chart/dashboard_chart.py
+++ b/frappe/desk/doctype/dashboard_chart/dashboard_chart.py
@@ -344,6 +344,7 @@ def get_year_ending(date):
 	# last day of this month
 	return add_to_date(date, days=-1)
 
+@frappe.whitelist()
 def get_charts_for_user(doctype, txt, searchfield, start, page_len, filters):
 	or_filters = {'owner': frappe.session.user, 'is_public': 1}
 	return frappe.db.get_list('Dashboard Chart',
diff --git a/frappe/desk/doctype/number_card/number_card.py b/frappe/desk/doctype/number_card/number_card.py
index 3eb08ec00a..f44893d950 100644
--- a/frappe/desk/doctype/number_card/number_card.py
+++ b/frappe/desk/doctype/number_card/number_card.py
@@ -124,11 +124,15 @@ def create_number_card(args):
 	doc.insert(ignore_permissions=True)
 	return doc
 
+@frappe.whitelist()
 def get_cards_for_user(doctype, txt, searchfield, start, page_len, filters):
 	meta = frappe.get_meta(doctype)
 	searchfields = meta.get_search_fields()
 	search_conditions = []
 
+	if not frappe.db.exists('DocType', doctype):
+		return
+
 	if txt:
 		for field in searchfields:
 			search_conditions.append('`tab{doctype}`.`{field}` like %(txt)s'.format(field=field, doctype=doctype, txt=txt))
diff --git a/frappe/email/__init__.py b/frappe/email/__init__.py
index d58b35040e..0b874a03bb 100644
--- a/frappe/email/__init__.py
+++ b/frappe/email/__init__.py
@@ -57,6 +57,7 @@ def relink(name, reference_doctype=None, reference_name=None):
 			communication_type = "Communication" and
 			name = %s""", (reference_doctype, reference_name, name))
 
+@frappe.whitelist()
 def get_communication_doctype(doctype, txt, searchfield, start, page_len, filters):
 	user_perms = frappe.utils.user.UserPermissions(frappe.session.user)
 	user_perms.build_permissions()

From 9b267027b5ce2c0674a4dd1cb476d5b80b873632 Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scmmishra@users.noreply.github.com>
Date: Tue, 4 Aug 2020 13:25:49 +0530
Subject: [PATCH 166/191] feat: don't load user translation in
 make_dict_from_messages (#11120)

---
 frappe/translate.py | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/frappe/translate.py b/frappe/translate.py
index 2fc2d3f328..ee1f8fa5ff 100644
--- a/frappe/translate.py
+++ b/frappe/translate.py
@@ -119,7 +119,7 @@ def get_dict(fortype, name=None):
 			messages += frappe.db.sql("select 'Role:', name from tabRole")
 			messages += frappe.db.sql("select 'Module:', name from `tabModule Def`")
 
-		message_dict = make_dict_from_messages(messages)
+		message_dict = make_dict_from_messages(messages, load_user_translation=False)
 		message_dict.update(get_dict_from_hooks(fortype, name))
 		# remove untranslated
 		message_dict = {k:v for k, v in iteritems(message_dict) if k!=v}
@@ -127,6 +127,7 @@ def get_dict(fortype, name=None):
 		cache.hset("translation_assets", frappe.local.lang, translation_assets, shared=True)
 
 	translation_map = translation_assets[asset_key]
+
 	if fortype == "boot":
 		translation_map.update(get_user_translations(frappe.local.lang))
 
@@ -144,14 +145,17 @@ def get_dict_from_hooks(fortype, name):
 
 	return translated_dict
 
-def make_dict_from_messages(messages, full_dict=None):
+def make_dict_from_messages(messages, full_dict=None, load_user_translation=True):
 	"""Returns translated messages as a dict in Language specified in `frappe.local.lang`
 
 	:param messages: List of untranslated messages
 	"""
 	out = {}
 	if full_dict==None:
-		full_dict = get_full_dict(frappe.local.lang)
+		if load_user_translation:
+			full_dict = get_full_dict(frappe.local.lang)
+		else:
+			full_dict = load_lang(frappe.local.lang)
 
 	for m in messages:
 		if m[1] in full_dict:
@@ -189,11 +193,9 @@ def get_full_dict(lang):
 	try:
 		# get user specific transaltion data
 		user_translations = get_user_translations(lang)
-	except Exception:
-		user_translations = None
-
-	if user_translations:
 		frappe.local.lang_full_dict.update(user_translations)
+	except Exception:
+		pass
 
 	return frappe.local.lang_full_dict
 

From d5622f541021e9ecfa682bf30977baeb3e48f89b Mon Sep 17 00:00:00 2001
From: Prssanna Desai <prssud@gmail.com>
Date: Tue, 4 Aug 2020 17:38:48 +0530
Subject: [PATCH 167/191] fix: Permission query in Dashboard Chart (#10981)

Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
---
 .../dashboard_chart/dashboard_chart.py        | 25 ++++++++++++++-----
 .../desk/doctype/number_card/number_card.py   | 14 +++++++----
 2 files changed, 28 insertions(+), 11 deletions(-)

diff --git a/frappe/desk/doctype/dashboard_chart/dashboard_chart.py b/frappe/desk/doctype/dashboard_chart/dashboard_chart.py
index 7547efa234..88c9623945 100644
--- a/frappe/desk/doctype/dashboard_chart/dashboard_chart.py
+++ b/frappe/desk/doctype/dashboard_chart/dashboard_chart.py
@@ -28,15 +28,28 @@ def get_permission_query_conditions(user):
 	if "System Manager" in roles:
 		return None
 
-	allowed_doctypes = ['"%s"' % doctype for doctype in frappe.permissions.get_doctypes_with_read()]
-	allowed_reports = ['"%s"' % key if type(key) == str else key.encode('UTF8') for key in get_allowed_reports()]
+	doctype_condition = False
+	report_condition = False
+
+	allowed_doctypes = [frappe.db.escape(doctype) for doctype in frappe.permissions.get_doctypes_with_read()]
+	allowed_reports = [frappe.db.escape(key) if type(key) == str else key.encode('UTF8') for key in get_allowed_reports()]
+
+	if allowed_doctypes:
+		doctype_condition = '`tabDashboard Chart`.`document_type` in ({allowed_doctypes})'.format(
+			allowed_doctypes=','.join(allowed_doctypes))
+	if allowed_reports:
+		report_condition = '`tabDashboard Chart`.`report_name` in ({allowed_reports})'.format(
+			allowed_reports=','.join(allowed_reports))
 
 	return '''
-			`tabDashboard Chart`.`document_type` in ({allowed_doctypes})
-			or `tabDashboard Chart`.`report_name` in ({allowed_reports})
+			(`tabDashboard Chart`.`chart_type` in ('Count', 'Sum', 'Average')
+			and {doctype_condition})
+			or
+			(`tabDashboard Chart`.`chart_type` = 'Report'
+			and {report_condition})
 		'''.format(
-			allowed_doctypes=','.join(allowed_doctypes),
-			allowed_reports=','.join(allowed_reports)
+			doctype_condition=doctype_condition,
+			report_condition=report_condition
 		)
 
 
diff --git a/frappe/desk/doctype/number_card/number_card.py b/frappe/desk/doctype/number_card/number_card.py
index f44893d950..68ed79e64b 100644
--- a/frappe/desk/doctype/number_card/number_card.py
+++ b/frappe/desk/doctype/number_card/number_card.py
@@ -32,13 +32,17 @@ def get_permission_query_conditions(user=None):
 	if "System Manager" in roles:
 		return None
 
-	allowed_doctypes = ['"%s"' % doctype for doctype in frappe.permissions.get_doctypes_with_read()]
+	doctype_condition = False
+
+	allowed_doctypes = [frappe.db.escape(doctype) for doctype in frappe.permissions.get_doctypes_with_read()]
+
+	if allowed_doctypes:
+		doctype_condition = '`tabNumber Card`.`document_type` in ({allowed_doctypes})'.format(
+			allowed_doctypes=','.join(allowed_doctypes))
 
 	return '''
-			`tabNumber Card`.`document_type` in ({allowed_doctypes})
-		'''.format(
-			allowed_doctypes=','.join(allowed_doctypes)
-		)
+			{doctype_condition}
+		'''.format(doctype_condition=doctype_condition)
 
 def has_permission(doc, ptype, user):
 	roles = frappe.get_roles(user)

From dd157ba82255727e0095925eaf8d64fbfe89b275 Mon Sep 17 00:00:00 2001
From: gavin <gavin18d@gmail.com>
Date: Tue, 4 Aug 2020 17:39:35 +0530
Subject: [PATCH 168/191] fix: dont show git errors in terminal (#11064)

Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
---
 frappe/utils/change_log.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/frappe/utils/change_log.py b/frappe/utils/change_log.py
index 53c83cfe99..c75b3289db 100644
--- a/frappe/utils/change_log.py
+++ b/frappe/utils/change_log.py
@@ -118,8 +118,9 @@ def get_versions():
 def get_app_branch(app):
 	'''Returns branch of an app'''
 	try:
+		null_stream = open(os.devnull, 'wb')
 		result = subprocess.check_output('cd ../apps/{0} && git rev-parse --abbrev-ref HEAD'.format(app),
-			shell=True)
+			shell=True, stdin=null_stream, stderr=null_stream)
 		result = safe_decode(result)
 		result = result.strip()
 		return result
@@ -128,8 +129,9 @@ def get_app_branch(app):
 
 def get_app_last_commit_ref(app):
 	try:
+		null_stream = open(os.devnull, 'wb')
 		result = subprocess.check_output('cd ../apps/{0} && git rev-parse HEAD --short 7'.format(app),
-			shell=True)
+			shell=True, stdin=null_stream, stderr=null_stream)
 		result = safe_decode(result)
 		result = result.strip()
 		return result

From 34fdf63b9097d5ad0cfb366121242c0f8480e460 Mon Sep 17 00:00:00 2001
From: Glen Whitney <glen@studioinfinity.org>
Date: Tue, 4 Aug 2020 05:10:06 -0700
Subject: [PATCH 169/191] fix(Link Card): refresh incomplete_dependencies as
 needed (#11169)

When _prepare_item in Workspace.get_cards notices that the dependencies
  for an item have been completed, it should clear the incomplete_dependencies
  field in case a value has been saved in that attribute.

  Fixes #11168.
---
 frappe/desk/desktop.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/frappe/desk/desktop.py b/frappe/desk/desktop.py
index 68b57a93d4..ae9d070976 100644
--- a/frappe/desk/desktop.py
+++ b/frappe/desk/desktop.py
@@ -221,6 +221,8 @@ class Workspace:
 				incomplete_dependencies = [d for d in item.dependencies if not _doctype_contains_a_record(d)]
 				if len(incomplete_dependencies):
 					item.incomplete_dependencies = incomplete_dependencies
+				else:
+					item.incomplete_dependencies = ""
 
 			if item.onboard:
 				# Mark Spotlights for initial

From f5c61d04da27d8258caad8631c5f7f4edf3ffa85 Mon Sep 17 00:00:00 2001
From: Faris Ansari <netchampfaris@users.noreply.github.com>
Date: Tue, 4 Aug 2020 17:40:18 +0530
Subject: [PATCH 170/191] fix: Patch to generate theme files in public folder
 (#11148)

Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
---
 frappe/patches.txt                                |  1 +
 .../generate_theme_files_in_public_folder.py      | 15 +++++++++++++++
 2 files changed, 16 insertions(+)
 create mode 100644 frappe/patches/v13_0/generate_theme_files_in_public_folder.py

diff --git a/frappe/patches.txt b/frappe/patches.txt
index b207a325cb..75750ab59c 100644
--- a/frappe/patches.txt
+++ b/frappe/patches.txt
@@ -296,3 +296,4 @@ frappe.patches.v13_0.update_duration_options
 frappe.patches.v13_0.replace_old_data_import # 2020-06-24
 frappe.patches.v13_0.create_custom_dashboards_cards_and_charts
 frappe.patches.v13_0.rename_is_custom_field_in_dashboard_chart
+frappe.patches.v13_0.generate_theme_files_in_public_folder
diff --git a/frappe/patches/v13_0/generate_theme_files_in_public_folder.py b/frappe/patches/v13_0/generate_theme_files_in_public_folder.py
new file mode 100644
index 0000000000..c5a64780cd
--- /dev/null
+++ b/frappe/patches/v13_0/generate_theme_files_in_public_folder.py
@@ -0,0 +1,15 @@
+# Copyright (c) 2020, Frappe Technologies Pvt. Ltd. and Contributors
+# MIT License. See license.txt
+
+from __future__ import unicode_literals
+import frappe
+
+
+def execute():
+	themes = frappe.db.get_all(
+		"Website Theme", filters={"theme_url": ("not like", "/files/website_theme/%")}
+	)
+	for theme in themes:
+		doc = frappe.get_doc("Website Theme", theme.name)
+		doc.generate_bootstrap_theme()
+		doc.save()

From 0748312e3950516bb08c76f200359757cd2c6759 Mon Sep 17 00:00:00 2001
From: Aditya Hase <aditya@adityahase.com>
Date: Tue, 4 Aug 2020 17:41:34 +0530
Subject: [PATCH 171/191] fix(werkzeug): Avoid duplicate lines from werkzeug in
 bench start logs (#11171)

Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
---
 frappe/app.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/frappe/app.py b/frappe/app.py
index 450e3b5f17..725bec183a 100644
--- a/frappe/app.py
+++ b/frappe/app.py
@@ -256,9 +256,11 @@ def serve(port=8000, profile=False, no_reload=False, no_threading=False, site=No
 		'SERVER_NAME': 'localhost:8000'
 	}
 
+	log = logging.getLogger('werkzeug')
+	log.propagate = False
+
 	in_test_env = os.environ.get('CI')
 	if in_test_env:
-		log = logging.getLogger('werkzeug')
 		log.setLevel(logging.ERROR)
 
 	run_simple('0.0.0.0', int(port), application,

From cc22350b04f73b6321e1fac6ccf62f57ee9776fb Mon Sep 17 00:00:00 2001
From: Rucha Mahabal <ruchamahabal2@gmail.com>
Date: Tue, 4 Aug 2020 17:42:47 +0530
Subject: [PATCH 172/191] fix: remove Video DocType from Core module (#11151)

Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
---
 frappe/automation/desk_page/tools/tools.json |   5 +-
 frappe/core/doctype/video/__init__.py        |   0
 frappe/core/doctype/video/test_video.py      |  10 --
 frappe/core/doctype/video/video.js           |   8 --
 frappe/core/doctype/video/video.json         | 106 -------------------
 frappe/core/doctype/video/video.py           |  10 --
 frappe/public/js/frappe/views/breadcrumbs.js |   1 -
 7 files changed, 3 insertions(+), 137 deletions(-)
 delete mode 100644 frappe/core/doctype/video/__init__.py
 delete mode 100644 frappe/core/doctype/video/test_video.py
 delete mode 100644 frappe/core/doctype/video/video.js
 delete mode 100644 frappe/core/doctype/video/video.json
 delete mode 100644 frappe/core/doctype/video/video.py

diff --git a/frappe/automation/desk_page/tools/tools.json b/frappe/automation/desk_page/tools/tools.json
index 2164a4ce38..3fbaf62d02 100644
--- a/frappe/automation/desk_page/tools/tools.json
+++ b/frappe/automation/desk_page/tools/tools.json
@@ -3,7 +3,7 @@
   {
    "hidden": 0,
    "label": "Tools",
-   "links": "[\n    {\n        \"description\": \"Documents assigned to you and by you.\",\n        \"label\": \"To Do\",\n        \"name\": \"ToDo\",\n        \"onboard\": 1,\n        \"type\": \"doctype\"\n    },\n    {\n        \"description\": \"Event and other calendars.\",\n        \"label\": \"Calendar\",\n        \"link\": \"List/Event/Calendar\",\n        \"name\": \"Event\",\n        \"onboard\": 1,\n        \"type\": \"doctype\"\n    },\n    {\n        \"description\": \"Private and public Notes.\",\n        \"label\": \"Note\",\n        \"name\": \"Note\",\n        \"onboard\": 1,\n        \"type\": \"doctype\"\n    },\n    {\n        \"label\": \"Files\",\n        \"name\": \"File\",\n        \"type\": \"doctype\"\n    },\n    {\n        \"label\": \"Video\",\n        \"name\": \"Video\",\n        \"type\": \"doctype\"\n    },\n    {\n        \"description\": \"Activity log of all users.\",\n        \"label\": \"Activity\",\n        \"name\": \"activity\",\n        \"type\": \"page\"\n    }\n]"
+   "links": "[\n    {\n        \"description\": \"Documents assigned to you and by you.\",\n        \"label\": \"To Do\",\n        \"name\": \"ToDo\",\n        \"onboard\": 1,\n        \"type\": \"doctype\"\n    },\n    {\n        \"description\": \"Event and other calendars.\",\n        \"label\": \"Calendar\",\n        \"link\": \"List/Event/Calendar\",\n        \"name\": \"Event\",\n        \"onboard\": 1,\n        \"type\": \"doctype\"\n    },\n    {\n        \"description\": \"Private and public Notes.\",\n        \"label\": \"Note\",\n        \"name\": \"Note\",\n        \"onboard\": 1,\n        \"type\": \"doctype\"\n    },\n    {\n        \"label\": \"Files\",\n        \"name\": \"File\",\n        \"type\": \"doctype\"\n    },\n    {\n        \"description\": \"Activity log of all users.\",\n        \"label\": \"Activity\",\n        \"name\": \"activity\",\n        \"type\": \"page\"\n    }\n]"
   },
   {
    "hidden": 0,
@@ -29,10 +29,11 @@
  "docstatus": 0,
  "doctype": "Desk Page",
  "extends_another_page": 0,
+ "hide_custom": 0,
  "idx": 0,
  "is_standard": 1,
  "label": "Tools",
- "modified": "2020-04-20 18:21:14.152537",
+ "modified": "2020-07-21 19:32:18.480700",
  "modified_by": "Administrator",
  "module": "Automation",
  "name": "Tools",
diff --git a/frappe/core/doctype/video/__init__.py b/frappe/core/doctype/video/__init__.py
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/frappe/core/doctype/video/test_video.py b/frappe/core/doctype/video/test_video.py
deleted file mode 100644
index 0bed1e98d6..0000000000
--- a/frappe/core/doctype/video/test_video.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# -*- coding: utf-8 -*-
-# Copyright (c) 2020, Frappe Technologies and Contributors
-# See license.txt
-from __future__ import unicode_literals
-
-# import frappe
-import unittest
-
-class TestVideo(unittest.TestCase):
-	pass
diff --git a/frappe/core/doctype/video/video.js b/frappe/core/doctype/video/video.js
deleted file mode 100644
index 36ea240a36..0000000000
--- a/frappe/core/doctype/video/video.js
+++ /dev/null
@@ -1,8 +0,0 @@
-// Copyright (c) 2020, Frappe Technologies and contributors
-// For license information, please see license.txt
-
-frappe.ui.form.on('Video', {
-	// refresh: function(frm) {
-
-	// }
-});
diff --git a/frappe/core/doctype/video/video.json b/frappe/core/doctype/video/video.json
deleted file mode 100644
index 26a407c05c..0000000000
--- a/frappe/core/doctype/video/video.json
+++ /dev/null
@@ -1,106 +0,0 @@
-{
- "actions": [],
- "allow_import": 1,
- "allow_rename": 1,
- "autoname": "field:title",
- "creation": "2018-10-17 05:47:13.087395",
- "doctype": "DocType",
- "editable_grid": 1,
- "engine": "InnoDB",
- "field_order": [
-  "title",
-  "provider",
-  "url",
-  "column_break_4",
-  "publish_date",
-  "duration",
-  "section_break_7",
-  "description"
- ],
- "fields": [
-  {
-   "fieldname": "title",
-   "fieldtype": "Data",
-   "in_list_view": 1,
-   "label": "Title",
-   "reqd": 1,
-   "unique": 1
-  },
-  {
-   "fieldname": "provider",
-   "fieldtype": "Select",
-   "in_list_view": 1,
-   "label": "Provider",
-   "options": "YouTube\nVimeo",
-   "reqd": 1
-  },
-  {
-   "fieldname": "url",
-   "fieldtype": "Data",
-   "in_list_view": 1,
-   "label": "URL",
-   "reqd": 1
-  },
-  {
-   "fieldname": "column_break_4",
-   "fieldtype": "Column Break"
-  },
-  {
-   "fieldname": "publish_date",
-   "fieldtype": "Date",
-   "label": "Publish Date"
-  },
-  {
-   "fieldname": "duration",
-   "fieldtype": "Data",
-   "label": "Duration"
-  },
-  {
-   "fieldname": "section_break_7",
-   "fieldtype": "Section Break"
-  },
-  {
-   "fieldname": "description",
-   "fieldtype": "Text Editor",
-   "in_list_view": 1,
-   "label": "Description",
-   "reqd": 1
-  }
- ],
- "links": [],
- "modified": "2020-04-22 12:09:49.057403",
- "modified_by": "Administrator",
- "module": "Core",
- "name": "Video",
- "owner": "Administrator",
- "permissions": [
-  {
-   "create": 1,
-   "delete": 1,
-   "email": 1,
-   "export": 1,
-   "if_owner": 1,
-   "print": 1,
-   "read": 1,
-   "report": 1,
-   "role": "All",
-   "share": 1,
-   "write": 1
-  },
-  {
-   "create": 1,
-   "delete": 1,
-   "email": 1,
-   "export": 1,
-   "print": 1,
-   "read": 1,
-   "report": 1,
-   "role": "System Manager",
-   "share": 1,
-   "write": 1
-  }
- ],
- "sort_field": "modified",
- "sort_order": "DESC",
- "track_changes": 1
-}
\ No newline at end of file
diff --git a/frappe/core/doctype/video/video.py b/frappe/core/doctype/video/video.py
deleted file mode 100644
index fdbd3a1abe..0000000000
--- a/frappe/core/doctype/video/video.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# -*- coding: utf-8 -*-
-# Copyright (c) 2020, Frappe Technologies and contributors
-# For license information, please see license.txt
-
-from __future__ import unicode_literals
-# import frappe
-from frappe.model.document import Document
-
-class Video(Document):
-	pass
diff --git a/frappe/public/js/frappe/views/breadcrumbs.js b/frappe/public/js/frappe/views/breadcrumbs.js
index 0058310e3f..dbe591f6fd 100644
--- a/frappe/public/js/frappe/views/breadcrumbs.js
+++ b/frappe/public/js/frappe/views/breadcrumbs.js
@@ -6,7 +6,6 @@ frappe.breadcrumbs = {
 
 	preferred: {
 		"File": "",
-		"Video": "",
 		"Dashboard": "Customization",
 		"Dashboard Chart": "Customization",
 		"Dashboard Chart Source": "Customization"

From 5d4feb5dbb264611d2d257eea8f8f45b9636fbae Mon Sep 17 00:00:00 2001
From: gavin <gavin18d@gmail.com>
Date: Tue, 4 Aug 2020 17:45:14 +0530
Subject: [PATCH 173/191] feat: Convenience APIs for tags (#11088)

Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
---
 frappe/model/document.py | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/frappe/model/document.py b/frappe/model/document.py
index 69a781d6d1..316c576f55 100644
--- a/frappe/model/document.py
+++ b/frappe/model/document.py
@@ -1307,6 +1307,16 @@ class Document(BaseDocument):
 		users = set([assignment.owner for assignment in assignments])
 		return users
 
+	def add_tag(self, tag):
+		"""Add a Tag to this document"""
+		from frappe.desk.doctype.tag.tag import DocTags
+		DocTags(self.doctype).add(self.name, tag)
+
+	def get_tags(self):
+		"""Return a list of Tags attached to this document"""
+		from frappe.desk.doctype.tag.tag import DocTags
+		return DocTags(self.doctype).get_tags(self.name).split(",")[1:]
+
 def execute_action(doctype, name, action, **kwargs):
 	"""Execute an action on a document (called by background worker)"""
 	doc = frappe.get_doc(doctype, name)

From 805e415502164c49aeef5a6332208ef2075c258d Mon Sep 17 00:00:00 2001
From: Prssanna Desai <prssud@gmail.com>
Date: Wed, 5 Aug 2020 14:57:48 +0530
Subject: [PATCH 174/191] fix: Dashboard fixes (#11186)

Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
---
 frappe/desk/doctype/dashboard_chart/dashboard_chart.js |  6 ------
 frappe/desk/doctype/dashboard_chart/dashboard_chart.py |  2 +-
 frappe/desk/doctype/number_card/number_card.py         |  2 +-
 frappe/public/js/frappe/widgets/utils.js               | 10 ++++++++--
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/frappe/desk/doctype/dashboard_chart/dashboard_chart.js b/frappe/desk/doctype/dashboard_chart/dashboard_chart.js
index 8d89cc2f31..7f26bd9101 100644
--- a/frappe/desk/doctype/dashboard_chart/dashboard_chart.js
+++ b/frappe/desk/doctype/dashboard_chart/dashboard_chart.js
@@ -23,7 +23,6 @@ frappe.ui.form.on('Dashboard Chart', {
 		frm.chart_filters = null;
 
 		if (!frappe.boot.developer_mode && frm.doc.is_standard) {
-			frm.set_df_property('chart_options_section', 'hidden', 1);
 			frm.disable_form();
 		}
 
@@ -57,11 +56,6 @@ frappe.ui.form.on('Dashboard Chart', {
 		if (frm.doc.report_name) {
 			frm.trigger('set_chart_report_filters');
 		}
-
-		if (!frappe.boot.developer_mode) {
-			frm.set_df_property("custom_options", "hidden", 1);
-		}
-
 	},
 
 	is_standard: function(frm) {
diff --git a/frappe/desk/doctype/dashboard_chart/dashboard_chart.py b/frappe/desk/doctype/dashboard_chart/dashboard_chart.py
index 88c9623945..7be97f8e24 100644
--- a/frappe/desk/doctype/dashboard_chart/dashboard_chart.py
+++ b/frappe/desk/doctype/dashboard_chart/dashboard_chart.py
@@ -143,7 +143,7 @@ def add_chart_to_dashboard(args):
 	dashboard_link = frappe.new_doc('Dashboard Chart Link')
 	dashboard_link.chart = args.chart_name or args.name
 
-	if args.set_standard:
+	if args.set_standard and dashboard.is_standard:
 		chart = frappe.get_doc('Dashboard Chart', dashboard_link.chart)
 		chart.is_standard = 1
 		chart.module = dashboard.module
diff --git a/frappe/desk/doctype/number_card/number_card.py b/frappe/desk/doctype/number_card/number_card.py
index 68ed79e64b..8b79cf4052 100644
--- a/frappe/desk/doctype/number_card/number_card.py
+++ b/frappe/desk/doctype/number_card/number_card.py
@@ -180,7 +180,7 @@ def add_card_to_dashboard(args):
 	dashboard_link = frappe.new_doc('Number Card Link')
 	dashboard_link.card = args.name
 
-	if args.set_standard:
+	if args.set_standard and dashboard.is_standard:
 		card = frappe.get_doc('Number Card', dashboard_link.card)
 		card.is_standard = 1
 		card.module = dashboard.module
diff --git a/frappe/public/js/frappe/widgets/utils.js b/frappe/public/js/frappe/widgets/utils.js
index 22b3167977..4599b4adc8 100644
--- a/frappe/public/js/frappe/widgets/utils.js
+++ b/frappe/public/js/frappe/widgets/utils.js
@@ -122,7 +122,8 @@ function shorten_number(number, country) {
 	const number_system = get_number_system(country);
 	let x = Math.abs(Math.round(number));
 	for (const map of number_system) {
-		if (x >= map.divisor) {
+		const condition = map.condition ? map.condition(x) : x >= map.divisor;
+		if (condition) {
 			return Math.round(number/map.divisor) +  ' ' + map.symbol;
 		}
 	}
@@ -152,9 +153,14 @@ function get_number_system(country) {
 			{
 				divisor: 1.0e+6,
 				symbol: 'M'
+			},
+			{
+				divisor: 1.0e+3,
+				symbol: 'K',
+				condition: (num) => num.toFixed().length > 5
 			}]
 	};
 	return number_system_map[country];
 }
 
-export { generate_route, generate_grid, build_summary_item, shorten_number };
\ No newline at end of file
+export { generate_route, generate_grid, build_summary_item, shorten_number };

From 4225b55041c4da41a961bf5ca13c5f339b81e3ae Mon Sep 17 00:00:00 2001
From: Rushabh Mehta <rmehta@gmail.com>
Date: Wed, 5 Aug 2020 15:33:30 +0530
Subject: [PATCH 175/191] feat(minor): Allow web form to follow document
 permissions

---
 frappe/website/doctype/web_form/web_form.json | 11 ++++-
 frappe/website/doctype/web_form/web_form.py   | 45 ++++++++++---------
 2 files changed, 33 insertions(+), 23 deletions(-)

diff --git a/frappe/website/doctype/web_form/web_form.json b/frappe/website/doctype/web_form/web_form.json
index e6b7632e4d..77786734e7 100644
--- a/frappe/website/doctype/web_form/web_form.json
+++ b/frappe/website/doctype/web_form/web_form.json
@@ -16,6 +16,7 @@
   "route_to_success_link",
   "allow_edit",
   "allow_multiple",
+  "apply_document_permissions",
   "show_in_grid",
   "allow_delete",
   "allow_print",
@@ -346,14 +347,20 @@
    "fieldname": "custom_css_section",
    "fieldtype": "Section Break",
    "label": "Custom CSS"
+  },
+  {
+   "default": "0",
+   "fieldname": "apply_document_permissions",
+   "fieldtype": "Check",
+   "label": "Apply Document Permissions"
   }
  ],
  "has_web_view": 1,
  "icon": "icon-edit",
  "is_published_field": "published",
  "links": [],
- "modified": "2019-12-24 14:15:43.497431",
- "modified_by": "faris@erpnext.com",
+ "modified": "2020-06-30 21:49:18.237443",
+ "modified_by": "Administrator",
  "module": "Website",
  "name": "Web Form",
  "owner": "Administrator",
diff --git a/frappe/website/doctype/web_form/web_form.py b/frappe/website/doctype/web_form/web_form.py
index 4fc3c99037..bb0e03ddae 100644
--- a/frappe/website/doctype/web_form/web_form.py
+++ b/frappe/website/doctype/web_form/web_form.py
@@ -134,7 +134,7 @@ def get_context(context):
 		if frappe.session.user == "Guest" and frappe.form_dict.name:
 			frappe.throw(_("You need to be logged in to access this {0}.").format(self.doc_type), frappe.PermissionError)
 
-		if frappe.form_dict.name and not has_web_form_permission(self.doc_type, frappe.form_dict.name):
+		if frappe.form_dict.name and not self.has_web_form_permission(self.doc_type, frappe.form_dict.name):
 			frappe.throw(_("You don't have the permissions to access this document"), frappe.PermissionError)
 
 		self.reset_field_parent()
@@ -347,6 +347,27 @@ def get_context(context):
 			frappe.throw(_('Mandatory Information missing:') + '<br><br>'
 				+ '<br>'.join(['{0} ({1})'.format(d.label, d.fieldtype) for d in missing]))
 
+	def has_web_form_permission(self, doctype, name, ptype='read'):
+		if frappe.session.user=="Guest":
+			return False
+
+		if self.apply_document_permissions:
+			return frappe.get_doc(doctype, name).has_permission()
+
+		# owner matches
+		elif frappe.db.get_value(doctype, name, "owner")==frappe.session.user:
+			return True
+
+		elif frappe.has_website_permission(name, ptype=ptype, doctype=doctype):
+			return True
+
+		elif check_webform_perm(doctype, name):
+			return True
+
+		else:
+			return False
+
+
 
 @frappe.whitelist(allow_guest=True)
 def accept(web_form, data, docname=None, for_payment=False):
@@ -395,7 +416,7 @@ def accept(web_form, data, docname=None, for_payment=False):
 		doc.run_method('validate_payment')
 
 	if doc.name:
-		if has_web_form_permission(doc.doctype, doc.name, "write"):
+		if web_form.has_web_form_permission(doc.doctype, doc.name, "write"):
 			doc.save(ignore_permissions=True)
 		else:
 			# only if permissions are present
@@ -482,24 +503,6 @@ def delete_multiple(web_form_name, docnames):
 		raise frappe.PermissionError("You do not have permisssion to delete " + ", ".join(restricted_docnames))
 
 
-def has_web_form_permission(doctype, name, ptype='read'):
-	if frappe.session.user=="Guest":
-		return False
-
-	# owner matches
-	elif frappe.db.get_value(doctype, name, "owner")==frappe.session.user:
-		return True
-
-	elif frappe.has_website_permission(name, ptype=ptype, doctype=doctype):
-		return True
-
-	elif check_webform_perm(doctype, name):
-		return True
-
-	else:
-		return False
-
-
 def check_webform_perm(doctype, name):
 	doc = frappe.get_doc(doctype, name)
 	if hasattr(doc, "has_webform_permission"):
@@ -536,7 +539,7 @@ def get_form_data(doctype, docname=None, web_form_name=None):
 
 	if docname:
 		doc = frappe.get_doc(doctype, docname)
-		if has_web_form_permission(doctype, docname, ptype='read'):
+		if web_form.has_web_form_permission(doctype, docname, ptype='read'):
 			out.doc = doc
 		else:
 			frappe.throw(_("Not permitted"), frappe.PermissionError)

From cd1ab8e23c4a1de4bbd5137c34a864af53788237 Mon Sep 17 00:00:00 2001
From: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
Date: Wed, 5 Aug 2020 19:41:41 +0530
Subject: [PATCH 176/191] feat: Add validate_and_sanitize_search_inputs
 decorator (#11194)

* feat: Add validate_and_sanitize_search_inputs decorator

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
Co-authored-by: Prssanna Desai <prssud@gmail.com>
Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com>

* refactor: Move validate_and_sanitize_search_inputs to init

* refactor: Move validate_and_sanitize_search_inputs to search.py

* test: validate_and_sanitize_search_inputs decorator

* chore: Add wrapt module

* refactor: Use @wrapt to define validate_and_sanitize_search_inputs decorator

* test: Add a case to make sure frappe.call works as well

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
Co-authored-by: Prssanna Desai <prssud@gmail.com>
Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com>
---
 frappe/__init__.py          |  4 ++++
 frappe/desk/search.py       | 13 +++++++++++++
 frappe/tests/test_search.py | 28 ++++++++++++++++++++++++++++
 requirements.txt            |  3 ++-
 4 files changed, 47 insertions(+), 1 deletion(-)

diff --git a/frappe/__init__.py b/frappe/__init__.py
index 45f40f7783..9e744c2c07 100644
--- a/frappe/__init__.py
+++ b/frappe/__init__.py
@@ -1707,3 +1707,7 @@ def mock(type, size=1, locale='en'):
 
 	from frappe.chat.util import squashify
 	return squashify(results)
+
+def validate_and_sanitize_search_inputs(fn):
+	from frappe.desk.search import validate_and_sanitize_search_inputs as func
+	return func(fn)
diff --git a/frappe/desk/search.py b/frappe/desk/search.py
index b4b54b4b6e..798e499bb9 100644
--- a/frappe/desk/search.py
+++ b/frappe/desk/search.py
@@ -10,6 +10,7 @@ from frappe.handler import is_whitelisted
 from frappe import _
 from six import string_types
 import re
+import wrapt
 
 UNTRANSLATED_DOCTYPES = ["DocType", "Role"]
 
@@ -206,3 +207,15 @@ def scrub_custom_query(query, key, txt):
 	if '%s' in query:
 		query = query.replace('%s', ((txt or '') + '%'))
 	return query
+
+@wrapt.decorator
+def validate_and_sanitize_search_inputs(fn, instance, args, kwargs):
+	kwargs.update(dict(zip(fn.__code__.co_varnames, args)))
+	sanitize_searchfield(kwargs['searchfield'])
+	kwargs['start'] = cint(kwargs['start'])
+	kwargs['page_len'] = cint(kwargs['page_len'])
+
+	if kwargs['doctype'] and not frappe.db.exists('DocType', kwargs['doctype']):
+		return []
+
+	return fn(**kwargs)
\ No newline at end of file
diff --git a/frappe/tests/test_search.py b/frappe/tests/test_search.py
index 5cab827218..192fe9dd25 100644
--- a/frappe/tests/test_search.py
+++ b/frappe/tests/test_search.py
@@ -50,3 +50,31 @@ class TestSearch(unittest.TestCase):
 
 	def tearDown(self):
 		frappe.local.lang = 'en'
+
+	def test_validate_and_sanitize_search_inputs(self):
+
+		# should raise error if searchfield is injectable
+		self.assertRaises(frappe.DataError,
+			get_data, *('User', 'Random', 'select * from tabSessions) --', '1', '10', dict()))
+
+		# page_len and start should be converted to int
+		self.assertListEqual(get_data('User', 'Random', 'email', 'name or (select * from tabSessions)', '10', dict()),
+			['User', 'Random', 'email', 0, 10, {}])
+		self.assertListEqual(get_data('User', 'Random', 'email', page_len='2', start='10', filters=dict()),
+			['User', 'Random', 'email', 10, 2, {}])
+
+		# DocType can be passed as None which should be accepted
+		self.assertListEqual(get_data(None, 'Random', 'email', '2', '10', dict()),
+			[None, 'Random', 'email', 2, 10, {}])
+
+		# return empty string if passed doctype is invalid
+		self.assertListEqual(get_data("Random DocType", 'Random', 'email', '2', '10', dict()), [])
+
+		# should not fail if function is called via frappe.call with extra arguments
+		args = ("Random DocType", 'Random', 'email', '2', '10', dict())
+		kwargs = {'as_dict': False}
+		self.assertListEqual(frappe.call('frappe.tests.test_search.get_data', *args, **kwargs), [])
+
+@frappe.validate_and_sanitize_search_inputs
+def get_data(doctype, txt, searchfield, start, page_len, filters):
+	return [doctype, txt, searchfield, start, page_len, filters]
\ No newline at end of file
diff --git a/requirements.txt b/requirements.txt
index 33cd292bf6..2995553541 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -69,4 +69,5 @@ Whoosh==2.7.4
 xlrd==1.2.0
 zxcvbn-python==4.4.24
 pycryptodome==3.9.8
-paytmchecksum==1.7.0
\ No newline at end of file
+paytmchecksum==1.7.0
+wrapt==1.10.11
\ No newline at end of file

From 21a0cafe6209334906441c07c7f2e085afc82ade Mon Sep 17 00:00:00 2001
From: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
Date: Wed, 5 Aug 2020 19:42:19 +0530
Subject: [PATCH 177/191] fix: Validate and sanitise whitelisted search methods
 using decorator (#11197)

* fix: Validate and sanitize whitelisted search methods using decorator

Co-authored-by: Prssanna Desai <prssud@gmail.com>
Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com>

* refactor: Replace decorator name

Co-authored-by: Prssanna Desai <prssud@gmail.com>
Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com>

Co-authored-by: Prssanna Desai <prssud@gmail.com>
Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com>
---
 frappe/automation/doctype/auto_repeat/auto_repeat.py             | 1 +
 frappe/contacts/address_and_contact.py                           | 1 +
 frappe/contacts/doctype/address/address.py                       | 1 +
 frappe/contacts/doctype/contact/contact.py                       | 1 +
 frappe/core/doctype/user/user.py                                 | 1 +
 frappe/core/doctype/user_permission/user_permission.py           | 1 +
 .../permitted_documents_for_user/permitted_documents_for_user.py | 1 +
 frappe/desk/doctype/dashboard_chart/dashboard_chart.py           | 1 +
 frappe/desk/doctype/number_card/number_card.py                   | 1 +
 frappe/email/__init__.py                                         | 1 +
 10 files changed, 10 insertions(+)

diff --git a/frappe/automation/doctype/auto_repeat/auto_repeat.py b/frappe/automation/doctype/auto_repeat/auto_repeat.py
index a946fcc81c..c09e347e71 100644
--- a/frappe/automation/doctype/auto_repeat/auto_repeat.py
+++ b/frappe/automation/doctype/auto_repeat/auto_repeat.py
@@ -374,6 +374,7 @@ def make_auto_repeat(doctype, docname, frequency = 'Daily', start_date = None, e
 
 # method for reference_doctype filter
 @frappe.whitelist()
+@frappe.validate_and_sanitize_search_inputs
 def get_auto_repeat_doctypes(doctype, txt, searchfield, start, page_len, filters):
 	res = frappe.db.get_all('Property Setter', {
 		'property': 'allow_auto_repeat',
diff --git a/frappe/contacts/address_and_contact.py b/frappe/contacts/address_and_contact.py
index 51f13fb1a1..3ca9547188 100644
--- a/frappe/contacts/address_and_contact.py
+++ b/frappe/contacts/address_and_contact.py
@@ -147,6 +147,7 @@ def delete_contact_and_address(doctype, docname):
 				doc.delete()
 
 @frappe.whitelist()
+@frappe.validate_and_sanitize_search_inputs
 def filter_dynamic_link_doctypes(doctype, txt, searchfield, start, page_len, filters):
 	if not txt: txt = ""
 
diff --git a/frappe/contacts/doctype/address/address.py b/frappe/contacts/doctype/address/address.py
index 57dea8284c..e82ab9b26e 100644
--- a/frappe/contacts/doctype/address/address.py
+++ b/frappe/contacts/doctype/address/address.py
@@ -231,6 +231,7 @@ def get_company_address(company):
 	return ret
 
 @frappe.whitelist()
+@frappe.validate_and_sanitize_search_inputs
 def address_query(doctype, txt, searchfield, start, page_len, filters):
 	from frappe.desk.reportview import get_match_cond
 
diff --git a/frappe/contacts/doctype/contact/contact.py b/frappe/contacts/doctype/contact/contact.py
index 8240940d2f..f82946dc5e 100644
--- a/frappe/contacts/doctype/contact/contact.py
+++ b/frappe/contacts/doctype/contact/contact.py
@@ -183,6 +183,7 @@ def update_contact(doc, method):
 		contact.save(ignore_permissions=True)
 
 @frappe.whitelist()
+@frappe.validate_and_sanitize_search_inputs
 def contact_query(doctype, txt, searchfield, start, page_len, filters):
 	from frappe.desk.reportview import get_match_cond
 
diff --git a/frappe/core/doctype/user/user.py b/frappe/core/doctype/user/user.py
index 64bff32189..ef2de679ae 100644
--- a/frappe/core/doctype/user/user.py
+++ b/frappe/core/doctype/user/user.py
@@ -812,6 +812,7 @@ def reset_password(user):
 		return 'not found'
 
 @frappe.whitelist()
+@frappe.validate_and_sanitize_search_inputs
 def user_query(doctype, txt, searchfield, start, page_len, filters):
 	from frappe.desk.reportview import get_match_cond
 
diff --git a/frappe/core/doctype/user_permission/user_permission.py b/frappe/core/doctype/user_permission/user_permission.py
index 325c41622d..ba14583c2f 100644
--- a/frappe/core/doctype/user_permission/user_permission.py
+++ b/frappe/core/doctype/user_permission/user_permission.py
@@ -120,6 +120,7 @@ def user_permission_exists(user, allow, for_value, applicable_for=None):
 	return has_same_user_permission
 
 @frappe.whitelist()
+@frappe.validate_and_sanitize_search_inputs
 def get_applicable_for_doctype_list(doctype, txt, searchfield, start, page_len, filters):
 	linked_doctypes_map = get_linked_doctypes(doctype, True)
 
diff --git a/frappe/core/report/permitted_documents_for_user/permitted_documents_for_user.py b/frappe/core/report/permitted_documents_for_user/permitted_documents_for_user.py
index 5ca21b811e..97209cd8ea 100644
--- a/frappe/core/report/permitted_documents_for_user/permitted_documents_for_user.py
+++ b/frappe/core/report/permitted_documents_for_user/permitted_documents_for_user.py
@@ -42,6 +42,7 @@ def get_columns_and_fields(doctype):
 	return columns, fields
 
 @frappe.whitelist()
+@frappe.validate_and_sanitize_search_inputs
 def query_doctypes(doctype, txt, searchfield, start, page_len, filters):
 	user = filters.get("user")
 	user_perms = frappe.utils.user.UserPermissions(user)
diff --git a/frappe/desk/doctype/dashboard_chart/dashboard_chart.py b/frappe/desk/doctype/dashboard_chart/dashboard_chart.py
index 7be97f8e24..4ea61ec6a9 100644
--- a/frappe/desk/doctype/dashboard_chart/dashboard_chart.py
+++ b/frappe/desk/doctype/dashboard_chart/dashboard_chart.py
@@ -358,6 +358,7 @@ def get_year_ending(date):
 	return add_to_date(date, days=-1)
 
 @frappe.whitelist()
+@frappe.validate_and_sanitize_search_inputs
 def get_charts_for_user(doctype, txt, searchfield, start, page_len, filters):
 	or_filters = {'owner': frappe.session.user, 'is_public': 1}
 	return frappe.db.get_list('Dashboard Chart',
diff --git a/frappe/desk/doctype/number_card/number_card.py b/frappe/desk/doctype/number_card/number_card.py
index 8b79cf4052..d4a2b00c57 100644
--- a/frappe/desk/doctype/number_card/number_card.py
+++ b/frappe/desk/doctype/number_card/number_card.py
@@ -129,6 +129,7 @@ def create_number_card(args):
 	return doc
 
 @frappe.whitelist()
+@frappe.validate_and_sanitize_search_inputs
 def get_cards_for_user(doctype, txt, searchfield, start, page_len, filters):
 	meta = frappe.get_meta(doctype)
 	searchfields = meta.get_search_fields()
diff --git a/frappe/email/__init__.py b/frappe/email/__init__.py
index 0b874a03bb..b05aef7639 100644
--- a/frappe/email/__init__.py
+++ b/frappe/email/__init__.py
@@ -58,6 +58,7 @@ def relink(name, reference_doctype=None, reference_name=None):
 			name = %s""", (reference_doctype, reference_name, name))
 
 @frappe.whitelist()
+@frappe.validate_and_sanitize_search_inputs
 def get_communication_doctype(doctype, txt, searchfield, start, page_len, filters):
 	user_perms = frappe.utils.user.UserPermissions(frappe.session.user)
 	user_perms.build_permissions()

From 34c3d57767611db622779efe5cf0454b8a866f92 Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scmmishra@users.noreply.github.com>
Date: Wed, 5 Aug 2020 18:31:11 +0000
Subject: [PATCH 178/191] feat: validate json when saving desk page (#11095)

Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
---
 frappe/desk/doctype/desk_page/desk_page.py | 9 +++++++++
 frappe/utils/data.py                       | 9 +++++++--
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/frappe/desk/doctype/desk_page/desk_page.py b/frappe/desk/doctype/desk_page/desk_page.py
index f14535cb5f..cc2db53481 100644
--- a/frappe/desk/doctype/desk_page/desk_page.py
+++ b/frappe/desk/doctype/desk_page/desk_page.py
@@ -5,14 +5,23 @@
 from __future__ import unicode_literals
 import frappe
 from frappe import _
+from frappe.utils.data import validate_json_string
 from frappe.modules.export_file import export_to_files
 from frappe.model.document import Document
 
 class DeskPage(Document):
 	def validate(self):
+		self.validate_cards_json()
 		if (self.is_standard and not frappe.conf.developer_mode and not disable_saving_as_standard()):
 			frappe.throw(_("You need to be in developer mode to edit this document"))
 
+	def validate_cards_json(self):
+		for card in self.cards:
+			try:
+				validate_json_string(card.links)
+			except frappe.ValidationError:
+				frappe.throw(_("Invalid JSON in card links for {0}").format(frappe.bold(card.label)))
+
 	def on_update(self):
 		if disable_saving_as_standard():
 			return
diff --git a/frappe/utils/data.py b/frappe/utils/data.py
index d1b409d1fc..bda201f083 100644
--- a/frappe/utils/data.py
+++ b/frappe/utils/data.py
@@ -8,6 +8,7 @@ import frappe
 from dateutil.parser._parser import ParserError
 import subprocess
 import operator
+import json
 import re, datetime, math, time
 import babel.dates
 from babel.core import UnknownLocaleError
@@ -1236,8 +1237,6 @@ def is_subset(list_a, list_b):
 def generate_hash(*args, **kwargs):
 	return frappe.generate_hash(*args, **kwargs)
 
-
-
 def guess_date_format(date_string):
 	DATE_FORMATS = [
 		r"%d-%m-%Y",
@@ -1310,3 +1309,9 @@ def guess_date_format(date_string):
 
 		if date_format and time_format:
 			return (date_format + ' ' + time_format).strip()
+
+def validate_json_string(string):
+	try:
+		json.loads(string)
+	except (TypeError, ValueError):
+		raise frappe.ValidationError
\ No newline at end of file

From ef4a28e10c0de0083c57278b615e587600b64e3b Mon Sep 17 00:00:00 2001
From: Mangesh-Khairnar <mkhairnar10@gmail.com>
Date: Thu, 6 Aug 2020 09:32:04 +0530
Subject: [PATCH 179/191] fix: add a distinct identifier for public files
 backup (#11201)

---
 frappe/integrations/offsite_backup_utils.py | 2 +-
 frappe/utils/backups.py                     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/frappe/integrations/offsite_backup_utils.py b/frappe/integrations/offsite_backup_utils.py
index 9de176b2d0..0b3c47064e 100644
--- a/frappe/integrations/offsite_backup_utils.py
+++ b/frappe/integrations/offsite_backup_utils.py
@@ -53,7 +53,7 @@ def get_latest_backup_file(with_files=False):
 	latest_site_config = get_latest('*.json')
 
 	if with_files:
-		latest_public_file_bak = get_latest('*-files.tar')
+		latest_public_file_bak = get_latest('*-public-files.tar')
 		latest_private_file_bak = get_latest('*-private-files.tar')
 		return latest_file, latest_site_config, latest_public_file_bak, latest_private_file_bak
 
diff --git a/frappe/utils/backups.py b/frappe/utils/backups.py
index 7eb00ceccd..08b911c9ae 100644
--- a/frappe/utils/backups.py
+++ b/frappe/utils/backups.py
@@ -82,7 +82,7 @@ class BackupGenerator:
 	def set_backup_file_name(self):
 		#Generate a random name using today's date and a 8 digit random number
 		for_db = self.todays_date + "-" + self.site_slug + "-database.sql.gz"
-		for_public_files = self.todays_date + "-" + self.site_slug + "-files.tar"
+		for_public_files = self.todays_date + "-" + self.site_slug + "-public-files.tar"
 		for_private_files = self.todays_date + "-" + self.site_slug + "-private-files.tar"
 		backup_path = get_backup_path()
 

From 4f37f9a4528ba50b82f2000a4381c8ff813ff138 Mon Sep 17 00:00:00 2001
From: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
Date: Thu, 6 Aug 2020 09:33:39 +0530
Subject: [PATCH 180/191] test: Try committing after Role creation

---
 frappe/workflow/doctype/workflow/test_workflow.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/frappe/workflow/doctype/workflow/test_workflow.py b/frappe/workflow/doctype/workflow/test_workflow.py
index d7f7939d3d..84adc3a096 100644
--- a/frappe/workflow/doctype/workflow/test_workflow.py
+++ b/frappe/workflow/doctype/workflow/test_workflow.py
@@ -126,6 +126,7 @@ def create_todo_workflow():
 	else:
 		frappe.get_doc(dict(doctype='Role',
 			role_name='Test Approver')).insert(ignore_if_duplicate=True)
+		frappe.db.commit()
 		frappe.cache().hdel('roles', frappe.session.user)
 		workflow = frappe.new_doc('Workflow')
 		workflow.workflow_name = 'Test ToDo'

From b92ce9a245ad9582a833b4d0ce62bf1230e99a68 Mon Sep 17 00:00:00 2001
From: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
Date: Fri, 7 Aug 2020 09:25:37 +0530
Subject: [PATCH 181/191] feat: Allow sending emails via Server Script (#11162)

Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
---
 frappe/utils/safe_exec.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/frappe/utils/safe_exec.py b/frappe/utils/safe_exec.py
index 826aed6082..d97e770d88 100644
--- a/frappe/utils/safe_exec.py
+++ b/frappe/utils/safe_exec.py
@@ -70,6 +70,7 @@ def get_safe_globals():
 			render_template=frappe.render_template,
 			msgprint=frappe.msgprint,
 			throw=frappe.throw,
+			sendmail = frappe.sendmail,
 
 			user=user,
 			get_fullname=frappe.utils.get_fullname,

From 5b3fa971b54be7641b369d30a6c68f8acf290a13 Mon Sep 17 00:00:00 2001
From: gavin <gavin18d@gmail.com>
Date: Fri, 7 Aug 2020 13:14:29 +0530
Subject: [PATCH 182/191] Revert "fix: add a distinct identifier for public
 files backup (#11201)"

This reverts commit ef4a28e10c0de0083c57278b615e587600b64e3b.
---
 frappe/integrations/offsite_backup_utils.py | 2 +-
 frappe/utils/backups.py                     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/frappe/integrations/offsite_backup_utils.py b/frappe/integrations/offsite_backup_utils.py
index 0b3c47064e..9de176b2d0 100644
--- a/frappe/integrations/offsite_backup_utils.py
+++ b/frappe/integrations/offsite_backup_utils.py
@@ -53,7 +53,7 @@ def get_latest_backup_file(with_files=False):
 	latest_site_config = get_latest('*.json')
 
 	if with_files:
-		latest_public_file_bak = get_latest('*-public-files.tar')
+		latest_public_file_bak = get_latest('*-files.tar')
 		latest_private_file_bak = get_latest('*-private-files.tar')
 		return latest_file, latest_site_config, latest_public_file_bak, latest_private_file_bak
 
diff --git a/frappe/utils/backups.py b/frappe/utils/backups.py
index 08b911c9ae..7eb00ceccd 100644
--- a/frappe/utils/backups.py
+++ b/frappe/utils/backups.py
@@ -82,7 +82,7 @@ class BackupGenerator:
 	def set_backup_file_name(self):
 		#Generate a random name using today's date and a 8 digit random number
 		for_db = self.todays_date + "-" + self.site_slug + "-database.sql.gz"
-		for_public_files = self.todays_date + "-" + self.site_slug + "-public-files.tar"
+		for_public_files = self.todays_date + "-" + self.site_slug + "-files.tar"
 		for_private_files = self.todays_date + "-" + self.site_slug + "-private-files.tar"
 		backup_path = get_backup_path()
 

From ce9c23ba609e5f04cf15aba195a78b81b5a7508d Mon Sep 17 00:00:00 2001
From: Prssanna Desai <prssud@gmail.com>
Date: Fri, 7 Aug 2020 14:48:59 +0530
Subject: [PATCH 183/191] fix: return handler in _handler (#11215)

---
 frappe/public/js/frappe/form/script_manager.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frappe/public/js/frappe/form/script_manager.js b/frappe/public/js/frappe/form/script_manager.js
index 1238bf141c..4456c7d39c 100644
--- a/frappe/public/js/frappe/form/script_manager.js
+++ b/frappe/public/js/frappe/form/script_manager.js
@@ -19,7 +19,7 @@ frappe.ui.form.on = frappe.ui.form.on_change = function(doctype, fieldname, hand
 
 		let _handler = (...args) => {
 			try {
-				handler(...args);
+				return handler(...args);
 			} catch (error) {
 				console.error(handler);
 				throw error;

From 80733d4124b5ed5dc0a82d7a77b5f6593dd4b67b Mon Sep 17 00:00:00 2001
From: Shridhar Patil <shridharpatil2792@gmail.com>
Date: Fri, 7 Aug 2020 21:52:04 +0530
Subject: [PATCH 184/191] fix: raise incorrect site path error instead of
 sys.exit (#11206)

---
 frappe/__init__.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/frappe/__init__.py b/frappe/__init__.py
index 9e744c2c07..fdf6079220 100644
--- a/frappe/__init__.py
+++ b/frappe/__init__.py
@@ -231,8 +231,7 @@ def get_site_config(sites_path=None, site_path=None):
 		if os.path.exists(site_config):
 			config.update(get_file_json(site_config))
 		elif local.site and not local.flags.new_site:
-			print("Site {0} does not exist".format(local.site))
-			sys.exit(1)
+			raise IncorrectSitePath("{0} does not exist".format(local.site))
 
 	return _dict(config)
 

From 4a331016319471e07a2fabac7312bcb8347176b2 Mon Sep 17 00:00:00 2001
From: Suraj Shetty <surajshetty3416@gmail.com>
Date: Sat, 8 Aug 2020 19:47:39 +0530
Subject: [PATCH 185/191] fix: Check if frappe.local has "request" to avoid
 attribute error

---
 frappe/auth.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frappe/auth.py b/frappe/auth.py
index 64fea36748..998e97fe24 100644
--- a/frappe/auth.py
+++ b/frappe/auth.py
@@ -338,7 +338,7 @@ class CookieManager:
 			self.set_cookie("country", frappe.session.session_country)
 
 	def set_cookie(self, key, value, expires=None, secure=False, httponly=False, samesite="Lax"):
-		if not secure:
+		if not secure and hasattr(frappe.local, 'request'):
 			secure = frappe.local.request.scheme == "https"
 		self.cookies[key] = {
 			"value": value,

From 52d6925c49c7acee15189fcde58b92a55a17f97c Mon Sep 17 00:00:00 2001
From: Suraj Shetty <surajshetty3416@gmail.com>
Date: Sat, 8 Aug 2020 19:47:54 +0530
Subject: [PATCH 186/191] test: Fallback to site URL if host_name is none

---
 .../doctype/data_migration_run/test_data_migration_run.py     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/frappe/data_migration/doctype/data_migration_run/test_data_migration_run.py b/frappe/data_migration/doctype/data_migration_run/test_data_migration_run.py
index ba4a255b97..c6c3ea138c 100644
--- a/frappe/data_migration/doctype/data_migration_run/test_data_migration_run.py
+++ b/frappe/data_migration/doctype/data_migration_run/test_data_migration_run.py
@@ -108,7 +108,7 @@ def create_plan():
 		'connector_name': 'Local Connector',
 		'connector_type': 'Frappe',
 		# connect to same host.
-		'hostname': frappe.conf.host_name,
+		'hostname': frappe.conf.host_name or frappe.utils.get_site_url(frappe.local.site),
 		'username': 'Administrator',
-		'password': 'admin'
+		'password': frappe.conf.get("admin_password") or 'admin'
 	}).insert(ignore_if_duplicate=True)

From 7d8695c7d348155ab337619df1a208ffc3e6ec76 Mon Sep 17 00:00:00 2001
From: Suraj Shetty <surajshetty3416@gmail.com>
Date: Sat, 8 Aug 2020 23:46:45 +0530
Subject: [PATCH 187/191] fix: Provide fallback array for test_mails to avoid
 unexpected trace in travis

---
 frappe/email/doctype/email_account/email_account.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frappe/email/doctype/email_account/email_account.py b/frappe/email/doctype/email_account/email_account.py
index cf8c6e80c6..29cd890bf1 100755
--- a/frappe/email/doctype/email_account/email_account.py
+++ b/frappe/email/doctype/email_account/email_account.py
@@ -251,7 +251,7 @@ class EmailAccount(Document):
 			email_server = None
 
 			if frappe.local.flags.in_test:
-				incoming_mails = test_mails
+				incoming_mails = test_mails or []
 			else:
 				email_sync_rule = self.build_email_sync_rule()
 

From 0919dbeccd8c7367f0a26e2af3ebf75b22814f9a Mon Sep 17 00:00:00 2001
From: Suraj Shetty <surajshetty3416@gmail.com>
Date: Sun, 9 Aug 2020 00:06:25 +0530
Subject: [PATCH 188/191] test: Manually delete jobs instead of deleting job
 type

- This removes unwanted traceback of "Scheduled Job Type" not found
while running tests
---
 frappe/tests/test_scheduler.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frappe/tests/test_scheduler.py b/frappe/tests/test_scheduler.py
index e554fd23be..30818e6f17 100644
--- a/frappe/tests/test_scheduler.py
+++ b/frappe/tests/test_scheduler.py
@@ -49,7 +49,7 @@ class TestScheduler(TestCase):
 
 		# 2nd job not loaded
 		self.assertFalse(job.enqueue())
-		job.delete()
+		frappe.db.sql('DELETE FROM `tabScheduled Job Log` WHERE `scheduled_job_type`=%s', job.name)
 
 	def test_is_dormant(self):
 		self.assertTrue(is_dormant(check_time= get_datetime('2100-01-01 00:00:00')))

From be8566e1acdbcbf941b49c47b66b5b6a250c2232 Mon Sep 17 00:00:00 2001
From: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
Date: Sun, 9 Aug 2020 14:23:25 +0200
Subject: [PATCH 189/191] feat: add currency Congolese franc

---
 frappe/geo/country_info.json | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/frappe/geo/country_info.json b/frappe/geo/country_info.json
index 1bf5ada467..6a56107333 100644
--- a/frappe/geo/country_info.json
+++ b/frappe/geo/country_info.json
@@ -620,7 +620,12 @@
  },
  "Congo, The Democratic Republic of the": {
   "code": "cd",
-  "number_format": "#,###.##"
+  "number_format": "#,###.##",
+  "currency": "CDF",
+  "currency_name": "Congolese franc",
+  "currency_symbol": "FC",
+  "currency_fraction": "Centime",
+  "currency_fraction_units": 100
  },
  "Cook Islands": {
   "code": "ck",

From be4d3ae43492e72f2fe94bd5369e59e7626c74b8 Mon Sep 17 00:00:00 2001
From: Shivam Mishra <scm.mymail@gmail.com>
Date: Tue, 4 Aug 2020 17:16:49 +0530
Subject: [PATCH 190/191] feat: allow wide attribute in msgprint and throw

---
 frappe/__init__.py | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/frappe/__init__.py b/frappe/__init__.py
index c6e762919f..add18cdc58 100644
--- a/frappe/__init__.py
+++ b/frappe/__init__.py
@@ -299,7 +299,7 @@ def log(msg):
 
 	debug_log.append(as_unicode(msg))
 
-def msgprint(msg, title=None, raise_exception=0, as_table=False, indicator=None, alert=False, primary_action=None, is_minimizable=None):
+def msgprint(msg, title=None, raise_exception=0, as_table=False, indicator=None, alert=False, primary_action=None, is_minimizable=None, wide=None):
 	"""Print a message to the user (via HTTP response).
 	Messages are sent in the `__server_messages` property in the
 	response JSON and shown in a pop-up / modal.
@@ -309,6 +309,8 @@ def msgprint(msg, title=None, raise_exception=0, as_table=False, indicator=None,
 	:param raise_exception: [optional] Raise given exception and show message.
 	:param as_table: [optional] If `msg` is a list of lists, render as HTML table.
 	:param primary_action: [optional] Bind a primary server/client side action.
+	:param is_minimizable: [optional] Allow users to minimize the modal
+	:param wide: [optional] Show wide modal
 	"""
 	from frappe.utils import encode
 
@@ -366,6 +368,9 @@ def msgprint(msg, title=None, raise_exception=0, as_table=False, indicator=None,
 	if primary_action:
 		out.primary_action = primary_action
 
+	if wide:
+		out.wide = wide
+
 	message_log.append(json.dumps(out))
 
 	if raise_exception and hasattr(raise_exception, '__name__'):
@@ -387,12 +392,12 @@ def clear_last_message():
 	if len(local.message_log) > 0:
 		local.message_log = local.message_log[:-1]
 
-def throw(msg, exc=ValidationError, title=None, is_minimizable=None):
+def throw(msg, exc=ValidationError, title=None, is_minimizable=None, wide=None):
 	"""Throw execption and show message (`msgprint`).
 
 	:param msg: Message.
 	:param exc: Exception class. Default `frappe.ValidationError`"""
-	msgprint(msg, raise_exception=exc, title=title, indicator='red', is_minimizable=is_minimizable)
+	msgprint(msg, raise_exception=exc, title=title, indicator='red', is_minimizable=is_minimizable, wide=wide)
 
 def emit_js(js, user=False, **kwargs):
 	if user == False:

From 435b522dbf34980c9af56b140bc5a6a76087f484 Mon Sep 17 00:00:00 2001
From: Saurabh <saurabh6790@gmail.com>
Date: Mon, 10 Aug 2020 11:53:39 +0530
Subject: [PATCH 191/191] fix: cache all apps in local and switch to
 enable/disable frappe logger

---
 frappe/__init__.py |  6 +++++-
 frappe/app.py      | 19 ++++++++++---------
 2 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/frappe/__init__.py b/frappe/__init__.py
index c6e762919f..58207607c3 100644
--- a/frappe/__init__.py
+++ b/frappe/__init__.py
@@ -153,6 +153,7 @@ def init(site, sites_path=None, new_site=False):
 	local.site = site
 	local.sites_path = sites_path
 	local.site_path = os.path.join(sites_path, site)
+	local.all_apps = None
 
 	local.request_ip = None
 	local.response = _dict({"docs":[]})
@@ -916,10 +917,13 @@ def get_installed_apps(sort=False, frappe_last=False):
 	if not db:
 		connect()
 
+	if not local.all_apps:
+		local.all_apps  = get_all_apps(True)
+
 	installed = json.loads(db.get_global("installed_apps") or "[]")
 
 	if sort:
-		installed = [app for app in get_all_apps(True) if app in installed]
+		installed = [app for app in local.all_apps if app in installed]
 
 	if frappe_last:
 		if 'frappe' in installed:
diff --git a/frappe/app.py b/frappe/app.py
index 725bec183a..39bff83122 100644
--- a/frappe/app.py
+++ b/frappe/app.py
@@ -99,15 +99,16 @@ def application(request):
 		frappe.monitor.stop(response)
 		frappe.recorder.dump()
 
-		frappe.logger("frappe.web", allow_site=frappe.local.site).info({
-			"site": get_site_name(request.host),
-			"remote_addr": getattr(request, "remote_addr", "NOTFOUND"),
-			"base_url": getattr(request, "base_url", "NOTFOUND"),
-			"full_path": getattr(request, "full_path", "NOTFOUND"),
-			"method": getattr(request, "method", "NOTFOUND"),
-			"scheme": getattr(request, "scheme", "NOTFOUND"),
-			"http_status_code": getattr(response, "status_code", "NOTFOUND")
-		})
+		if hasattr(frappe.local, 'conf') and frappe.local.conf.enable_frappe_logger:
+			frappe.logger("frappe.web", allow_site=frappe.local.site).info({
+				"site": get_site_name(request.host),
+				"remote_addr": getattr(request, "remote_addr", "NOTFOUND"),
+				"base_url": getattr(request, "base_url", "NOTFOUND"),
+				"full_path": getattr(request, "full_path", "NOTFOUND"),
+				"method": getattr(request, "method", "NOTFOUND"),
+				"scheme": getattr(request, "scheme", "NOTFOUND"),
+				"http_status_code": getattr(response, "status_code", "NOTFOUND")
+			})
 
 		if response and hasattr(frappe.local, 'rate_limiter'):
 			response.headers.extend(frappe.local.rate_limiter.headers())