Merge branch 'v12-pre-release' into version-12

Author: nabinhait

.travis.yml

@@ -52,9 +52,7 @@ install:
   - cd ~
   - source ./.nvm/nvm.sh
   - nvm install v8.10.0
-
-  - git clone https://github.com/frappe/bench --depth 1
-  - pip install -e ./bench
+  - pip install -U frappe-bench --only-binary='all'
 
   - bench init frappe-bench --skip-assets --python $(which python) --frappe-path $TRAVIS_BUILD_DIR
 

frappe/__init__.py

@@ -23,7 +23,7 @@
 	reload(sys)
 	sys.setdefaultencoding("utf-8")
 
-__version__ = '12.18.1'
+__version__ = '12.19.0'
 __title__ = "Frappe Framework"
 
 local = Local()

frappe/app.py

@@ -185,8 +185,20 @@ def handle_exception(e):
 	response = None
 	http_status_code = getattr(e, "http_status_code", 500)
 	return_as_message = False
-
-	if frappe.get_request_header('Accept') and (frappe.local.is_ajax or 'application/json' in frappe.get_request_header('Accept')):
+	accept_header = frappe.get_request_header("Accept") or ""
+	respond_as_json = (
+		frappe.get_request_header('Accept')
+		and (frappe.local.is_ajax or 'application/json' in accept_header)
+		or (
+			frappe.local.request.path.startswith("/api/") and not accept_header.startswith("text")
+		)
+	)
+
+	if frappe.conf.get('developer_mode'):
+		# don't fail silently
+		print(frappe.get_traceback())
+
+	if respond_as_json:
 		# handle ajax responses first
 		# if the request is ajax, send back the trace or error message
 		response = frappe.utils.response.report_error(http_status_code)

frappe/auth.py

@@ -209,7 +209,10 @@ def authenticate(self, user = None, pwd = None):
 			self.fail(_('Incomplete login details'), user=user)
 
 		# Ignore password check if tmp_id is set, 2FA takes care of authentication.
-		validate_password = not bool(frappe.form_dict.get('tmp_id'))
+		tmp_id = bool(frappe.form_dict.tmp_id)
+		enabled = cint(frappe.db.get_single_value('System Settings', 'enable_two_factor_auth', cache=True))
+		# if tmp_id is set and 2FA is enabled, skip validation by password
+		validate_password = not (tmp_id and enabled)
 		user = User.find_by_credentials(user, pwd, validate_password=validate_password)
 
 		if not user:

frappe/change_log/v12/v12_19_0.md

