Merge branch 'develop' into update-if-missing

.github/helper/install.sh

@@ -50,7 +50,9 @@ if [ "$TYPE" == "server" ]; then sed -i 's/^socketio:/# socketio:/g' Procfile; f
 if [ "$TYPE" == "server" ]; then sed -i 's/^redis_socketio:/# redis_socketio:/g' Procfile; fi
 
 if [ "$TYPE" == "ui" ]; then bench setup requirements --node; fi
-if [ "$TYPE" == "server" ]; then bench setup requirements --dev; fi
+bench setup requirements --dev
+
+if [ "$TYPE" == "ui" ]; then sed -i 's/^web: bench serve/web: bench serve --with-coverage/g' Procfile; fi
 
 # install node-sass which is required for website theme test
 cd ./apps/frappe || exit
@@ -60,4 +62,4 @@ cd ../..
 bench start &
 bench --site test_site reinstall --yes
 if [ "$TYPE" == "server" ]; then bench --site test_site_producer reinstall --yes; fi
-CI=Yes bench build --app frappe
+if [ "$TYPE" == "server" ]; then CI=Yes bench build --app frappe; fi

.github/helper/roulette.py

@@ -41,6 +41,7 @@ if __name__ == "__main__":
 	# this is a push build, run all builds
 	if not pr_number:
 		os.system('echo "::set-output name=build::strawberry"')
+		os.system('echo "::set-output name=build-server::strawberry"')
 		sys.exit(0)
 
 	files_list = files_list or get_files_list(pr_number=pr_number, repo=repo)
@@ -52,7 +53,8 @@ if __name__ == "__main__":
 	ci_files_changed = any(f for f in files_list if is_ci(f))
 	only_docs_changed = len(list(filter(is_docs, files_list))) == len(files_list)
 	only_frontend_code_changed = len(list(filter(is_frontend_code, files_list))) == len(files_list)
-	only_py_changed = len(list(filter(is_py, files_list))) == len(files_list)
+	updated_py_file_count = len(list(filter(is_py, files_list)))
+	only_py_changed = updated_py_file_count == len(files_list)
 
 	if ci_files_changed:
 		print("CI related files were updated, running all build processes.")
@@ -65,8 +67,12 @@ if __name__ == "__main__":
 		print("Only Frontend code was updated; Stopping Python build process.")
 		sys.exit(0)
 
-	elif only_py_changed and build_type == "ui":
-		print("Only Python code was updated, stopping Cypress build process.")
-		sys.exit(0)
+	elif build_type == "ui":
+		if only_py_changed:
+			print("Only Python code was updated, stopping Cypress build process.")
+			sys.exit(0)
+		elif updated_py_file_count > 0:
+			# both frontend and backend code were updated
+			os.system('echo "::set-output name=build-server::strawberry"')
 
 	os.system('echo "::set-output name=build::strawberry"')

.github/workflows/ui-tests.yml

@@ -141,6 +141,12 @@ jobs:
         env:
           CYPRESS_RECORD_KEY: 4a48f41c-11b3-425b-aa88-c58048fa69eb
 
+      - name: Stop server
+        if: ${{ steps.check-build.outputs.build-server == 'strawberry' }}
+        run: |
+          ps -ef | grep "frappe serve" | awk '{print $2}' | xargs kill -s SIGINT 2> /dev/null || true
+          sleep 5
+
       - name: Check If Coverage Report Exists
         id: check_coverage
         uses: andstor/file-existence-action@v1
@@ -156,3 +162,13 @@ jobs:
           directory: /home/runner/frappe-bench/apps/frappe/.cypress-coverage/
           verbose: true
           flags: ui-tests
+
+      - name: Upload Server Coverage Data
+        if: ${{ steps.check-build.outputs.build-server == 'strawberry' }}
+        uses: codecov/codecov-action@v2
+        with:
+          name: MariaDB
+          fail_ci_if_error: true
+          files: /home/runner/frappe-bench/sites/coverage.xml
+          verbose: true
+          flags: server

cypress/fixtures/child_table_doctype.js

@@ -0,0 +1,30 @@
+export default {
+	name: "Child Table Doctype",
+	actions: [],
+	custom: 1,
+	autoname: "field:title",
+	creation: "2022-02-09 20:15:21.242213",
+	doctype: "DocType",
+	editable_grid: 1,
+	engine: "InnoDB",
+	fields: [
+		{
+			fieldname: "title",
+			fieldtype: "Data",
+			in_list_view: 1,
+			label: "Title",
+			unique: 1
+		}
+	],
+	links: [],
+	istable: 1,
+	modified: "2022-02-10 12:03:12.603763",
+	modified_by: "Administrator",
+	module: "Custom",
+	naming_rule: "By fieldname",
+	owner: "Administrator",
+	permissions: [],
+	sort_field: 'modified',
+	sort_order: 'ASC',
+	track_changes: 1
+};

cypress/fixtures/doctype_to_link.js

@@ -0,0 +1,45 @@
+export default {
+	name: "Doctype to Link",
+	actions: [],
+	custom: 1,
+	naming_rule: "By fieldname",
+	autoname: "field:title",
+	creation: "2022-02-09 20:15:21.242213",
+	doctype: "DocType",
+	editable_grid: 1,
+	engine: "InnoDB",
+	fields: [
+		{
+			"fieldname": "title",
+			"fieldtype": "Data",
+			"label": "Title",
+			"unique": 1
+		}
+	],
+	links: [
+		{
+			"group": "Child Doctype",
+			"link_doctype": "Doctype With Child Table",
+			"link_fieldname": "title"
+		}
+	],
+	modified: "2022-02-10 12:03:12.603763",
+	modified_by: "Administrator",
+	module: "Custom",
+	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: 'ASC',
+	track_changes: 1
+};

cypress/fixtures/doctype_with_child_table.js

@@ -0,0 +1,46 @@
+export default {
+	name: "Doctype With Child Table",
+	actions: [],
+	custom: 1,
+	autoname: "field:title",
+	creation: "2022-02-09 20:15:21.242213",
+	doctype: "DocType",
+	editable_grid: 1,
+	engine: "InnoDB",
+	fields: [
+		{
+			fieldname: "title",
+			fieldtype: "Data",
+			label: "Title",
+			unique: 1
+		},
+		{
+			fieldname: "child_table",
+			fieldtype: "Table",
+			label: "Child Table",
+			options: "Child Table Doctype",
+			reqd: 1
+		}
+	],
+	links: [],
+	modified: "2022-02-10 12:03:12.603763",
+	modified_by: "Administrator",
+	module: "Custom",
+	naming_rule: "By fieldname",
+	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: 'ASC',
+	track_changes: 1
+};

cypress/integration/dashboard_links.js

@@ -1,7 +1,21 @@
+import doctype_with_child_table from '../fixtures/doctype_with_child_table';
+import child_table_doctype from '../fixtures/child_table_doctype';
+import doctype_to_link from '../fixtures/doctype_to_link';
+const doctype_to_link_name = doctype_to_link.name;
+const child_table_doctype_name = child_table_doctype.name;
+
 context('Dashboard links', () => {
 	before(() => {
 		cy.visit('/login');
 		cy.login();
+		cy.insert_doc('DocType', child_table_doctype, true);
+		cy.insert_doc('DocType', doctype_with_child_table, true);
+		cy.insert_doc('DocType', doctype_to_link, true);
+		return cy.window().its('frappe').then(frappe => {
+			return frappe.xcall("frappe.tests.ui_test_helpers.update_child_table", {
+				name: child_table_doctype_name
+			});
+		});
 	});
 
 	it('Adding a new contact, checking for the counter on the dashboard and deleting the created contact', () => {
@@ -62,4 +76,14 @@ context('Dashboard links', () => {
 				cy.findByText('Website Analytics');
 			});
 	});
+
+	it('check if child table is populated with linked field on creation from dashboard link', () => {
+		cy.new_form(doctype_to_link_name);
+		cy.fill_field("title", "Test Linking");
+		cy.findByRole("button", {name: "Save"}).click();
+
+		cy.get('.document-link .btn-new').click();
+		cy.get('.frappe-control[data-fieldname="child_table"] .rows .data-row .col[data-fieldname="doctype_to_link"]')
+			.should('contain.text', 'Test Linking');
+	});
 });

cypress/integration/depends_on.js

@@ -55,10 +55,31 @@ context('Depends On', () => {
 						'read_only_depends_on': "eval:doc.test_field=='Some Other Value'",
 						'options': "Child Test Depends On"
 					},
+					{
+						"label": "Dependent Tab",
+						"fieldname": "dependent_tab",
+						"fieldtype": "Tab Break",
+						"depends_on": "eval:doc.test_field=='Show Tab'"
+					},
+					{
+						"fieldname": "tab_section",
+						"fieldtype": "Section Break",
+					},
+					{
+						"label": "Field in Tab",
+						"fieldname": "field_in_tab",
+						"fieldtype": "Data",
+					}
 				]
 			});
 		});
 	});
+	it('should show the tab on other setting field value', () => {
+		cy.new_form('Test Depends On');
+		cy.fill_field('test_field', 'Show Tab');
+		cy.get('body').click();
+		cy.findByRole("tab", {name: "Dependent Tab"}).should('be.visible');
+	});
 	it('should set the field as mandatory depending on other fields value', () => {
 		cy.new_form('Test Depends On');
 		cy.fill_field('test_field', 'Some Value');

cypress/integration/grid.js

@@ -0,0 +1,92 @@
+context('Grid', () => {
+	beforeEach(() => {
+		cy.login();
+		cy.visit('/app/website');
+	});
+	before(() => {
+		cy.login();
+		cy.visit('/app/website');
+		return cy.window().its('frappe').then(frappe => {
+			return frappe.call("frappe.tests.ui_test_helpers.create_contact_phone_nos_records");
+		});
+	});
+	it('update docfield property using update_docfield_property', () => {
+		cy.visit('/app/contact/Test Contact');
+		cy.window().its("cur_frm").then(frm => {
+			cy.get('.frappe-control[data-fieldname="phone_nos"]').as('table');
+			let field = frm.get_field("phone_nos");
+			field.grid.update_docfield_property("is_primary_phone", "hidden", true);
+
+			cy.get('@table').find('[data-idx="1"] .edit-grid-row').click();
+			cy.get('.grid-row-open').as('table-form');
+			cy.get('@table-form').find('.frappe-control[data-fieldname="is_primary_phone"]').should("be.hidden");
+			cy.get('@table-form').find('.grid-footer-toolbar').click();
+
+			cy.get('@table').find('[data-idx="2"] .edit-grid-row').click();
+			cy.get('.grid-row-open').as('table-form');
+			cy.get('@table-form').find('.frappe-control[data-fieldname="is_primary_phone"]').should("be.hidden");
+			cy.get('@table-form').find('.grid-footer-toolbar').click();
+		});
+	});
+	it('update docfield property using toggle_display', () => {
+		cy.visit('/app/contact/Test Contact');
+		cy.window().its("cur_frm").then(frm => {
+			cy.get('.frappe-control[data-fieldname="phone_nos"]').as('table');
+			let field = frm.get_field("phone_nos");
+			field.grid.toggle_display("is_primary_mobile_no", false);
+
+			cy.get('@table').find('[data-idx="1"] .edit-grid-row').click();
+			cy.get('.grid-row-open').as('table-form');
+			cy.get('@table-form').find('.frappe-control[data-fieldname="is_primary_mobile_no"]').should("be.hidden");
+			cy.get('@table-form').find('.grid-footer-toolbar').click();
+
+			cy.get('@table').find('[data-idx="2"] .edit-grid-row').click();
+			cy.get('.grid-row-open').as('table-form');
+			cy.get('@table-form').find('.frappe-control[data-fieldname="is_primary_mobile_no"]').should("be.hidden");
+			cy.get('@table-form').find('.grid-footer-toolbar').click();
+		});
+	});
+	it('update docfield property using toggle_enable', () => {
+		cy.visit('/app/contact/Test Contact');
+		cy.window().its("cur_frm").then(frm => {
+			cy.get('.frappe-control[data-fieldname="phone_nos"]').as('table');
+			let field = frm.get_field("phone_nos");
+			field.grid.toggle_enable("phone", false);
+
+
+			cy.get('@table').find('[data-idx="1"] .edit-grid-row').click();
+			cy.get('.grid-row-open').as('table-form');
+			cy.get('@table-form').find('.frappe-control[data-fieldname="phone"] .control-value').should('have.class', 'like-disabled-input');
+			cy.get('@table-form').find('.grid-footer-toolbar').click();
+
+			cy.get('@table').find('[data-idx="2"] .edit-grid-row').click();
+			cy.get('.grid-row-open').as('table-form');
+			cy.get('@table-form').find('.frappe-control[data-fieldname="phone"] .control-value').should('have.class', 'like-disabled-input');
+			cy.get('@table-form').find('.grid-footer-toolbar').click();
+		});
+	});
+	it('update docfield property using toggle_reqd', () => {
+		cy.visit('/app/contact/Test Contact');
+		cy.window().its("cur_frm").then(frm => {
+			cy.get('.frappe-control[data-fieldname="phone_nos"]').as('table');
+			let field = frm.get_field("phone_nos");
+			field.grid.toggle_reqd("phone", false);
+
+			cy.get('@table').find('[data-idx="1"] .edit-grid-row').click();
+			cy.get('.grid-row-open').as('table-form');
+			cy.get_field("phone").as('phone-field');
+			cy.get('@phone-field').focus().clear().wait(500).blur();
+			cy.get('@phone-field').should("not.have.class", "has-error");
+			cy.get('@table-form').find('.grid-footer-toolbar').click();
+
+			cy.get('@table').find('[data-idx="2"] .edit-grid-row').click();
+			cy.get('.grid-row-open').as('table-form');
+			cy.get_field("phone").as('phone-field');
+			cy.get('@phone-field').focus().clear().wait(500).blur();
+			cy.get('@phone-field').should("not.have.class", "has-error");
+			cy.get('@table-form').find('.grid-footer-toolbar').click();
+
+		});
+	});
+});
+

cypress/integration/report_view.js

@@ -46,7 +46,6 @@ context('Report View', () => {
 	it('test load more with count selection buttons', () => {
 		cy.visit('/app/contact/view/report');
 
-		cy.clear_filters();
 		cy.get('.list-paging-area .list-count').should('contain.text', '20 of');
 		cy.get('.list-paging-area .btn-more').click();
 		cy.get('.list-paging-area .list-count').should('contain.text', '40 of');
@@ -61,6 +60,10 @@ context('Report View', () => {
 		cy.get('.list-paging-area .btn-more').click();
 		cy.get('.list-paging-area .list-count').should('contain.text', '300 of');
 
+		// check if refresh works after load more
+		cy.get('.page-head .standard-actions [data-original-title="Refresh"]').click();
+		cy.get('.list-paging-area .list-count').should('contain.text', '300 of');
+
 		cy.get('.list-paging-area .btn-group .btn-paging[data-value="500"]').click();
 
 		cy.get('.list-paging-area .list-count').should('contain.text', '500 of');

frappe/build.py

@@ -1,25 +1,21 @@
-# Copyright (c) 2021, Frappe Technologies Pvt. Ltd. and Contributors
+# Copyright (c) 2022, Frappe Technologies Pvt. Ltd. and Contributors
 # License: MIT. See LICENSE
 import os
-import re
-import json
 import shutil
+import re
 import subprocess
+from distutils.spawn import find_executable
 from subprocess import getoutput
-from io import StringIO
 from tempfile import mkdtemp, mktemp
-from distutils.spawn import find_executable
-
-import frappe
-from frappe.utils.minify import JavascriptMinify
+from urllib.parse import urlparse
 
 import click
 import psutil
-from urllib.parse import urlparse
-from semantic_version import Version
 from requests import head
 from requests.exceptions import HTTPError
+from semantic_version import Version
 
+import frappe
 
 timestamps = {}
 app_paths = None
@@ -32,6 +28,7 @@ class AssetsNotDownloadedError(Exception):
 class AssetsDontExistError(HTTPError):
 	pass
 
+
 def download_file(url, prefix):
 	from requests import get
 
@@ -277,12 +274,14 @@ def check_node_executable():
 		click.echo(f"{warn} Please install yarn using below command and try again.\nnpm install -g yarn")
 	click.echo()
 
+
 def get_node_env():
 	node_env = {
 		"NODE_OPTIONS": f"--max_old_space_size={get_safe_max_old_space_size()}"
 	}
 	return node_env
 
+
 def get_safe_max_old_space_size():
 	safe_max_old_space_size = 0
 	try:
@@ -296,6 +295,7 @@ def get_safe_max_old_space_size():
 
 	return safe_max_old_space_size
 
+
 def generate_assets_map():
 	symlinks = {}
 
@@ -344,7 +344,6 @@ def clear_broken_symlinks():
 			os.remove(path)
 
 
-
 def unstrip(message: str) -> str:
 	"""Pads input string on the right side until the last available column in the terminal
 	"""
@@ -397,94 +396,6 @@ def link_assets_dir(source, target, hard_link=False):
 		symlink(source, target, overwrite=True)
 
 
-def build(no_compress=False, verbose=False):
-	for target, sources in get_build_maps().items():
-		pack(os.path.join(assets_path, target), sources, no_compress, verbose)
-
-
-def get_build_maps():
-	"""get all build.jsons with absolute paths"""
-	# framework js and css files
-
-	build_maps = {}
-	for app_path in app_paths:
-		path = os.path.join(app_path, "public", "build.json")
-		if os.path.exists(path):
-			with open(path) as f:
-				try:
-					for target, sources in (json.loads(f.read() or "{}")).items():
-						# update app path
-						source_paths = []
-						for source in sources:
-							if isinstance(source, list):
-								s = frappe.get_pymodule_path(source[0], *source[1].split("/"))
-							else:
-								s = os.path.join(app_path, source)
-							source_paths.append(s)
-
-						build_maps[target] = source_paths
-				except ValueError as e:
-					print(path)
-					print("JSON syntax error {0}".format(str(e)))
-	return build_maps
-
-
-def pack(target, sources, no_compress, verbose):
-	outtype, outtxt = target.split(".")[-1], ""
-	jsm = JavascriptMinify()
-
-	for f in sources:
-		suffix = None
-		if ":" in f:
-			f, suffix = f.split(":")
-		if not os.path.exists(f) or os.path.isdir(f):
-			print("did not find " + f)
-			continue
-		timestamps[f] = os.path.getmtime(f)
-		try:
-			with open(f, "r") as sourcefile:
-				data = str(sourcefile.read(), "utf-8", errors="ignore")
-
-			extn = f.rsplit(".", 1)[1]
-
-			if (
-				outtype == "js"
-				and extn == "js"
-				and (not no_compress)
-				and suffix != "concat"
-				and (".min." not in f)
-			):
-				tmpin, tmpout = StringIO(data.encode("utf-8")), StringIO()
-				jsm.minify(tmpin, tmpout)
-				minified = tmpout.getvalue()
-				if minified:
-					outtxt += str(minified or "", "utf-8").strip("\n") + ";"
-
-				if verbose:
-					print("{0}: {1}k".format(f, int(len(minified) / 1024)))
-			elif outtype == "js" and extn == "html":
-				# add to frappe.templates
-				outtxt += html_to_js_template(f, data)
-			else:
-				outtxt += "\n/*\n *\t%s\n */" % f
-				outtxt += "\n" + data + "\n"
-
-		except Exception:
-			print("--Error in:" + f + "--")
-			print(frappe.get_traceback())
-
-	with open(target, "w") as f:
-		f.write(outtxt.encode("utf-8"))
-
-	print("Wrote %s - %sk" % (target, str(int(os.path.getsize(target) / 1024))))
-
-
-def html_to_js_template(path, content):
-	"""returns HTML template content as Javascript code, adding it to `frappe.templates`"""
-	return """frappe.templates["{key}"] = '{content}';\n""".format(
-		key=path.rsplit("/", 1)[-1][:-5], content=scrub_html_template(content))
-
-
 def scrub_html_template(content):
 	"""Returns HTML content with removed whitespace and comments"""
 	# remove whitespace to a single space
@@ -496,37 +407,7 @@ def scrub_html_template(content):
 	return content.replace("'", "\'")
 
 
-def files_dirty():
-	for target, sources in get_build_maps().items():
-		for f in sources:
-			if ":" in f:
-				f, suffix = f.split(":")
-			if not os.path.exists(f) or os.path.isdir(f):
-				continue
-			if os.path.getmtime(f) != timestamps.get(f):
-				print(f + " dirty")
-				return True
-	else:
-		return False
-
-
-def compile_less():
-	if not find_executable("lessc"):
-		return
-
-	for path in app_paths:
-		less_path = os.path.join(path, "public", "less")
-		if os.path.exists(less_path):
-			for fname in os.listdir(less_path):
-				if fname.endswith(".less") and fname != "variables.less":
-					fpath = os.path.join(less_path, fname)
-					mtime = os.path.getmtime(fpath)
-					if fpath in timestamps and mtime == timestamps[fpath]:
-						continue
-
-					timestamps[fpath] = mtime
-
-					print("compiling {0}".format(fpath))
-
-					css_path = os.path.join(path, "public", "css", fname.rsplit(".", 1)[0] + ".css")
-					os.system("lessc {0} > {1}".format(fpath, css_path))
+def html_to_js_template(path, content):
+	"""returns HTML template content as Javascript code, adding it to `frappe.templates`"""
+	return """frappe.templates["{key}"] = '{content}';\n""".format(
+		key=path.rsplit("/", 1)[-1][:-5], content=scrub_html_template(content))

frappe/commands/site.py

@@ -447,21 +447,17 @@ def disable_user(context, email):
 @pass_context
 def migrate(context, skip_failing=False, skip_search_index=False):
 	"Run patches, sync schema and rebuild files/translations"
-	from frappe.migrate import migrate
+	from frappe.migrate import SiteMigration
 
 	for site in context.sites:
 		click.secho(f"Migrating {site}", fg="green")
-		frappe.init(site=site)
-		frappe.connect()
 		try:
-			migrate(
-				context.verbose,
+			SiteMigration(
 				skip_failing=skip_failing,
-				skip_search_index=skip_search_index
-			)
+				skip_search_index=skip_search_index,
+			).run(site=site)
 		finally:
 			print()
-			frappe.destroy()
 	if not context.sites:
 		raise SiteNotSpecifiedError
 

frappe/commands/utils.py

@@ -742,8 +742,9 @@ def run_ui_tests(context, app, headless=False, parallel=True, with_coverage=Fals
 @click.option('--profile', is_flag=True, default=False)
 @click.option('--noreload', "no_reload", is_flag=True, default=False)
 @click.option('--nothreading', "no_threading", is_flag=True, default=False)
+@click.option('--with-coverage', is_flag=True, default=False)
 @pass_context
-def serve(context, port=None, profile=False, no_reload=False, no_threading=False, sites_path='.', site=None):
+def serve(context, port=None, profile=False, no_reload=False, no_threading=False, sites_path='.', site=None, with_coverage=False):
 	"Start development web server"
 	import frappe.app
 
@@ -751,8 +752,12 @@ def serve(context, port=None, profile=False, no_reload=False, no_threading=False
 		site = None
 	else:
 		site = context.sites[0]
-
-	frappe.app.serve(port=port, profile=profile, no_reload=no_reload, no_threading=no_threading, site=site, sites_path='.')
+	with CodeCoverage(with_coverage, 'frappe'):
+		if with_coverage:
+			# unable to track coverage with threading enabled
+			no_threading = True
+			no_reload = True
+		frappe.app.serve(port=port, profile=profile, no_reload=no_reload, no_threading=no_threading, site=site, sites_path='.')
 
 
 @click.command('request')

frappe/core/doctype/file/file.py

@@ -745,7 +745,7 @@ def delete_file(path):
 	"""Delete file from `public folder`"""
 	if path:
 		if ".." in path.split("/"):
-			frappe.msgprint(_("It is risky to delete this file: {0}. Please contact your System Manager.").format(path))
+			frappe.throw(_("It is risky to delete this file: {0}. Please contact your System Manager.").format(path))
 
 		parts = os.path.split(path.strip("/"))
 		if parts[0]=="files":

frappe/core/doctype/report/test_report.py

@@ -3,7 +3,7 @@
 
 import frappe, json, os
 import unittest
-from frappe.desk.query_report import run, save_report
+from frappe.desk.query_report import run, save_report, add_total_row
 from frappe.desk.reportview import delete_report, save_report as _save_report
 from frappe.custom.doctype.customize_form.customize_form import reset_customization
 from frappe.core.doctype.user_permission.test_user_permission import create_user
@@ -282,3 +282,55 @@ result = [
 
 		# Set user back to administrator
 		frappe.set_user('Administrator')
+
+	def test_add_total_row_for_tree_reports(self):
+		report_settings = {
+			'tree': True,
+			'parent_field': 'parent_value'
+		}
+
+		columns = [
+			{
+				"fieldname": "parent_column",
+				"label": "Parent Column",
+				"fieldtype": "Data",
+				"width": 10
+			},
+			{
+				"fieldname": "column_1",
+				"label": "Column 1",
+				"fieldtype": "Float",
+				"width": 10
+			},
+			{
+				"fieldname": "column_2",
+				"label": "Column 2",
+				"fieldtype": "Float",
+				"width": 10
+			}
+		]
+
+		result = [
+			{
+				"parent_column": "Parent 1",
+				"column_1": 200,
+				"column_2": 150.50 
+			},
+			{
+				"parent_column": "Child 1",
+				"column_1": 100,
+				"column_2": 75.25,
+				"parent_value": "Parent 1" 
+			},
+			{
+				"parent_column": "Child 2",
+				"column_1": 100,
+				"column_2": 75.25,
+				"parent_value": "Parent 1" 
+			}
+		]
+
+		result = add_total_row(result, columns, meta=None, report_settings=report_settings)
+		self.assertEqual(result[-1][0], "Total")
+		self.assertEqual(result[-1][1], 200)
+		self.assertEqual(result[-1][2], 150.50)

frappe/core/page/permission_manager/permission_manager.js

@@ -347,6 +347,7 @@ frappe.PermissionEngine = class PermissionEngine {
 	}
 
 	add_check_events() {
+		let me = this;
 		this.body.on("click", ".show-user-permissions", () => {
 			frappe.route_options = { allow: this.get_doctype() || "" };
 			frappe.set_route('List', 'User Permission');
@@ -373,7 +374,7 @@ frappe.PermissionEngine = class PermissionEngine {
 						// exception: reverse
 						chk.prop("checked", !chk.prop("checked"));
 					} else {
-						this.get_perm(args.role)[args.ptype] = args.value;
+						me.get_perm(args.role)[args.ptype] = args.value;
 					}
 				}
 			});

frappe/coverage.py

@@ -29,6 +29,7 @@ FRAPPE_EXCLUSIONS = [
 	"*/commands/*",
 	"*/frappe/change_log/*",
 	"*/frappe/exceptions*",
+	"*/frappe/coverage.py",
 	"*frappe/setup.py",
 	"*/doctype/*/*_dashboard.py",
 	"*/patches/*",

frappe/desk/query_report.py

@@ -73,7 +73,7 @@ def get_report_result(report, filters):
 	return res
 
 @frappe.read_only()
-def generate_report_result(report, filters=None, user=None, custom_columns=None):
+def generate_report_result(report, filters=None, user=None, custom_columns=None, report_settings=None):
 	user = user or frappe.session.user
 	filters = filters or []
 
@@ -108,7 +108,7 @@ def generate_report_result(report, filters=None, user=None, custom_columns=None)
 		result = get_filtered_data(report.ref_doctype, columns, result, user)
 
 	if cint(report.add_total_row) and result and not skip_total_row:
-		result = add_total_row(result, columns)
+		result = add_total_row(result, columns, report_settings=report_settings)
 
 	return {
 		"result": result,
@@ -210,7 +210,7 @@ def get_script(report_name):
 
 @frappe.whitelist()
 @frappe.read_only()
-def run(report_name, filters=None, user=None, ignore_prepared_report=False, custom_columns=None):
+def run(report_name, filters=None, user=None, ignore_prepared_report=False, custom_columns=None, report_settings=None):
 	report = get_report_doc(report_name)
 	if not user:
 		user = frappe.session.user
@@ -238,7 +238,7 @@ def run(report_name, filters=None, user=None, ignore_prepared_report=False, cust
 			dn = ""
 		result = get_prepared_report_result(report, filters, dn, user)
 	else:
-		result = generate_report_result(report, filters, user, custom_columns)
+		result = generate_report_result(report, filters, user, custom_columns, report_settings)
 
 	result["add_total_row"] = report.add_total_row and not result.get(
 		"skip_total_row", False
@@ -435,9 +435,19 @@ def build_xlsx_data(columns, data, visible_idx, include_indentation, ignore_visi
 	return result, column_widths
 
 
-def add_total_row(result, columns, meta=None):
+def add_total_row(result, columns, meta=None, report_settings=None):
 	total_row = [""] * len(columns)
 	has_percent = []
+	is_tree = False
+	parent_field = ''
+
+	if report_settings:
+		if isinstance(report_settings, (str,)):
+			report_settings = json.loads(report_settings)
+
+		is_tree = report_settings.get('tree')
+		parent_field = report_settings.get('parent_field')
+
 	for i, col in enumerate(columns):
 		fieldtype, options, fieldname = None, None, None
 		if isinstance(col, str):
@@ -464,12 +474,12 @@ def add_total_row(result, columns, meta=None):
 		for row in result:
 			if i >= len(row):
 				continue
-
 			cell = row.get(fieldname) if isinstance(row, dict) else row[i]
 			if fieldtype in ["Currency", "Int", "Float", "Percent", "Duration"] and flt(
 				cell
 			):
-				total_row[i] = flt(total_row[i]) + flt(cell)
+				if not (is_tree and row.get(parent_field)):
+					total_row[i] = flt(total_row[i]) + flt(cell)
 
 			if fieldtype == "Percent" and i not in has_percent:
 				has_percent.append(i)

frappe/installer.py

@@ -529,10 +529,9 @@ def extract_sql_gzip(sql_gz_path):
 	import subprocess
 
 	try:
-		# dvf - decompress, verbose, force
 		original_file = sql_gz_path
 		decompressed_file = original_file.rstrip(".gz")
-		cmd = 'gzip -dvf < {0} > {1}'.format(original_file, decompressed_file)
+		cmd = 'gzip --decompress --force < {0} > {1}'.format(original_file, decompressed_file)
 		subprocess.check_call(cmd, shell=True)
 	except Exception:
 		raise

frappe/integrations/doctype/ldap_settings/ldap_settings.py

@@ -45,8 +45,8 @@ class LDAPSettings(Document):
 						title=_("Misconfigured"))
 
 				if self.ldap_directory_server.lower() == 'custom':
-					if not self.ldap_group_member_attribute or not self.ldap_group_mappings_section:
-						frappe.throw(_("Custom LDAP Directoy Selected, please ensure 'LDAP Group Member attribute' and 'LDAP Group Mappings' are entered"),
+					if not self.ldap_group_member_attribute or not self.ldap_group_objectclass:
+						frappe.throw(_("Custom LDAP Directoy Selected, please ensure 'LDAP Group Member attribute' and 'Group Object Class' are entered"),
 						title=_("Misconfigured"))
 
 			else:

frappe/migrate.py

@@ -1,30 +1,54 @@
-# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
+# Copyright (c) 2022, Frappe Technologies Pvt. Ltd. and Contributors
 # License: MIT. See LICENSE
 
 import json
 import os
-import sys
+from textwrap import dedent
+
 import frappe
-import frappe.translate
-import frappe.modules.patch_handler
 import frappe.model.sync
-from frappe.utils.fixtures import sync_fixtures
-from frappe.utils.connections import check_connection
-from frappe.utils.dashboard import sync_dashboards
+import frappe.modules.patch_handler
+import frappe.translate
 from frappe.cache_manager import clear_global_cache
-from frappe.desk.notifications import clear_notifications
-from frappe.website.utils import clear_website_cache
 from frappe.core.doctype.language.language import sync_languages
-from frappe.modules.utils import sync_customizations
 from frappe.core.doctype.scheduled_job_type.scheduled_job_type import sync_jobs
-from frappe.search.website_search import build_index_for_all_routes
 from frappe.database.schema import add_column
+from frappe.desk.notifications import clear_notifications
 from frappe.modules.patch_handler import PatchType
+from frappe.modules.utils import sync_customizations
+from frappe.search.website_search import build_index_for_all_routes
+from frappe.utils.connections import check_connection
+from frappe.utils.dashboard import sync_dashboards
+from frappe.utils.fixtures import sync_fixtures
+from frappe.website.utils import clear_website_cache
+
+BENCH_START_MESSAGE = dedent(
+	"""
+	Cannot run bench migrate without the services running.
+	If you are running bench in development mode, make sure that bench is running:
+
+	$ bench start
 
+	Otherwise, check the server logs and ensure that all the required services are running.
+	"""
+)
 
 
-def migrate(verbose=True, skip_failing=False, skip_search_index=False):
-	'''Migrate all apps to the current version, will:
+def atomic(method):
+	def wrapper(*args, **kwargs):
+		try:
+			ret = method(*args, **kwargs)
+			frappe.db.commit()
+			return ret
+		except Exception:
+			frappe.db.rollback()
+			raise
+
+	return wrapper
+
+
+class SiteMigration:
+	"""Migrate all apps to the current version, will:
 	- run before migrate hooks
 	- run patches
 	- sync doctypes (schema)
@@ -35,70 +59,117 @@ def migrate(verbose=True, skip_failing=False, skip_search_index=False):
 	- sync languages
 	- sync web pages (from /www)
 	- run after migrate hooks
-	'''
-
-	service_status = check_connection(redis_services=["redis_cache"])
-	if False in service_status.values():
-		for service in service_status:
-			if not service_status.get(service, True):
-				print("{} service is not running.".format(service))
-		print("""Cannot run bench migrate without the services running.
-If you are running bench in development mode, make sure that bench is running:
+	"""
 
-$ bench start
+	def __init__(self, skip_failing: bool = False, skip_search_index: bool = False) -> None:
+		self.skip_failing = skip_failing
+		self.skip_search_index = skip_search_index
 
-Otherwise, check the server logs and ensure that all the required services are running.""")
-		sys.exit(1)
+	def setUp(self):
+		"""Complete setup required for site migration
+		"""
+		frappe.flags.touched_tables = set()
+		self.touched_tables_file = frappe.get_site_path("touched_tables.json")
+		add_column(doctype="DocType", column_name="migration_hash", fieldtype="Data")
+		clear_global_cache()
 
-	touched_tables_file = frappe.get_site_path('touched_tables.json')
-	if os.path.exists(touched_tables_file):
-		os.remove(touched_tables_file)
+		if os.path.exists(self.touched_tables_file):
+			os.remove(self.touched_tables_file)
 
-	try:
-		add_column(doctype="DocType", column_name="migration_hash", fieldtype="Data")
-		frappe.flags.touched_tables = set()
 		frappe.flags.in_migrate = True
 
-		clear_global_cache()
+	def tearDown(self):
+		"""Run operations that should be run post schema updation processes
+		This should be executed irrespective of outcome
+		"""
+		frappe.translate.clear_cache()
+		clear_website_cache()
+		clear_notifications()
+
+		with open(self.touched_tables_file, "w") as f:
+			json.dump(list(frappe.flags.touched_tables), f, sort_keys=True, indent=4)
+
+		if not self.skip_search_index:
+			print(f"Building search index for {frappe.local.site}")
+			build_index_for_all_routes()
+
+		frappe.publish_realtime("version-update")
+		frappe.flags.touched_tables.clear()
+		frappe.flags.in_migrate = False
 
+	@atomic
+	def pre_schema_updates(self):
+		"""Executes `before_migrate` hooks
+		"""
 		for app in frappe.get_installed_apps():
-			for fn in frappe.get_hooks('before_migrate', app_name=app):
+			for fn in frappe.get_hooks("before_migrate", app_name=app):
 				frappe.get_attr(fn)()
 
-		frappe.modules.patch_handler.run_all(skip_failing=skip_failing, patch_type=PatchType.pre_model_sync)
+	@atomic
+	def run_schema_updates(self):
+		"""Run patches as defined in patches.txt, sync schema changes as defined in the {doctype}.json files
+		"""
+		frappe.modules.patch_handler.run_all(skip_failing=self.skip_failing, patch_type=PatchType.pre_model_sync)
 		frappe.model.sync.sync_all()
-		frappe.modules.patch_handler.run_all(skip_failing=skip_failing, patch_type=PatchType.post_model_sync)
-		frappe.translate.clear_cache()
+		frappe.modules.patch_handler.run_all(skip_failing=self.skip_failing, patch_type=PatchType.post_model_sync)
+
+	@atomic
+	def post_schema_updates(self):
+		"""Execute pending migration tasks post patches execution & schema sync
+		This includes:
+		* Sync `Scheduled Job Type` and scheduler events defined in hooks
+		* Sync fixtures & custom scripts
+		* Sync in-Desk Module Dashboards
+		* Sync customizations: Custom Fields, Property Setters, Custom Permissions
+		* Sync Frappe's internal language master
+		* Sync Portal Menu Items
+		* Sync Installed Applications Version History
+		* Execute `after_migrate` hooks
+		"""
 		sync_jobs()
 		sync_fixtures()
 		sync_dashboards()
 		sync_customizations()
 		sync_languages()
 
-		frappe.get_doc('Portal Settings', 'Portal Settings').sync_menu()
-
-		# syncs static files
-		clear_website_cache()
-
-		# updating installed applications data
-		frappe.get_single('Installed Applications').update_versions()
+		frappe.get_single("Portal Settings").sync_menu()
+		frappe.get_single("Installed Applications").update_versions()
 
 		for app in frappe.get_installed_apps():
-			for fn in frappe.get_hooks('after_migrate', app_name=app):
+			for fn in frappe.get_hooks("after_migrate", app_name=app):
 				frappe.get_attr(fn)()
 
-		if not skip_search_index:
-			# Run this last as it updates the current session
-			print('Building search index for {}'.format(frappe.local.site))
-			build_index_for_all_routes()
-
-		frappe.db.commit()
-
-		clear_notifications()
-
-		frappe.publish_realtime("version-update")
-		frappe.flags.in_migrate = False
-	finally:
-		with open(touched_tables_file, 'w') as f:
-			json.dump(list(frappe.flags.touched_tables), f, sort_keys=True, indent=4)
-		frappe.flags.touched_tables.clear()
+	def required_services_running(self) -> bool:
+		"""Returns True if all required services are running. Returns False and prints
+		instructions to stdout when required services are not available.
+		"""
+		service_status = check_connection(redis_services=["redis_cache"])
+		are_services_running = all(service_status.values())
+
+		if not are_services_running:
+			for service in service_status:
+				if not service_status.get(service, True):
+					print(f"Service {service} is not running.")
+			print(BENCH_START_MESSAGE)
+
+		return are_services_running
+
+	def run(self, site: str):
+		"""Run Migrate operation on site specified. This method initializes
+		and destroys connections to the site database.
+		"""
+		if not self.required_services_running():
+			raise SystemExit(1)
+
+		if site:
+			frappe.init(site=site)
+			frappe.connect()
+
+		self.setUp()
+		try:
+			self.pre_schema_updates()
+			self.run_schema_updates()
+		finally:
+			self.post_schema_updates()
+			self.tearDown()
+			frappe.destroy()

frappe/model/base_document.py

@@ -33,13 +33,12 @@ def get_controller(doctype):
 
 		module_name, custom = frappe.db.get_value(
 			"DocType", doctype, ("module", "custom"), cache=True
-		) or ["Core", False]
+		) or ("Core", False)
 
 		if custom:
-			if frappe.db.field_exists("DocType", "is_tree"):
-				is_tree = frappe.db.get_value("DocType", doctype, "is_tree", cache=True)
-			else:
-				is_tree = False
+			is_tree = frappe.db.get_value(
+				"DocType", doctype, "is_tree", ignore=True, cache=True
+			)
 			_class = NestedSet if is_tree else Document
 		else:
 			class_overrides = frappe.get_hooks('override_doctype_class')
@@ -106,13 +105,9 @@ class BaseDocument(object):
 			})
 		"""
 
-		# QUESTION: why do we need the 1st for loop?
-		# we're essentially setting the values in d, in the 2nd for loop (?)
-
-		# first set default field values of base document
-		for key in default_fields:
-			if key in d:
-				self.set(key, d[key])
+		# set name first, as it is used a reference in child document
+		if "name" in d:
+			self.name = d["name"]
 
 		for key, value in d.items():
 			self.set(key, value)
@@ -196,6 +191,7 @@ class BaseDocument(object):
 		if isinstance(value, (dict, BaseDocument)):
 			if not self.__dict__.get(key):
 				self.__dict__[key] = []
+
 			value = self._init_child(value, key)
 			self.__dict__[key].append(value)
 
@@ -232,11 +228,11 @@ class BaseDocument(object):
 	def _init_child(self, value, key):
 		if not self.doctype:
 			return value
+
 		if not isinstance(value, BaseDocument):
-			if "doctype" not in value or value['doctype'] is None:
-				value["doctype"] = self.get_table_field_doctype(key)
-				if not value["doctype"]:
-					raise AttributeError(key)
+			value["doctype"] = self.get_table_field_doctype(key)
+			if not value["doctype"]:
+				raise AttributeError(key)
 
 			value = get_controller(value["doctype"])(value)
 			value.init_valid_columns()

frappe/model/meta.py

@@ -14,16 +14,28 @@ Example:
 
 
 '''
+import json
+import os
 from datetime import datetime
+
 import click
-import frappe, json, os
-from frappe.utils import cstr, cint, cast
-from frappe.model import default_fields, no_value_fields, optional_fields, data_fieldtypes, table_fields, child_table_fields
-from frappe.model.document import Document
+
+import frappe
+from frappe import _
+from frappe.model import (
+	child_table_fields,
+	data_fieldtypes,
+	default_fields,
+	no_value_fields,
+	optional_fields,
+	table_fields,
+)
 from frappe.model.base_document import BaseDocument
-from frappe.modules import load_doctype_module
+from frappe.model.document import Document
 from frappe.model.workflow import get_workflow_name
-from frappe import _
+from frappe.modules import load_doctype_module
+from frappe.utils import cast, cint, cstr
+
 
 def get_meta(doctype, cached=True):
 	if cached:
@@ -553,7 +565,7 @@ class Meta(Document):
 				# For internal links parent doctype will be the key
 				doctype = link.parent_doctype or link.link_doctype
 				# group found
-				if link.group and group.label == link.group:
+				if link.group and _(group.label) == _(link.group):
 					if doctype not in group.get('items'):
 						group.get('items').append(doctype)
 					link.added = True

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

@@ -334,7 +334,7 @@ frappe.ui.form.Form = class FrappeForm {
 			this.doc = frappe.get_doc(this.doctype, this.docname);
 
 			// check permissions
-			if(!this.has_read_permission()) {
+			if (!this.has_read_permission()) {
 				frappe.show_not_permitted(__(this.doctype) + " " + __(this.docname));
 				return;
 			}
@@ -1363,6 +1363,7 @@ frappe.ui.form.Form = class FrappeForm {
 
 	set_df_property(fieldname, property, value, docname, table_field, table_row_name=null) {
 		let df;
+
 		if (!docname || !table_field) {
 			df = this.get_docfield(fieldname);
 		} else {
@@ -1372,8 +1373,10 @@ frappe.ui.form.Form = class FrappeForm {
 				df = frappe.meta.get_docfield(filtered_fields[0].parent, table_field, table_row_name);
 			}
 		}
+
 		if (df && df[property] != value) {
 			df[property] = value;
+
 			if (table_field && table_row_name) {
 				if (this.fields_dict[fieldname].grid.grid_rows_by_docname[table_row_name]) {
 					this.fields_dict[fieldname].grid.grid_rows_by_docname[table_row_name].refresh_field(fieldname);
@@ -1508,7 +1511,9 @@ frappe.ui.form.Form = class FrappeForm {
 						// update child doc
 						opts.child = locals[opts.child.doctype][opts.child.name];
 
-						var std_field_list = ["doctype"].concat(frappe.model.std_fields_list);
+						var std_field_list = ["doctype"]
+							.concat(frappe.model.std_fields_list)
+							.concat(frappe.model.child_table_field_list);
 						for (var key in r.message) {
 							if (std_field_list.indexOf(key)===-1) {
 								opts.child[key] = r.message[key];
@@ -1659,23 +1664,17 @@ frappe.ui.form.Form = class FrappeForm {
 		// make new doctype from the current form
 		// will handover to `make_methods` if defined
 		// or will create and match link fields
-		var me = this;
+		let me = this;
 		if(this.make_methods && this.make_methods[doctype]) {
 			return this.make_methods[doctype](this);
 		} else if(this.custom_make_buttons && this.custom_make_buttons[doctype]) {
 			this.custom_buttons[__(this.custom_make_buttons[doctype])].trigger('click');
 		} else {
 			frappe.model.with_doctype(doctype, function() {
-				var new_doc = frappe.model.get_new_doc(doctype);
+				let new_doc = frappe.model.get_new_doc(doctype, null, null, true);
 
 				// set link fields (if found)
-				frappe.get_meta(doctype).fields.forEach(function(df) {
-					if(df.fieldtype==='Link' && df.options===me.doctype) {
-						new_doc[df.fieldname] = me.doc.name;
-					} else if (['Link', 'Dynamic Link'].includes(df.fieldtype) && me.doc[df.fieldname]) {
-						new_doc[df.fieldname] = me.doc[df.fieldname];
-					}
-				});
+				me.set_link_field(doctype, new_doc);
 
 				frappe.ui.form.make_quick_entry(doctype, null, null, new_doc);
 				// frappe.set_route('Form', doctype, new_doc.name);
@@ -1683,6 +1682,20 @@ frappe.ui.form.Form = class FrappeForm {
 		}
 	}
 
+	set_link_field(doctype, new_doc) {
+		let me = this;
+		frappe.get_meta(doctype).fields.forEach(function(df) {
+			if (df.fieldtype === 'Link' && df.options === me.doctype) {
+				new_doc[df.fieldname] = me.doc.name;
+			} else if (['Link', 'Dynamic Link'].includes(df.fieldtype) && me.doc[df.fieldname]) {
+				new_doc[df.fieldname] = me.doc[df.fieldname];
+			} else if (df.fieldtype === 'Table' && df.options && df.reqd) {
+				let row = new_doc[df.fieldname][0];
+				me.set_link_field(df.options, row);
+			}
+		});
+	}
+
 	update_in_all_rows(table_fieldname, fieldname, value) {
 		// update the child value in all tables where it is missing
 		if(!value) return;

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

@@ -502,10 +502,9 @@ export default class Grid {
 
 	set_column_disp(fieldname, show) {
 		if ($.isArray(fieldname)) {
-			for (var i = 0, l = fieldname.length; i < l; i++) {
-				var fname = fieldname[i];
-				this.get_docfield(fname).hidden = show ? 0 : 1;
-				this.set_editable_grid_column_disp(fname, show);
+			for (let field of fieldname) {
+				this.update_docfield_property(field, "hidden", show);
+				this.set_editable_grid_column_disp(field, show);
 			}
 		} else {
 			this.get_docfield(fieldname).hidden = show ? 0 : 1;
@@ -555,17 +554,17 @@ export default class Grid {
 	}
 
 	toggle_reqd(fieldname, reqd) {
-		this.get_docfield(fieldname).reqd = reqd;
+		this.update_docfield_property(fieldname, "reqd", reqd);
 		this.debounced_refresh();
 	}
 
 	toggle_enable(fieldname, enable) {
-		this.get_docfield(fieldname).read_only = enable ? 0 : 1;
+		this.update_docfield_property(fieldname, "read_only", enable ? 0 : 1);
 		this.debounced_refresh();
 	}
 
 	toggle_display(fieldname, show) {
-		this.get_docfield(fieldname).hidden = show ? 0 : 1;
+		this.update_docfield_property(fieldname, "hidden", show ? 0 : 1);
 		this.debounced_refresh();
 	}
 
@@ -747,7 +746,7 @@ export default class Grid {
 				var df = this.visible_columns[i][0];
 				var colsize = this.visible_columns[i][1];
 				if (colsize > 1 && colsize < 11
-					&& !in_list(frappe.model.std_fields_list, df.fieldname)) {
+					&& frappe.model.is_non_std_field(df.fieldname)) {
 
 					if (passes < 3 && ["Int", "Currency", "Float", "Check", "Percent"].indexOf(df.fieldtype) !== -1) {
 						// don't increase col size of these fields in first 3 passes

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

@@ -5,11 +5,7 @@ export default class GridRow {
 		this.on_grid_fields_dict = {};
 		this.on_grid_fields = [];
 		$.extend(this, opts);
-		if (this.doc && this.parent_df.options) {
-			frappe.meta.make_docfield_copy_for(this.parent_df.options, this.doc.name, this.docfields);
-			const docfields = frappe.meta.get_docfields(this.parent_df.options, this.doc.name);
-			this.docfields = docfields.length ? docfields : opts.docfields;
-		}
+		this.set_docfields();
 		this.columns = {};
 		this.columns_list = [];
 		this.row_check_html = '<input type="checkbox" class="grid-row-check pull-left">';
@@ -41,6 +37,22 @@ export default class GridRow {
 			this.set_data();
 		}
 	}
+
+	set_docfields(update=false) {
+		if (this.doc && this.parent_df.options) {
+			frappe.meta.make_docfield_copy_for(this.parent_df.options, this.doc.name, this.docfields);
+			const docfields = frappe.meta.get_docfields(this.parent_df.options, this.doc.name);
+			if (update) {
+				// to maintain references
+				this.docfields.forEach(df => {
+					Object.assign(df, docfields.find(d => d.fieldname === df.fieldname));
+				});
+			} else {
+				this.docfields = docfields;
+			}
+		}
+	}
+
 	set_data() {
 		this.wrapper.data({
 			"doc": this.doc
@@ -148,6 +160,11 @@ export default class GridRow {
 		}, __('Move To'), 'Update');
 	}
 	refresh() {
+		// update docfields for new record
+		if (this.frm && this.doc && this.doc.__islocal) {
+			this.set_docfields(true);
+		}
+
 		if(this.frm && this.doc) {
 			this.doc = locals[this.doc.doctype][this.doc.name];
 		}

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

@@ -547,24 +547,28 @@ frappe.ui.form.Layout = class Layout {
 	}
 
 	refresh_dependency() {
-		// Resolve "depends_on" and show / hide accordingly
+		/**
+			Resolve "depends_on" and show / hide accordingly
+			build dependants' dictionary
+		*/
 
-		// build dependants' dictionary
 		let has_dep = false;
 
-		for (let fkey in this.fields_list) {
-			let f = this.fields_list[fkey];
-			f.dependencies_clear = true;
+		const fields = this.fields_list.concat(this.tabs);
+
+		for (let fkey in fields) {
+			let f = fields[fkey];
 			if (f.df.depends_on || f.df.mandatory_depends_on || f.df.read_only_depends_on) {
 				has_dep = true;
+				break;
 			}
 		}
 
 		if (!has_dep) return;
 
 		// show / hide based on values
-		for (let i = this.fields_list.length - 1; i >= 0; i--) {
-			let f = this.fields_list[i];
+		for (let i = fields.length - 1; i >= 0; i--) {
+			let f = fields[i];
 			f.guardian_has_value = true;
 			if (f.df.depends_on) {
 				// evaluate guardian

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

@@ -1,6 +1,6 @@
 frappe.ui.form.MultiSelectDialog = class MultiSelectDialog {
 	constructor(opts) {
-		/* Options: doctype, target, setters, get_query, action, add_filters_group, data_fields, primary_action_label */
+		/* Options: doctype, target, setters, get_query, action, add_filters_group, data_fields, primary_action_label, columns */
 		Object.assign(this, opts);
 		this.for_select = this.doctype == "[Select]";
 		if (!this.for_select) {
@@ -400,23 +400,22 @@ frappe.ui.form.MultiSelectDialog = class MultiSelectDialog {
 		return this.results.filter(res => checked_values.includes(res.name));
 	}
 
+	get_datatable_columns() {
+		if (this.get_query && this.get_query().query && this.columns) return this.columns;
+
+		if (Array.isArray(this.setters))
+			return ["name", ...this.setters.map(df => df.fieldname)];
+
+		return ["name", ...Object.keys(this.setters)];
+	}
+
 	make_list_row(result = {}) {
 		var me = this;
 		// Make a head row by default (if result not passed)
 		let head = Object.keys(result).length === 0;
 
 		let contents = ``;
-		let columns = ["name"];
-
-		if ($.isArray(this.setters)) {
-			for (let df of this.setters) {
-				columns.push(df.fieldname);
-			}
-		} else {
-			columns = columns.concat(Object.keys(this.setters));
-		}
-
-		columns.forEach(function (column) {
+		this.get_datatable_columns().forEach(function (column) {
 			contents += `<div class="list-item__content ellipsis">
 				${
 	head ? `<span class="ellipsis text-muted" title="${__(frappe.model.unscrub(column))}">${__(frappe.model.unscrub(column))}</span>`
@@ -486,7 +485,7 @@ frappe.ui.form.MultiSelectDialog = class MultiSelectDialog {
 
 	get_filters_from_setters() {
 		let me = this;
-		let filters = this.get_query ? this.get_query().filters : {} || {};
+		let filters = (this.get_query ? this.get_query().filters : {}) || {};
 		let filter_fields = [];
 
 		if ($.isArray(this.setters)) {

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

@@ -40,7 +40,7 @@ export default class Tab {
 			hide = true;
 		}
 
-		hide && this.toggle(false);
+		this.toggle(!hide);
 	}
 
 	toggle(show) {

frappe/public/js/frappe/list/base_list.js

@@ -391,9 +391,10 @@ frappe.views.BaseList = class BaseList {
 				$this.addClass("btn-info");
 
 				this.start = 0;
-				this.page_length = $this.data().value;
+				this.page_length = this.selected_page_count = $this.data().value;
 			} else if ($this.is(".btn-more")) {
 				this.start = this.start + this.page_length;
+				this.page_length = this.selected_page_count || 20;
 			}
 			this.refresh();
 		});
@@ -474,6 +475,7 @@ frappe.views.BaseList = class BaseList {
 			this.render();
 			this.after_render();
 			this.freeze(false);
+			this.reset_defaults();
 			if (this.settings.refresh) {
 				this.settings.refresh(this);
 			}
@@ -500,6 +502,11 @@ frappe.views.BaseList = class BaseList {
 		this.data = this.data.uniqBy((d) => d.name);
 	}
 
+	reset_defaults() {
+		this.page_length = this.page_length + this.start;
+		this.start = 0;
+	}
+
 	freeze() {
 		// show a freeze message while data is loading
 	}

frappe/public/js/frappe/list/list_view.js

@@ -1483,7 +1483,7 @@ frappe.views.ListView = class ListView extends frappe.views.BaseList {
 				return [
 					filter[1],
 					"=",
-					JSON.stringify([filter[2], filter[3]]),
+					encodeURIComponent(JSON.stringify([filter[2], filter[3]])),
 				].join("");
 			})
 			.join("&");

frappe/public/js/frappe/model/meta.js

@@ -144,7 +144,7 @@ $.extend(frappe.meta, {
 
 	get_doctype_for_field: function(doctype, key) {
 		var out = null;
-		if(in_list(frappe.model.std_fields_list, key)) {
+		if (in_list(frappe.model.std_fields_list, key)) {
 			// standard
 			out = doctype;
 		} else if(frappe.meta.has_field(doctype, key)) {
@@ -152,7 +152,7 @@ $.extend(frappe.meta, {
 			out = doctype;
 		} else {
 			frappe.meta.get_table_fields(doctype).every(function(d) {
-				if(frappe.meta.has_field(d.options, key)) {
+				if (frappe.meta.has_field(d.options, key) || in_list(frappe.model.child_table_field_list, key)) {
 					out = d.options;
 					return false;
 				}

frappe/public/js/frappe/model/model.js

@@ -12,6 +12,8 @@ $.extend(frappe.model, {
 	std_fields_list: ['name', 'owner', 'creation', 'modified', 'modified_by',
 		'_user_tags', '_comments', '_assign', '_liked_by', 'docstatus', 'idx'],
 
+	child_table_field_list: ['parent', 'parenttype', 'parentfield'],
+
 	core_doctypes_list: ['DocType', 'DocField', 'DocPerm', 'User', 'Role', 'Has Role',
 		'Page', 'Module Def', 'Print Format', 'Report', 'Customize Form',
 		'Customize Form Field', 'Property Setter', 'Custom Field', 'Client Script'],
@@ -83,7 +85,7 @@ $.extend(frappe.model, {
 	},
 
 	is_non_std_field: function(fieldname) {
-		return !frappe.model.std_fields_list.includes(fieldname);
+		return ![...frappe.model.std_fields_list, ...frappe.model.child_table_field_list].includes(fieldname);
 	},
 
 	get_std_field: function(fieldname, ignore=false) {

frappe/public/js/frappe/ui/filters/filter_list.js

@@ -170,7 +170,7 @@ frappe.ui.FilterGroup = class {
 	validate_args(doctype, fieldname) {
 		if (doctype && fieldname
 			&& !frappe.meta.has_field(doctype, fieldname)
-			&& !frappe.model.std_fields_list.includes(fieldname)) {
+			&& frappe.model.is_non_std_field(fieldname)) {
 
 			frappe.msgprint({
 				message: __('Invalid filter: {0}', [fieldname.bold()]),

frappe/public/js/frappe/views/reports/query_report.js

@@ -578,6 +578,7 @@ frappe.views.QueryReport = class QueryReport extends frappe.views.BaseList {
 				args: {
 					report_name: this.report_name,
 					filters: filters,
+					report_settings: this.report_settings
 				},
 				callback: resolve,
 				always: () => this.page.btn_secondary.prop('disabled', false)
@@ -834,7 +835,7 @@ frappe.views.QueryReport = class QueryReport extends frappe.views.BaseList {
 		let data = this.data;
 		let columns = this.columns.filter((col) => !col.hidden);
 
-		if (this.raw_data.add_total_row) {
+		if (this.raw_data.add_total_row && !this.report_settings.tree) {
 			data = data.slice();
 			data.splice(-1, 1);
 		}
@@ -854,7 +855,7 @@ frappe.views.QueryReport = class QueryReport extends frappe.views.BaseList {
 				treeView: this.tree_report,
 				layout: 'fixed',
 				cellHeight: 33,
-				showTotalRow: this.raw_data.add_total_row,
+				showTotalRow: this.raw_data.add_total_row && !this.report_settings.tree,
 				direction: frappe.utils.is_rtl() ? 'rtl' : 'ltr',
 				hooks: {
 					columnTotal: frappe.utils.report_column_total

frappe/public/js/frappe/views/reports/report_view.js

@@ -651,7 +651,7 @@ frappe.views.ReportView = class ReportView extends frappe.views.ListView {
 			&& !df.is_virtual
 			&& !df.hidden
 			// not a standard field i.e., owner, modified_by, etc.
-			&& !frappe.model.std_fields_list.includes(df.fieldname))
+			&& frappe.model.is_non_std_field(df.fieldname))
 			return true;
 		return false;
 	}

frappe/templates/print_formats/standard.html

@@ -3,7 +3,7 @@
 {% for page in layout %}
 <div class="page-break">
 	<div {% if print_settings.repeat_header_footer %} id="header-html" class="hidden-pdf" {% endif %}>
-		{{ add_header(loop.index, layout|len, doc, letter_head, no_letterhead, footer, print_settings) }}
+		{{ add_header(loop.index, layout|len, doc, letter_head, no_letterhead, footer, print_settings, print_heading_template) }}
 	</div>
 
 	{% if print_settings.repeat_header_footer %}

frappe/templates/print_formats/standard_macros.html

@@ -186,12 +186,12 @@ data-fieldname="{{ df.fieldname }}" data-fieldtype="{{ df.fieldtype }}"
 	{%- endif -%}
 {% endmacro %}
 
-{%- macro add_header(page_num, max_pages, doc, letter_head, no_letterhead, footer, print_settings=None) -%}
+{%- macro add_header(page_num, max_pages, doc, letter_head, no_letterhead, footer, print_settings=None, print_heading_template=None) -%}
 	{% if letter_head and not no_letterhead %}
 		<div class="letter-head">{{ letter_head }}</div>
 	{% endif %}
-	{% if doc.print_heading_template %}
-		{{ frappe.render_template(doc.print_heading_template, {"doc":doc}) }}
+	{% if print_heading_template %}
+		{{ frappe.render_template(print_heading_template, {"doc":doc}) }}
 	{% else %}
 	<div class="print-heading">
 		<h2>

frappe/tests/test_commands.py

@@ -3,25 +3,37 @@
 
 # imports - standard imports
 import gzip
+import importlib
 import json
 import os
 import shlex
 import shutil
 import subprocess
-from typing import List
 import unittest
+from contextlib import contextmanager
+from functools import wraps
 from glob import glob
+from typing import List, Optional
 from unittest.case import skipIf
+from unittest.mock import patch
+
+# imports - third party imports
+import click
+from click.testing import CliRunner, Result
+from click import Command
 
 # imports - module imports
 import frappe
+import frappe.commands.site
+import frappe.commands.utils
 import frappe.recorder
 from frappe.installer import add_to_installed_apps, remove_app
 from frappe.utils import add_to_date, get_bench_path, get_bench_relative_path, now
 from frappe.utils.backups import fetch_latest_backups
 
-# imports - third party imports
-import click
+_result: Optional[Result] = None
+TEST_SITE = "commands-site-O4PN2QKA.test" # added random string tag to avoid collisions
+CLI_CONTEXT = frappe._dict(sites=[TEST_SITE])
 
 
 def clean(value) -> str:
@@ -76,7 +88,61 @@ def exists_in_backup(doctypes: List, file: os.PathLike) -> bool:
 	return len(missing_doctypes) == 0
 
 
+@contextmanager
+def maintain_locals():
+	pre_site = frappe.local.site
+	pre_flags = frappe.local.flags.copy()
+	pre_db = frappe.local.db
+
+	try:
+		yield
+	finally:
+		post_site = getattr(frappe.local, "site", None)
+		if not post_site or post_site != pre_site:
+			frappe.init(site=pre_site)
+			frappe.local.db = pre_db
+			frappe.local.flags.update(pre_flags)
+
+
+def pass_test_context(f):
+	@wraps(f)
+	def decorated_function(*args, **kwargs):
+		return f(CLI_CONTEXT, *args, **kwargs)
+	return decorated_function
+
+
+@contextmanager
+def cli(cmd: Command, args: Optional[List] = None):
+	with maintain_locals():
+		global _result
+
+		patch_ctx = patch("frappe.commands.pass_context", pass_test_context)
+		_module = cmd.callback.__module__
+		_cmd = cmd.callback.__qualname__
+
+		__module = importlib.import_module(_module)
+		patch_ctx.start()
+		importlib.reload(__module)
+		click_cmd = getattr(__module, _cmd)
+
+		try:
+			_result = CliRunner().invoke(click_cmd, args=args)
+			_result.command = str(cmd)
+			yield _result
+		finally:
+			patch_ctx.stop()
+			__module = importlib.import_module(_module)
+			importlib.reload(__module)
+			importlib.invalidate_caches()
+
+
 class BaseTestCommands(unittest.TestCase):
+	@classmethod
+	def setUpClass(cls) -> None:
+		cls.setup_test_site()
+		return super().setUpClass()
+
+	@classmethod
 	def execute(self, command, kwargs=None):
 		site = {"site": frappe.local.site}
 		cmd_input = None
@@ -102,16 +168,48 @@ class BaseTestCommands(unittest.TestCase):
 		self.stderr = clean(self._proc.stderr)
 		self.returncode = clean(self._proc.returncode)
 
+	@classmethod
+	def setup_test_site(cls):
+		cmd_config = {
+			"test_site": TEST_SITE,
+			"admin_password": frappe.conf.admin_password,
+			"root_login": frappe.conf.root_login,
+			"root_password": frappe.conf.root_password,
+			"db_type": frappe.conf.db_type,
+		}
+
+		if not os.path.exists(
+			os.path.join(TEST_SITE, "site_config.json")
+		):
+			cls.execute(
+				"bench new-site {test_site} --admin-password {admin_password} --db-type"
+				" {db_type}",
+				cmd_config,
+			)
+
 	def _formatMessage(self, msg, standardMsg):
 		output = super(BaseTestCommands, self)._formatMessage(msg, standardMsg)
+
+		if not hasattr(self, "command") and _result:
+			command = _result.command
+			stdout = _result.stdout_bytes.decode() if _result.stdout_bytes else None
+			stderr = _result.stderr_bytes.decode() if _result.stderr_bytes else None
+			returncode = _result.exit_code
+		else:
+			command = self.command
+			stdout = self.stdout
+			stderr = self.stderr
+			returncode = self.returncode
+
 		cmd_execution_summary = "\n".join([
 			"-" * 70,
 			"Last Command Execution Summary:",
-			"Command: {}".format(self.command) if self.command else "",
-			"Standard Output: {}".format(self.stdout) if self.stdout else "",
-			"Standard Error: {}".format(self.stderr) if self.stderr else "",
-			"Return Code: {}".format(self.returncode) if self.returncode else "",
+			"Command: {}".format(command) if command else "",
+			"Standard Output: {}".format(stdout) if stdout else "",
+			"Standard Error: {}".format(stderr) if stderr else "",
+			"Return Code: {}".format(returncode) if returncode else "",
 		]).strip()
+
 		return "{}\n\n{}".format(output, cmd_execution_summary)
 
 
@@ -135,6 +233,7 @@ class TestCommands(BaseTestCommands):
 		self.assertEqual(self.returncode, 0)
 		self.assertEqual(self.stdout[1:-1], frappe.bold(text="DocType"))
 
+	@unittest.skip
 	def test_restore(self):
 		# step 0: create a site to run the test on
 		global_config = {
@@ -143,35 +242,30 @@ class TestCommands(BaseTestCommands):
 			"root_password": frappe.conf.root_password,
 			"db_type": frappe.conf.db_type,
 		}
-		site_data = {"another_site": f"{frappe.local.site}-restore.test", **global_config}
+		site_data = {"test_site": TEST_SITE, **global_config}
 		for key, value in global_config.items():
 			if value:
 				self.execute(f"bench set-config {key} {value} -g")
-		self.execute(
-			"bench new-site {another_site} --admin-password {admin_password} --db-type"
-			" {db_type}",
-			site_data,
-		)
 
 		# test 1: bench restore from full backup
-		self.execute("bench --site {another_site} backup --ignore-backup-conf", site_data)
+		self.execute("bench --site {test_site} backup --ignore-backup-conf", site_data)
 		self.execute(
-			"bench --site {another_site} execute frappe.utils.backups.fetch_latest_backups",
+			"bench --site {test_site} execute frappe.utils.backups.fetch_latest_backups",
 			site_data,
 		)
 		site_data.update({"database": json.loads(self.stdout)["database"]})
-		self.execute("bench --site {another_site} restore {database}", site_data)
+		self.execute("bench --site {test_site} restore {database}", site_data)
 
 		# test 2: restore from partial backup
-		self.execute("bench --site {another_site} backup --exclude 'ToDo'", site_data)
+		self.execute("bench --site {test_site} backup --exclude 'ToDo'", site_data)
 		site_data.update({"kw": "\"{'partial':True}\""})
 		self.execute(
-			"bench --site {another_site} execute"
+			"bench --site {test_site} execute"
 			" frappe.utils.backups.fetch_latest_backups --kwargs {kw}",
 			site_data,
 		)
 		site_data.update({"database": json.loads(self.stdout)["database"]})
-		self.execute("bench --site {another_site} restore {database}", site_data)
+		self.execute("bench --site {test_site} restore {database}", site_data)
 		self.assertEqual(self.returncode, 1)
 
 	def test_partial_restore(self):
@@ -226,7 +320,8 @@ class TestCommands(BaseTestCommands):
 	def test_list_apps(self):
 		# test 1: sanity check for command
 		self.execute("bench --site all list-apps")
-		self.assertEqual(self.returncode, 0)
+		self.assertIsNotNone(self.returncode)
+		self.assertIsInstance(self.stdout or self.stderr, str)
 
 		# test 2: bare functionality for single site
 		self.execute("bench --site {site} list-apps")
@@ -242,14 +337,12 @@ class TestCommands(BaseTestCommands):
 		self.assertSetEqual(list_apps, installed_apps)
 
 		# test 3: parse json format
-		self.execute("bench --site all list-apps --format json")
-		self.assertEqual(self.returncode, 0)
-		self.assertIsInstance(json.loads(self.stdout), dict)
-
 		self.execute("bench --site {site} list-apps --format json")
+		self.assertEqual(self.returncode, 0)
 		self.assertIsInstance(json.loads(self.stdout), dict)
 
 		self.execute("bench --site {site} list-apps -f json")
+		self.assertEqual(self.returncode, 0)
 		self.assertIsInstance(json.loads(self.stdout), dict)
 
 	def test_show_config(self):
@@ -358,7 +451,7 @@ class TestCommands(BaseTestCommands):
 	)
 	def test_bench_drop_site_should_archive_site(self):
 		# TODO: Make this test postgres compatible
-		site = 'test_site.localhost'
+		site = TEST_SITE
 
 		self.execute(
 			f"bench new-site {site} --force --verbose "
@@ -585,3 +678,18 @@ class TestRemoveApp(unittest.TestCase):
 
 		# nothing to assert, if this fails rest of the test suite will crumble.
 		remove_app("frappe", dry_run=True, yes=True, no_backup=True)
+
+
+class TestSiteMigration(BaseTestCommands):
+	def test_migrate_cli(self):
+		with cli(frappe.commands.site.migrate) as result:
+			self.assertTrue(TEST_SITE in result.stdout)
+			self.assertEqual(result.exit_code, 0)
+			self.assertEqual(result.exception, None)
+
+
+class TestBenchBuild(BaseTestCommands):
+	def test_build_assets(self):
+		with cli(frappe.commands.utils.build) as result:
+			self.assertEqual(result.exit_code, 0)
+			self.assertEqual(result.exception, None)

frappe/tests/ui_test_helpers.py

@@ -255,3 +255,17 @@ def update_webform_to_multistep():
 		_doc.route = "update-profile-duplicate"
 		_doc.is_standard = False
 		_doc.save()
+
+@frappe.whitelist()
+def update_child_table(name):
+	doc = frappe.get_doc('DocType', name)
+	if len(doc.fields) == 1:
+		doc.append('fields', {
+			'fieldname': 'doctype_to_link',
+			'fieldtype': 'Link',
+			'in_list_view': 1,
+			'label': 'Doctype to Link',
+			'options': 'Doctype to Link'
+		})
+
+		doc.save()

frappe/translations/de.csv

@@ -736,6 +736,7 @@ Content Hash,Inhalts-Hash,
 Content web page.,Inhalt der Webseite.,
 Conversation Tones,Konversationstöne,
 Copyright,Copyright,
+Copy to Clipboard,In die Zwischenablage,
 Core,Kern,
 Core DocTypes cannot be customized.,Core DocTypes können nicht angepasst werden.,
 Could not connect to outgoing email server,Konnte keine Verbindung zum Postausgangsserver herstellen,
@@ -959,6 +960,7 @@ Edit {0},Bearbeiten {0},
 Editable Grid,Editierbares Raster,
 Editing Row,Zeile bearbeiten,
 Eg. smsgateway.com/api/send_sms.cgi,z. B. smsgateway.com/api/send_sms.cgi,
+Email,E-Mail,
 Email Account Name,E-Mail-Konten-Name,
 Email Account added multiple times,E-Mail-Konto wurde mehrmals hinzugefügt,
 Email Addresses,E-Mail-Adressen,
@@ -1224,8 +1226,8 @@ Headers,Headers,
 Heading,Überschrift,
 Hello {0},Hallo {0},
 Hello!,Hallo!,
-Help Articles,Artikel-Hilfe,
-Help Category,Kategorie-Hilfe,
+Help Articles,Hilfeartikel,
+Help Category,Hilfekategorie,
 Help on Search,Hilfe zur Suche,
 "Help: To link to another record in the system, use ""#Form/Note/[Note Name]"" as the Link URL. (don't use ""http://"")","Hilfe: Um eine Verknüpfung mit einem anderen Datensatz im System zu erstellen, bitte ""#Formular/Anmerkung/[Anmerkungsname]"" als Verknüpfungs-URL verwenden (kein ""http://""!).",
 Helvetica,Helvetica,
@@ -1453,6 +1455,7 @@ Last User,Letzter Benutzer,
 Last Week,Letzte Woche,
 Last Year,Vergangenes Jahr,
 Last synced {0},Zuletzt synchronisiert {0},
+Learn more,Mehr erfahren,
 Leave a Comment,Hinterlasse einen Kommentar,
 Leave blank to repeat always,"Freilassen, um immer zu wiederholen",
 Leave this conversation,Benachrichtigungen abbestellen,
@@ -1485,7 +1488,8 @@ Linked with {0},Verknüpft mit {0},
 Links,Verknüpfungen,
 List,Listenansicht,
 List Filter,Listenfilter,
-List View Setting,List View Setting,
+List View,Listenansicht,
+List View Setting,Einstellungen zu Listenansicht,
 List a document type,Einen Dokumenttyp auflisten,
 "List as [{""label"": _(""Jobs""), ""route"":""jobs""}]","Liste als [{ ""label"": _ ( ""Jobs""), ""route"": ""jobs""}]",
 List of backups available for download,Datensicherungen herunterladen,

frappe/utils/backups.py

@@ -653,7 +653,8 @@ def get_backup_path():
 
 @frappe.whitelist()
 def get_backup_encryption_key():
-	return frappe.local.conf.encryption_key
+	frappe.only_for("System Manager")
+	return frappe.conf.encryption_key
 
 class Backup:
 	def __init__(self, file_path):

frappe/utils/minify.py

@@ -1,212 +0,0 @@
-
-# This code is original from jsmin by Douglas Crockford, it was translated to
-# Python by Baruch Even. The original code had the following copyright and
-# license.
-#
-# /* jsmin.c
-#	2007-05-22
-#
-# Copyright (c) 2002 Douglas Crockford  (www.crockford.com)
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy of
-# this software and associated documentation files (the "Software"), to deal in
-# the Software without restriction, including without limitation the rights to
-# use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
-# of the Software, and to permit persons to whom the Software is furnished to do
-# so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in all
-# copies or substantial portions of the Software.
-#
-# The Software shall be used for Good, not Evil.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-# SOFTWARE.
-# */
-
-from io import StringIO
-
-def jsmin(js):
-	ins = StringIO(js)
-	outs = StringIO()
-	JavascriptMinify().minify(ins, outs)
-	str = outs.getvalue()
-	if len(str) > 0 and str[0] == '\n':
-		str = str[1:]
-	return str
-
-def isAlphanum(c):
-	"""return true if the character is a letter, digit, underscore,
-		   dollar sign, or non-ASCII character.
-	"""
-	return ((c >= 'a' and c <= 'z') or (c >= '0' and c <= '9') or
-			(c >= 'A' and c <= 'Z') or c == '_' or c == '$' or c == '\\' or (c is not None and ord(c) > 126));
-
-class UnterminatedComment(Exception):
-	pass
-
-class UnterminatedStringLiteral(Exception):
-	pass
-
-class UnterminatedRegularExpression(Exception):
-	pass
-
-class JavascriptMinify(object):
-
-	def _outA(self):
-		self.outstream.write(self.theA)
-	def _outB(self):
-		self.outstream.write(self.theB)
-
-	def _get(self):
-		"""return the next character from stdin. Watch out for lookahead. If
-		   the character is a control character, translate it to a space or
-		   linefeed.
-		"""
-		c = self.theLookahead
-		self.theLookahead = None
-		if c is None:
-			c = self.instream.read(1)
-		if c >= ' ' or c == '\n':
-			return c
-		if c == '': # EOF
-			return '\000'
-		if c == '\r':
-			return '\n'
-		return ' '
-
-	def _peek(self):
-		self.theLookahead = self._get()
-		return self.theLookahead
-
-	def _next(self):
-		"""get the next character, excluding comments. peek() is used to see
-		   if an unescaped '/' is followed by a '/' or '*'.
-		"""
-		c = self._get()
-		if c == '/' and self.theA != '\\':
-			p = self._peek()
-			if p == '/':
-				c = self._get()
-				while c > '\n':
-					c = self._get()
-				return c
-			if p == '*':
-				c = self._get()
-				while 1:
-					c = self._get()
-					if c == '*':
-						if self._peek() == '/':
-							self._get()
-							return ' '
-					if c == '\000':
-						raise UnterminatedComment()
-
-		return c
-
-	def _action(self, action):
-		"""do something! What you do is determined by the argument:
-		   1   Output A. Copy B to A. Get the next B.
-		   2   Copy B to A. Get the next B. (Delete A).
-		   3   Get the next B. (Delete B).
-		   action treats a string as a single character. Wow!
-		   action recognizes a regular expression if it is preceded by ( or , or =.
-		"""
-		if action <= 1:
-			self._outA()
-
-		if action <= 2:
-			self.theA = self.theB
-			if self.theA == "'" or self.theA == '"':
-				while 1:
-					self._outA()
-					self.theA = self._get()
-					if self.theA == self.theB:
-						break
-					if self.theA <= '\n':
-						raise UnterminatedStringLiteral()
-					if self.theA == '\\':
-						self._outA()
-						self.theA = self._get()
-
-
-		if action <= 3:
-			self.theB = self._next()
-			if self.theB == '/' and (self.theA == '(' or self.theA == ',' or
-									 self.theA == '=' or self.theA == ':' or
-									 self.theA == '[' or self.theA == '?' or
-									 self.theA == '!' or self.theA == '&' or
-									 self.theA == '|' or self.theA == ';' or
-									 self.theA == '{' or self.theA == '}' or
-									 self.theA == '\n'):
-				self._outA()
-				self._outB()
-				while 1:
-					self.theA = self._get()
-					if self.theA == '/':
-						break
-					elif self.theA == '\\':
-						self._outA()
-						self.theA = self._get()
-					elif self.theA <= '\n':
-						raise UnterminatedRegularExpression()
-					self._outA()
-				self.theB = self._next()
-
-
-	def _jsmin(self):
-		"""Copy the input to the output, deleting the characters which are
-		   insignificant to JavaScript. Comments will be removed. Tabs will be
-		   replaced with spaces. Carriage returns will be replaced with linefeeds.
-		   Most spaces and linefeeds will be removed.
-		"""
-		self.theA = '\n'
-		self._action(3)
-
-		while self.theA != '\000':
-			if self.theA == ' ':
-				if isAlphanum(self.theB):
-					self._action(1)
-				else:
-					self._action(2)
-			elif self.theA == '\n':
-				if self.theB in ['{', '[', '(', '+', '-']:
-					self._action(1)
-				elif self.theB == ' ':
-					self._action(3)
-				else:
-					if isAlphanum(self.theB):
-						self._action(1)
-					else:
-						self._action(2)
-			else:
-				if self.theB == ' ':
-					if isAlphanum(self.theA):
-						self._action(1)
-					else:
-						self._action(3)
-				elif self.theB == '\n':
-					if self.theA in ['}', ']', ')', '+', '-', '"', '\'']:
-						self._action(1)
-					else:
-						if isAlphanum(self.theA):
-							self._action(1)
-						else:
-							self._action(3)
-				else:
-					self._action(1)
-
-	def minify(self, instream, outstream):
-		self.instream = instream
-		self.outstream = outstream
-		self.theA = '\n'
-		self.theB = None
-		self.theLookahead = None
-
-		self._jsmin()
-		self.instream.close()

frappe/www/printview.py

@@ -151,7 +151,12 @@ def get_rendered_template(doc, name=None, print_format=None, meta=None,
 
 	convert_markdown(doc, meta)
 
-	args = {
+	args = {}
+	# extract `print_heading_template` from the first field and remove it
+	if format_data and format_data[0].get("fieldname") == "print_heading_template":
+		args["print_heading_template"] = format_data.pop(0).get("options")
+
+	args.update({
 		"doc": doc,
 		"meta": frappe.get_meta(doc.doctype),
 		"layout": make_layout(doc, meta, format_data),
@@ -160,7 +165,7 @@ def get_rendered_template(doc, name=None, print_format=None, meta=None,
 		"letter_head": letter_head.content,
 		"footer": letter_head.footer,
 		"print_settings": print_settings
-	}
+	})
 
 	html = template.render(args, filters={"len": len})
 
@@ -319,13 +324,6 @@ def make_layout(doc, meta, format_data=None):
 	layout, page = [], []
 	layout.append(page)
 
-	if format_data:
-		# extract print_heading_template from the first field
-		# and remove the field
-		if format_data[0].get("fieldname") == "print_heading_template":
-			doc.print_heading_template = format_data[0].get("options")
-			format_data = format_data[1:]
-
 	def get_new_section(): return  {'columns': [], 'has_data': False}
 
 	def append_empty_field_dict_to_page_column(page):