@@ -0,0 +1,14 @@
+## Version 12.19.0 Release Notes
+
+### Fixes & Enhancements
+
+- Refresh form section while refreshing the field ([#13355](https://github.com/frappe/frappe/pull/13355))
+- Check for 2FA is enabled or not ([#13455](https://github.com/frappe/frappe/pull/13455))
+- Tooltip displays correct title (backport #13346) ([#13354](https://github.com/frappe/frappe/pull/13354))
+- Expose limited methods of json module ([#13253](https://github.com/frappe/frappe/pull/13253))
+- ci: Update Sider config ([#13332](https://github.com/frappe/frappe/pull/13332))
+- auto_repeat field check while loading customize form ([#13350](https://github.com/frappe/frappe/pull/13350))
+- Restrict access to python's internal attributes ([#13383](https://github.com/frappe/frappe/pull/13383))
+- Respond to /api requests as JSON by default (backport #13028) ([#13408](https://github.com/frappe/frappe/pull/13408))
+- CSS bug on print format rtl layout ([#13299](https://github.com/frappe/frappe/pull/13299))
+- Check if salutation already exists in email body ([#13196](https://github.com/frappe/frappe/pull/13196))

frappe/custom/doctype/customize_form/customize_form.py

@@ -115,12 +115,22 @@ def fetch_to_customize(self):
 
 		#If allow_auto_repeat is set, add auto_repeat custom field.
 		if self.allow_auto_repeat:
-			if not frappe.db.exists('Custom Field', {'fieldname': 'auto_repeat', 'dt': self.doc_type}):
-				insert_after = self.fields[len(self.fields) - 1].fieldname
-				df = dict(fieldname='auto_repeat', label='Auto Repeat', fieldtype='Link', options='Auto Repeat', insert_after=insert_after, read_only=1, no_copy=1, print_hide=1)
-				create_custom_field(self.doc_type, df)
+			all_fields = [df.fieldname for df in meta.fields]
+			if "auto_repeat" in all_fields:
+				return
+
+			insert_after = self.fields[len(self.fields) - 1].fieldname
+			create_custom_field(self.doc_type, dict(
+				fieldname='auto_repeat',
+				label='Auto Repeat',
+				fieldtype='Link',
+				options='Auto Repeat',
+				insert_after=insert_after,
+				read_only=1,
+				no_copy=1,
+				print_hide=1
+			))
 
-		# NOTE doc is sent to clientside by run_method
 
 	def get_name_translation(self):
 		'''Get translation object if exists of current doctype name in the default language'''

frappe/public/css/desk-rtl.css

@@ -148,3 +148,8 @@ body[data-route^=Form] .page-title .indicator {
     transform: translateX(0%) !important;
   }
 }
+
+.print-format-builder-main {
+  margin-left: 0px;
+  margin-right: 160px;
+}

frappe/public/js/frappe/form/controls/link.js

@@ -191,10 +191,11 @@ frappe.ui.form.ControlLink = frappe.ui.form.ControlData.extend({
 						if(frappe.model.can_create(doctype)) {
 							// new item
 							r.results.push({
-								label: "<span class='text-primary link-option'>"
+								html: "<span class='text-primary link-option'>"
 									+ "<i class='fa fa-plus' style='margin-right: 5px;'></i> "
 									+ __("Create a new {0}", [__(me.get_options())])
 									+ "</span>",
+								label: __("Create a new {0}", [__(me.get_options())]),
 								value: "create_new__link_option",
 								action: me.new_doc
 							});
@@ -204,10 +205,11 @@ frappe.ui.form.ControlLink = frappe.ui.form.ControlData.extend({
 						if (locals && locals['DocType']) {
 							// not applicable in web forms
 							r.results.push({
-								label: "<span class='text-primary link-option'>"
+								html: "<span class='text-primary link-option'>"
 									+ "<i class='fa fa-search' style='margin-right: 5px;'></i> "
 									+ __("Advanced Search")
 									+ "</span>",
+								label: __("Advanced Search"),
 								value: "advanced_search__link_option",
 								action: me.open_advanced_search
 							});

frappe/public/js/frappe/form/form.js

@@ -198,6 +198,7 @@ frappe.ui.form.Form = class FrappeForm {
 				field && ["Link", "Dynamic Link"].includes(field.df.fieldtype) && field.validate && field.validate(value);
 
 				me.layout.refresh_dependency();
+				me.layout.refresh_sections();
 				let object = me.script_manager.trigger(fieldname, doc.doctype, doc.name);
 				return object;
 			}
@@ -913,6 +914,7 @@ frappe.ui.form.Form = class FrappeForm {
 		if(this.fields_dict[fname] && this.fields_dict[fname].refresh) {
 			this.fields_dict[fname].refresh();
 			this.layout.refresh_dependency();
+			this.layout.refresh_sections();
 		}
 	}
 

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

@@ -640,10 +640,14 @@ frappe.views.CommunicationComposer = Class.extend({
 				this.message = localStorage.getItem(doctype + docname) || '';
 			}
 		}
-
-		if(this.real_name) {
-			this.message = '<p>'+__('Dear') +' '
-				+ this.real_name + ",</p><!-- salutation-ends --><br>" + (this.message || "");
+		
+		const SALUTATION_END_COMMENT = "<!-- salutation-ends -->";
+		if (this.real_name && !message.includes(SALUTATION_END_COMMENT)) {
+			this.message = `
+				<p>${__('Dear')} ${this.real_name},</p>
+				${SALUTATION_END_COMMENT}<br>
+				${message}
+			`;
 		}
 
 		if(this.message && signature && this.message.includes(signature)) {