Merge branch 'develop' into error-snapshot-fix

.snyk

@@ -1,5 +1,5 @@
 # Snyk (https://snyk.io) policy file, patches or ignores known vulnerabilities.
-version: v1.13.5
+version: v1.14.1
 # ignores vulnerabilities until expiry date; change duration by modifying expiry date
 ignore:
   SNYK-JS-AWESOMPLETE-174474:
@@ -22,3 +22,44 @@ patch:
   SNYK-JS-LODASH-450202:
     - frappe-datatable > lodash:
         patched: '2020-01-31T01:33:09.889Z'
+  SNYK-JS-LODASH-567746:
+    - frappe-datatable > lodash:
+        patched: '2020-04-30T23:02:32.330Z'
+    - quagga > lodash:
+        patched: '2020-04-30T23:02:32.330Z'
+    - snyk > lodash:
+        patched: '2020-04-30T23:02:32.330Z'
+    - tailwindcss > lodash:
+        patched: '2020-04-30T23:02:32.330Z'
+    - '@tailwindcss/ui > @tailwindcss/custom-forms > lodash':
+        patched: '2020-04-30T23:02:32.330Z'
+    - snyk > @snyk/dep-graph > lodash:
+        patched: '2020-04-30T23:02:32.330Z'
+    - snyk > inquirer > lodash:
+        patched: '2020-04-30T23:02:32.330Z'
+    - snyk > snyk-config > lodash:
+        patched: '2020-04-30T23:02:32.330Z'
+    - snyk > snyk-mvn-plugin > lodash:
+        patched: '2020-04-30T23:02:32.330Z'
+    - snyk > snyk-nodejs-lockfile-parser > lodash:
+        patched: '2020-04-30T23:02:32.330Z'
+    - snyk > snyk-nuget-plugin > lodash:
+        patched: '2020-04-30T23:02:32.330Z'
+    - snyk > @snyk/dep-graph > graphlib > lodash:
+        patched: '2020-04-30T23:02:32.330Z'
+    - snyk > snyk-go-plugin > graphlib > lodash:
+        patched: '2020-04-30T23:02:32.330Z'
+    - snyk > snyk-nodejs-lockfile-parser > graphlib > lodash:
+        patched: '2020-04-30T23:02:32.330Z'
+    - snyk > @snyk/snyk-cocoapods-plugin > @snyk/dep-graph > lodash:
+        patched: '2020-04-30T23:02:32.330Z'
+    - snyk > snyk-nuget-plugin > dotnet-deps-parser > lodash:
+        patched: '2020-04-30T23:02:32.330Z'
+    - snyk > snyk-php-plugin > @snyk/composer-lockfile-parser > lodash:
+        patched: '2020-04-30T23:02:32.330Z'
+    - snyk > @snyk/snyk-cocoapods-plugin > @snyk/dep-graph > graphlib > lodash:
+        patched: '2020-04-30T23:02:32.330Z'
+    - snyk > @snyk/snyk-cocoapods-plugin > @snyk/cocoapods-lockfile-parser > @snyk/ruby-semver > lodash:
+        patched: '2020-04-30T23:02:32.330Z'
+    - snyk > @snyk/snyk-cocoapods-plugin > @snyk/cocoapods-lockfile-parser > @snyk/dep-graph > graphlib > lodash:
+        patched: '2020-04-30T23:02:32.330Z'

.travis.yml

@@ -1,5 +1,5 @@
 language: python
-dist: trusty
+dist: bionic
 
 addons:
   hosts:
@@ -9,6 +9,10 @@ addons:
   postgresql: 9.5
   chrome: stable
 
+services:
+  - xvfb
+  - mysql
+
 git:
   depth: 1
 
@@ -21,20 +25,21 @@ cache:
     # https://docs.cypress.io/guides/guides/continuous-integration.html#Caching
     - ~/.cache
 
+
 matrix:
   include:
-  - name: "Python 3.6 MariaDB"
-    python: 3.6
+  - name: "Python 3.7 MariaDB"
+    python: 3.7
     env: DB=mariadb TYPE=server
     script: bench --site test_site run-tests --coverage
 
-  - name: "Python 3.6 PostgreSQL"
-    python: 3.6
+  - name: "Python 3.7 PostgreSQL"
+    python: 3.7
     env: DB=postgres TYPE=server
     script: bench --site test_site run-tests --coverage
 
   - name: "Cypress"
-    python: 3.6
+    python: 3.7
     env: DB=mariadb TYPE=ui
     before_script:
     - bench --site test_site execute frappe.utils.install.complete_setup_wizard
@@ -42,7 +47,26 @@ matrix:
     script: bench --site test_site run-ui-tests frappe --headless
 
 before_install:
-  # install wkhtmltopdf
+    # do we really want to run travis?
+  - |
+    ONLY_DOCS_CHANGES=$(git diff --name-only $TRAVIS_COMMIT_RANGE | grep -qvE '\.(md|png|jpg|jpeg)$|^.github|LICENSE' ; echo $?)
+    ONLY_JS_CHANGES=$(git diff --name-only $TRAVIS_COMMIT_RANGE | grep -qvE '\.js$' ; echo $?)
+    ONLY_PY_CHANGES=$(git diff --name-only $TRAVIS_COMMIT_RANGE | grep -qvE '\.py$' ; echo $?)
+
+    if [[ $ONLY_DOCS_CHANGES == "1" ]]; then
+        echo "Only docs were updated, stopping build process.";
+        exit;
+    fi
+    if [[ $ONLY_JS_CHANGES == "1"  && $TYPE == "server" ]]; then
+        echo "Only JavaScript code was updated; Stopping Python build process.";
+        exit;
+    fi
+    if [[ $ONLY_PY_CHANGES == "1"  && $TYPE == "ui" ]]; then
+        echo "Only Python code was updated, stopping Cypress build process.";
+        exit;
+    fi
+
+ # install wkhtmltopdf
   - wget -O /tmp/wkhtmltox.tar.xz https://github.com/frappe/wkhtmltopdf/raw/master/wkhtmltox-0.12.3_linux-generic-amd64.tar.xz
   - tar -xf /tmp/wkhtmltox.tar.xz -C /tmp
   - sudo mv /tmp/wkhtmltox/bin/wkhtmltopdf /usr/local/bin/wkhtmltopdf
@@ -98,7 +122,13 @@ install:
   - if [ $TYPE == "server" ]; then sed -i 's/socketio:/# socketio:/g' Procfile; fi
   - if [ $TYPE == "server" ]; then sed -i 's/redis_socketio:/# redis_socketio:/g' Procfile; fi
 
-  - bench setup requirements --node
+  - if [ $TYPE == "ui" ]; then bench setup requirements --node; fi
+
+  # install node-sass which is required for website theme test
+  - cd ./apps/frappe
+  - yarn add node-sass@4.13.1
+  - cd ../..
+
   - bench start &
   - bench --site test_site reinstall --yes
   - bench --site test_site_producer reinstall --yes

cypress.json

@@ -2,6 +2,6 @@
   "baseUrl": "http://test_site_ui:8000",
   "projectId": "92odwv",
   "adminPassword": "admin",
-  "defaultCommandTimeout": 10000,
+  "defaultCommandTimeout": 20000,
   "pageLoadTimeout": 15000
 }

cypress/integration/control_duration.js

@@ -0,0 +1,45 @@
+context('Control Duration', () => {
+	before(() => {
+		cy.login();
+		cy.visit('/desk#workspace/Website');
+	});
+
+	function get_dialog_with_duration(show_days=1, show_seconds=1) {
+		return cy.dialog({
+			title: 'Duration',
+			fields: [{
+				'fieldname': 'duration',
+				'fieldtype': 'Duration',
+				'show_seconds': show_days,
+				'show_days': show_seconds
+			}]
+		});
+	}
+
+	it('should set duration', () => {
+		get_dialog_with_duration().as('dialog');
+		cy.get('.frappe-control[data-fieldname=duration] input')
+			.first()
+			.click();
+		cy.get('.duration-input[data-duration=days]')
+			.type(45, {force: true})
+			.blur({force: true});
+		cy.get('.duration-input[data-duration=minutes]')
+			.type(30)
+			.blur({force: true});
+		cy.get('.frappe-control[data-fieldname=duration] input').first().should('have.value', '45d 30m');
+		cy.get('.frappe-control[data-fieldname=duration] input').first().blur();
+		cy.get('.duration-picker').should('not.be.visible');
+		cy.get('@dialog').then(dialog => {
+			let value = dialog.get_value('duration');
+			expect(value).to.equal(3889800);
+		});
+	});
+
+	it('should hide days or seconds according to duration options', () => {
+		get_dialog_with_duration(0, 0).as('dialog');
+		cy.get('.frappe-control[data-fieldname=duration] input').first().click();
+		cy.get('.duration-input[data-duration=days]').should('not.be.visible');
+		cy.get('.duration-input[data-duration=seconds]').should('not.be.visible');
+	});
+});

cypress/integration/control_link.js

@@ -1,7 +1,11 @@
 context('Control Link', () => {
-	beforeEach(() => {
+	before(() => {
 		cy.login();
 		cy.visit('/desk#workspace/Website');
+	});
+
+	beforeEach(() => {
+		cy.visit('/desk#workspace/Website');
 		cy.create_records({
 			doctype: 'ToDo',
 			description: 'this is a test todo for link'
@@ -30,7 +34,7 @@ context('Control Link', () => {
 
 		cy.get('.frappe-control[data-fieldname=link] input').focus().as('input');
 		cy.wait('@search_link');
-		cy.get('@input').type('todo for link');
+		cy.get('@input').type('todo for link', { delay: 200 });
 		cy.wait('@search_link');
 		cy.get('.frappe-control[data-fieldname=link] ul').should('be.visible');
 		cy.get('.frappe-control[data-fieldname=link] input').type('{enter}', { delay: 100 });

cypress/integration/list_view_settings.js

@@ -9,7 +9,9 @@ context('List View Settings', () => {
 		cy.get('.sidebar-stat').should('contain', "Tags");
 	});
 	it('disable count and sidebar stats then verify', () => {
+		cy.wait(300);
 		cy.visit('/desk#List/DocType/List');
+		cy.wait(300);
 		cy.get('.list-count').should('contain', "20 of");
 		cy.get('button').contains('Menu').click();
 		cy.get('.dropdown-menu li').filter(':visible').contains('Settings').click();

cypress/integration/login.js

@@ -21,6 +21,15 @@ context('Login', () => {
 		cy.location('pathname').should('eq', '/login');
 	});
 
+	it('shows invalid login if incorrect credentials', () => {
+		cy.get('#login_email').type('Administrator');
+		cy.get('#login_password').type('qwer');
+
+		cy.get('.btn-login').click();
+		cy.get('.page-card-head').contains('Invalid Login. Try again.');
+		cy.location('pathname').should('eq', '/login');
+	});
+
 	it('logs in using correct credentials', () => {
 		cy.get('#login_email').type('Administrator');
 		cy.get('#login_password').type(Cypress.config('adminPassword'));
@@ -30,12 +39,30 @@ context('Login', () => {
 		cy.window().its('frappe.session.user').should('eq', 'Administrator');
 	});
 
-	it('shows invalid login if incorrect credentials', () => {
+	it('check redirect after login', () => {
+
+		// mock for OAuth 2.0 client_id, redirect_uri, scope and state
+		const payload = new URLSearchParams({
+			uuid: '6fed1519-cfd8-4a2d-84a6-9a1799c7c741',
+			encoded_string: 'hello all',
+			encoded_url: 'http://test.localhost/callback',
+			base64_string: 'aGVsbG8gYWxs'
+		});
+
+		cy.request('/api/method/logout');
+
+		// redirect-to /me page with params to mock OAuth 2.0 like request
+		cy.visit(
+			'/login?redirect-to=/me?' +
+				encodeURIComponent(payload.toString().replace("+", " "))
+		);
+
 		cy.get('#login_email').type('Administrator');
-		cy.get('#login_password').type('qwer');
+		cy.get('#login_password').type(Cypress.config('adminPassword'));
 
 		cy.get('.btn-login').click();
-		cy.get('.page-card-head').contains('Invalid Login. Try again.');
-		cy.location('pathname').should('eq', '/login');
+
+		// verify redirected location and url params after login
+		cy.url().should('include', '/me?' + payload.toString().replace('+', '%20'));
 	});
 });

cypress/integration/relative_time_filters.js

@@ -1,7 +1,6 @@
 context('Relative Timeframe', () => {
 	beforeEach(() => {
 		cy.login();
-		cy.visit('/desk#workspace/Website');
 	});
 	before(() => {
 		cy.login();
@@ -10,14 +9,14 @@ context('Relative Timeframe', () => {
 			frappe.call("frappe.tests.ui_test_helpers.create_todo_records");
 		});
 	});
-	it('set relative filter for Previous and check list', () => {
+	it('sets relative timespan filter for last week and filters list', () => {
 		cy.visit('/desk#List/ToDo/List');
 		cy.get('.list-row:contains("this is fourth todo")').should('exist');
 		cy.get('.tag-filters-area .btn:contains("Add Filter")').click();
 		cy.get('.fieldname-select-area').should('exist');
 		cy.get('.fieldname-select-area input').type("Due Date{enter}", { delay: 100 });
-		cy.get('select.condition.form-control').select("Previous");
-		cy.get('.filter-field select.input-with-feedback.form-control').select("1 week");
+		cy.get('select.condition.form-control').select("Timespan");
+		cy.get('.filter-field select.input-with-feedback.form-control').select("last week");
 		cy.server();
 		cy.route('POST', '/api/method/frappe.desk.reportview.get').as('list_refresh');
 		cy.get('.filter-box .btn:contains("Apply")').click();
@@ -29,13 +28,13 @@ context('Relative Timeframe', () => {
 		cy.get('.remove-filter.btn').click();
 		cy.wait('@save_user_settings');
 	});
-	it('set relative filter for Next and check list', () => {
+	it('sets relative timespan filter for next week and filters list', () => {
 		cy.visit('/desk#List/ToDo/List');
 		cy.get('.list-row:contains("this is fourth todo")').should('exist');
 		cy.get('.tag-filters-area .btn:contains("Add Filter")').click();
 		cy.get('.fieldname-select-area input').type("Due Date{enter}", { delay: 100 });
-		cy.get('select.condition.form-control').select("Next");
-		cy.get('.filter-field select.input-with-feedback.form-control').select("1 week");
+		cy.get('select.condition.form-control').select("Timespan");
+		cy.get('.filter-field select.input-with-feedback.form-control').select("next week");
 		cy.server();
 		cy.route('POST', '/api/method/frappe.desk.reportview.get').as('list_refresh');
 		cy.get('.filter-box .btn:contains("Apply")').click();

frappe/__init__.py

@@ -23,7 +23,7 @@ if PY2:
 	reload(sys)
 	sys.setdefaultencoding("utf-8")
 
-__version__ = '12.0.0-dev'
+__version__ = '13.0.0-dev'
 __title__ = "Frappe Framework"
 
 local = Local()
@@ -231,9 +231,8 @@ 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("{0} does not exist".format(local.site))
+			print("Site {0} does not exist".format(local.site))
 			sys.exit(1)
-			#raise IncorrectSitePath, "{0} does not exist".format(site_config)
 
 	return _dict(config)
 
@@ -345,7 +344,7 @@ def msgprint(msg, title=None, raise_exception=0, as_table=False, indicator=None,
 			style="margin: 0;">{}</table>'''.format(table_rows)
 
 	if flags.print_messages and out.message:
-		print("Message: " + repr(out.message).encode("utf-8"))
+		print(f"Message: {repr(out.message).encode('utf-8')}")
 
 	if title:
 		out.title = title
@@ -1559,10 +1558,10 @@ def get_doctype_app(doctype):
 
 loggers = {}
 log_level = None
-def logger(module=None, with_more_info=True):
+def logger(module=None, with_more_info=False):
 	'''Returns a python logger that uses StreamHandler'''
 	from frappe.utils.logger import get_logger
-	return get_logger(module or 'default', with_more_info=with_more_info)
+	return get_logger(module=module, with_more_info=with_more_info)
 
 def log_error(message=None, title=_("Error")):
 	'''Log error to Error Log'''

frappe/app.py

@@ -26,6 +26,7 @@ from frappe.core.doctype.comment.comment import update_comments_in_parent_after_
 from frappe import _
 import frappe.recorder
 import frappe.monitor
+import frappe.rate_limiter
 
 local_manager = LocalManager([frappe.local])
 
@@ -54,6 +55,7 @@ def application(request):
 
 		frappe.recorder.record()
 		frappe.monitor.start()
+		frappe.rate_limiter.apply()
 
 		if frappe.local.form_dict.cmd:
 			response = frappe.handler.handle()
@@ -93,9 +95,23 @@ def application(request):
 		if response and hasattr(frappe.local, 'cookie_manager'):
 			frappe.local.cookie_manager.flush_cookies(response=response)
 
+		frappe.rate_limiter.update()
 		frappe.monitor.stop(response)
 		frappe.recorder.dump()
 
+		frappe.logger("web").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())
+
 		frappe.destroy()
 
 	return response
@@ -171,6 +187,9 @@ def handle_exception(e):
 			http_status_code=http_status_code,  indicator_color='red')
 		return_as_message = True
 
+	elif http_status_code == 429:
+		response = frappe.rate_limiter.respond()
+
 	else:
 		traceback = "<pre>" + sanitize_html(frappe.get_traceback()) + "</pre>"
 		if frappe.local.flags.disable_traceback:
@@ -186,7 +205,6 @@ def handle_exception(e):
 			frappe.local.login_manager.clear_cookies()
 
 	if http_status_code >= 500:
-		frappe.logger().error('Request Error', exc_info=True)
 		make_error_snapshot(e)
 
 	if return_as_message:

frappe/automation/doctype/assignment_rule/assignment_rule.py

@@ -44,7 +44,7 @@ class AssignmentRule(Document):
 		user = self.get_user()
 
 		assign_to.add(dict(
-			assign_to = user,
+			assign_to = [user],
 			doctype = doc.get('doctype'),
 			name = doc.get('name'),
 			description = frappe.render_template(self.description, doc),

frappe/automation/doctype/auto_repeat/auto_repeat.py

@@ -299,17 +299,20 @@ def get_next_schedule_date(schedule_date, frequency, start_date, repeat_on_day=N
 		next_date = get_next_date(start_date, month_count)
 	else:
 		days = 7 if frequency == 'Weekly' else 1
-		next_date = add_days(start_date, days)
+		next_date = add_days(schedule_date, days)
 
 	# next schedule date should be after or on current date
 	if not for_full_schedule:
 		while getdate(next_date) < getdate(today()):
 			if month_count:
 				month_count += month_map.get(frequency)
-			next_date = get_next_date(start_date, month_count, day_count)
+				next_date = get_next_date(start_date, month_count, day_count)
+			elif days:
+				next_date = add_days(next_date, days)
 
 	return next_date
 
+
 def get_next_date(dt, mcount, day=None):
 	dt = getdate(dt)
 	dt += relativedelta(months=mcount, day=day)

frappe/automation/doctype/auto_repeat/test_auto_repeat.py

@@ -99,13 +99,18 @@ class TestAutoRepeat(unittest.TestCase):
 	def test_next_schedule_date(self):
 		current_date = getdate(today())
 		todo = frappe.get_doc(
-			dict(doctype='ToDo', description='test next schedule date todo', assigned_by='Administrator')).insert()
+			dict(doctype='ToDo', description='test next schedule date for monthly', assigned_by='Administrator')).insert()
 		doc = make_auto_repeat(frequency='Monthly',	reference_document=todo.name, start_date=add_months(today(), -2))
 
 		# next_schedule_date is set as on or after current date
 		# it should not be a previous month's date
 		self.assertTrue((doc.next_schedule_date >= current_date))
 
+		todo = frappe.get_doc(
+			dict(doctype='ToDo', description='test next schedule date for daily', assigned_by='Administrator')).insert()
+		doc = make_auto_repeat(frequency='Daily', reference_document=todo.name, start_date=add_days(today(), -2))
+		self.assertEqual(getdate(doc.next_schedule_date), current_date)
+
 
 def make_auto_repeat(**args):
 	args = frappe._dict(args)

frappe/boot.py

@@ -19,6 +19,7 @@ from frappe.email.inbox import get_email_accounts
 from frappe.social.doctype.energy_point_settings.energy_point_settings import is_energy_point_enabled
 from frappe.website.doctype.web_page_view.web_page_view import is_tracking_enabled
 from frappe.social.doctype.energy_point_log.energy_point_log import get_energy_points
+from frappe.model.base_document import get_controller
 from frappe.social.doctype.post.post import frequently_visited_links
 
 def get_bootinfo():
@@ -84,6 +85,7 @@ def get_bootinfo():
 	bootinfo.points = get_energy_points(frappe.session.user)
 	bootinfo.frequently_visited_links = frequently_visited_links()
 	bootinfo.link_preview_doctypes = get_link_preview_doctypes()
+	bootinfo.additional_filters_config = get_additional_filters_from_hooks()
 
 	return bootinfo
 
@@ -106,14 +108,23 @@ def load_desktop_data(bootinfo):
 	from frappe.desk.desktop import get_desk_sidebar_items
 	bootinfo.allowed_modules = get_modules_from_all_apps_for_user()
 	bootinfo.allowed_workspaces = get_desk_sidebar_items(True)
+	bootinfo.module_page_map = get_controller("Desk Page").get_module_page_map()
+	bootinfo.dashboards = frappe.get_all("Dashboard")
 
-def get_allowed_pages():
-	return get_user_pages_or_reports('Page')
+def get_allowed_pages(cache=False):
+	return get_user_pages_or_reports('Page', cache=cache)
 
-def get_allowed_reports():
-	return get_user_pages_or_reports('Report')
+def get_allowed_reports(cache=False):
+	return get_user_pages_or_reports('Report', cache=cache)
+
+def get_user_pages_or_reports(parent, cache=False):
+	_cache = frappe.cache()
+
+	if cache:
+		has_role = _cache.get_value('has_role:' + parent, user=frappe.session.user)
+		if has_role:
+			return has_role
 
-def get_user_pages_or_reports(parent):
 	roles = frappe.get_roles()
 	has_role = {}
 	column = get_column(parent)
@@ -184,6 +195,8 @@ def get_user_pages_or_reports(parent):
 		for report in reports:
 			has_role[report.name]["report_type"] = report.report_type
 
+	# Expire every six hours
+	_cache.set_value('has_role:' + parent, has_role, frappe.session.user, 21600)
 	return has_role
 
 def get_column(doctype):
@@ -285,3 +298,11 @@ def get_link_preview_doctypes():
 			link_preview_doctypes.append(custom.doc_type)
 
 	return link_preview_doctypes
+
+def get_additional_filters_from_hooks():
+	filter_config = frappe._dict()
+	filter_hooks = frappe.get_hooks('filters_config')
+	for hook in filter_hooks:
+		filter_config.update(frappe.get_attr(hook)())
+
+	return filter_config

frappe/cache_manager.py

@@ -20,7 +20,8 @@ global_cache_keys = ("app_hooks", "installed_apps",
 
 user_cache_keys = ("bootinfo", "user_recent", "roles", "user_doc", "lang",
 		"defaults", "user_permissions", "home_page", "linked_with",
-		"desktop_icons", 'portal_menu_items')
+		"desktop_icons", 'portal_menu_items', 'user_perm_can_read',
+		"has_role:Page", "has_role:Report")
 
 doctype_cache_keys = ("meta", "form_meta", "table_columns", "last_modified",
 		"linked_doctypes", 'notifications', 'workflow' ,'energy_point_rule_map')

frappe/commands/__init__.py

@@ -22,7 +22,11 @@ def pass_context(f):
 			pr = cProfile.Profile()
 			pr.enable()
 
-		ret = f(frappe._dict(ctx.obj), *args, **kwargs)
+		try:
+			ret = f(frappe._dict(ctx.obj), *args, **kwargs)
+		except frappe.exceptions.SiteNotSpecifiedError as e:
+			click.secho(str(e), fg='yellow')
+			sys.exit(1)
 
 		if profile:
 			pr.disable()
@@ -44,8 +48,7 @@ def get_site(context):
 		site = context.sites[0]
 		return site
 	except (IndexError, TypeError):
-		print('Please specify --site sitename')
-		sys.exit(1)
+		raise frappe.SiteNotSpecifiedError
 
 def popen(command, *args, **kwargs):
 	output    = kwargs.get('output', True)

frappe/commands/scheduler.py

@@ -4,6 +4,7 @@ import sys
 import frappe
 from frappe.utils import cint
 from frappe.commands import pass_context, get_site
+from frappe.exceptions import SiteNotSpecifiedError
 
 def _is_scheduler_enabled():
 	enable_scheduler = False
@@ -30,6 +31,8 @@ def trigger_scheduler_event(context, event):
 			frappe.utils.scheduler.trigger(site, event, now=True)
 		finally:
 			frappe.destroy()
+	if not context.sites:
+		raise SiteNotSpecifiedError
 
 @click.command('enable-scheduler')
 @pass_context
@@ -45,6 +48,8 @@ def enable_scheduler(context):
 			print("Enabled for", site)
 		finally:
 			frappe.destroy()
+	if not context.sites:
+		raise SiteNotSpecifiedError
 
 @click.command('disable-scheduler')
 @pass_context
@@ -60,7 +65,8 @@ def disable_scheduler(context):
 			print("Disabled for", site)
 		finally:
 			frappe.destroy()
-
+	if not context.sites:
+		raise SiteNotSpecifiedError
 
 
 @click.command('scheduler')

frappe/commands/site.py

@@ -15,6 +15,7 @@ import frappe
 from frappe import _
 from frappe.commands import get_site, pass_context
 from frappe.commands.scheduler import _is_scheduler_enabled
+from frappe.exceptions import SiteNotSpecifiedError
 from frappe.installer import update_site_config
 from frappe.utils import get_site_path, touch_file
 
@@ -43,14 +44,16 @@ def new_site(site, mariadb_root_username=None, mariadb_root_password=None, admin
 	_new_site(db_name, site, mariadb_root_username=mariadb_root_username,
 			  mariadb_root_password=mariadb_root_password, admin_password=admin_password,
 			  verbose=verbose, install_apps=install_app, source_sql=source_sql, force=force,
-			  no_mariadb_socket=no_mariadb_socket, db_password=db_password, db_type=db_type, db_host=db_host, db_port=db_port)
+			  no_mariadb_socket=no_mariadb_socket, db_password=db_password, db_type=db_type, db_host=db_host,
+			  db_port=db_port, new_site=True)
 
 	if len(frappe.utils.get_sites()) == 1:
 		use(site)
 
 def _new_site(db_name, site, mariadb_root_username=None, mariadb_root_password=None,
 			  admin_password=None, verbose=False, install_apps=None, source_sql=None, force=False,
-			  no_mariadb_socket=False, reinstall=False,  db_password=None, db_type=None, db_host=None, db_port=None):
+			  no_mariadb_socket=False, reinstall=False,  db_password=None, db_type=None, db_host=None,
+			  db_port=None, new_site=False):
 	"""Install a new Frappe site"""
 
 	if not force and os.path.exists(site):
@@ -79,7 +82,10 @@ def _new_site(db_name, site, mariadb_root_username=None, mariadb_root_password=N
 	make_site_dirs()
 
 	installing = touch_file(get_site_path('locks', 'installing.lock'))
-	atexit.register(_new_site_cleanup, site, mariadb_root_username, mariadb_root_password)
+
+	if new_site:
+		# run cleanup only if new-site is called
+		atexit.register(_new_site_cleanup, site, mariadb_root_username, mariadb_root_password)
 
 	install_db(root_login=mariadb_root_username, root_password=mariadb_root_password, db_name=db_name,
 		admin_password=admin_password, verbose=verbose, source_sql=source_sql, force=force, reinstall=reinstall,
@@ -97,7 +103,10 @@ def _new_site(db_name, site, mariadb_root_username=None, mariadb_root_password=N
 	print("*** Scheduler is", scheduler_status, "***")
 
 def _new_site_cleanup(site, mariadb_root_username, mariadb_root_password):
-	installing = get_site_path('locks', 'installing.lock')
+	try:
+		installing = get_site_path('locks', 'installing.lock')
+	except AttributeError:
+		installing = os.path.join(site, 'locks', 'installing.lock')
 
 	if installing and os.path.exists(installing):
 		if mariadb_root_password:
@@ -122,30 +131,47 @@ def restore(context, sql_file_path, mariadb_root_username=None, mariadb_root_pas
 	# Extract the gzip file if user has passed *.sql.gz file instead of *.sql file
 
 	if not os.path.exists(sql_file_path):
-		sql_file_path = '../' + sql_file_path
+		base_path = '..'
+		sql_file_path = os.path.join(base_path, sql_file_path)
 		if not os.path.exists(sql_file_path):
 			print('Invalid path {0}'.format(sql_file_path[3:]))
 			sys.exit(1)
+	elif sql_file_path.startswith(os.sep):
+		base_path = os.sep
+	else:
+		base_path = '.'
+
 
 	if sql_file_path.endswith('sql.gz'):
-		sql_file_path = extract_sql_gzip(os.path.abspath(sql_file_path))
+		decompressed_file_name = extract_sql_gzip(os.path.abspath(sql_file_path))
+	else:
+		decompressed_file_name = sql_file_path
 
 	site = get_site(context)
 	frappe.init(site=site)
 	_new_site(frappe.conf.db_name, site, mariadb_root_username=mariadb_root_username,
 		mariadb_root_password=mariadb_root_password, admin_password=admin_password,
-		verbose=context.verbose, install_apps=install_app, source_sql=sql_file_path,
-		force=context.force)
+		verbose=context.verbose, install_apps=install_app, source_sql=decompressed_file_name,
+		force=True)
 
 	# Extract public and/or private files to the restored site, if user has given the path
 	if with_public_files:
+		with_public_files = os.path.join(base_path, with_public_files)
 		public = extract_tar_files(site, with_public_files, 'public')
 		os.remove(public)
 
 	if with_private_files:
+		with_private_files = os.path.join(base_path, with_private_files)
 		private = extract_tar_files(site, with_private_files, 'private')
 		os.remove(private)
 
+	# Removing temporarily created file
+	if decompressed_file_name != sql_file_path:
+		os.remove(decompressed_file_name)
+
+	success_message = "Site {0} has been restored{1}".format(site, " with files" if (with_public_files or with_private_files) else "")
+	click.secho(success_message, fg="green")
+
 @click.command('reinstall')
 @click.option('--admin-password', help='Administrator Password for reinstalled site')
 @click.option('--mariadb-root-username', help='Root username for MariaDB')
@@ -192,6 +218,8 @@ def install_app(context, apps):
 				_install_app(app, verbose=context.verbose)
 		finally:
 			frappe.destroy()
+	if not context.sites:
+		raise SiteNotSpecifiedError
 
 @click.command('list-apps')
 @pass_context
@@ -221,7 +249,8 @@ def add_system_manager(context, email, first_name, last_name, send_welcome_email
 			frappe.db.commit()
 		finally:
 			frappe.destroy()
-
+	if not context.sites:
+		raise SiteNotSpecifiedError
 
 @click.command('disable-user')
 @click.argument('email')
@@ -252,10 +281,23 @@ def migrate(context, rebuild_website=False, skip_failing=False):
 			migrate(context.verbose, rebuild_website=rebuild_website, skip_failing=skip_failing)
 		finally:
 			frappe.destroy()
+	if not context.sites:
+		raise SiteNotSpecifiedError
 
 	print("Compiling Python Files...")
 	compileall.compile_dir('../apps', quiet=1, rx=re.compile('.*node_modules.*'))
 
+@click.command('migrate-to')
+@click.argument('frappe_provider')
+@pass_context
+def migrate_to(context, frappe_provider):
+	"Migrates site to the specified provider"
+	from frappe.integrations.frappe_providers import migrate_to
+	for site in context.sites:
+		migrate_to(site, frappe_provider)
+	if not context.sites:
+		raise SiteNotSpecifiedError
+
 @click.command('run-patch')
 @click.argument('module')
 @pass_context
@@ -269,6 +311,8 @@ def run_patch(context, module):
 			frappe.modules.patch_handler.run_single(module, force=context.force)
 		finally:
 			frappe.destroy()
+	if not context.sites:
+		raise SiteNotSpecifiedError
 
 @click.command('reload-doc')
 @click.argument('module')
@@ -285,6 +329,8 @@ def reload_doc(context, module, doctype, docname):
 			frappe.db.commit()
 		finally:
 			frappe.destroy()
+	if not context.sites:
+		raise SiteNotSpecifiedError
 
 @click.command('reload-doctype')
 @click.argument('doctype')
@@ -299,6 +345,8 @@ def reload_doctype(context, doctype):
 			frappe.db.commit()
 		finally:
 			frappe.destroy()
+	if not context.sites:
+		raise SiteNotSpecifiedError
 
 @click.command('add-to-hosts')
 @pass_context
@@ -306,6 +354,8 @@ def add_to_hosts(context):
 	"Add site to hosts"
 	for site in context.sites:
 		frappe.commands.popen('echo 127.0.0.1\t{0} | sudo tee -a /etc/hosts'.format(site))
+	if not context.sites:
+		raise SiteNotSpecifiedError
 
 @click.command('use')
 @click.argument('site')
@@ -317,23 +367,25 @@ def use(site, sites_path='.'):
 	if os.path.exists(os.path.join(sites_path, site)):
 		with open(os.path.join(sites_path,  "currentsite.txt"), "w") as sitefile:
 			sitefile.write(site)
+		print("Current Site set to {}".format(site))
 	else:
-		print("{} does not exist".format(site))
+		print("Site {} does not exist".format(site))
 
 @click.command('backup')
 @click.option('--with-files', default=False, is_flag=True, help="Take backup with files")
+@click.option('--verbose', default=False, is_flag=True)
 @pass_context
 def backup(context, with_files=False, backup_path_db=None, backup_path_files=None,
-	backup_path_private_files=None, quiet=False):
+	backup_path_private_files=None, quiet=False, verbose=False):
 	"Backup"
 	from frappe.utils.backups import scheduled_backup
-	verbose = context.verbose
+	verbose = verbose or context.verbose
 	exit_code = 0
 	for site in context.sites:
 		try:
 			frappe.init(site=site)
 			frappe.connect()
-			odb = scheduled_backup(ignore_files=not with_files, backup_path_db=backup_path_db, backup_path_files=backup_path_files, backup_path_private_files=backup_path_private_files, force=True)
+			odb = scheduled_backup(ignore_files=not with_files, backup_path_db=backup_path_db, backup_path_files=backup_path_files, backup_path_private_files=backup_path_private_files, force=True, verbose=verbose)
 		except Exception as e:
 			if verbose:
 				print("Backup failed for {0}. Database or site_config.json may be corrupted".format(site))
@@ -342,12 +394,17 @@ def backup(context, with_files=False, backup_path_db=None, backup_path_files=Non
 
 		if verbose:
 			from frappe.utils import now
-			print("database backup taken -", odb.backup_path_db, "- on", now())
+			summary_title = "Backup Summary at {0}".format(now())
+			print(summary_title + "\n" + "-" * len(summary_title))
+			print("Database backup:", odb.backup_path_db)
 			if with_files:
-				print("files backup taken -", odb.backup_path_files, "- on", now())
-				print("private files backup taken -", odb.backup_path_private_files, "- on", now())
+				print("Public files:   ", odb.backup_path_files)
+				print("Private files:  ", odb.backup_path_private_files)
 
 		frappe.destroy()
+	if not context.sites:
+		raise SiteNotSpecifiedError
+
 	sys.exit(exit_code)
 
 @click.command('remove-from-installed-apps')
@@ -363,6 +420,8 @@ def remove_from_installed_apps(context, app):
 			remove_from_installed_apps(app)
 		finally:
 			frappe.destroy()
+	if not context.sites:
+		raise SiteNotSpecifiedError
 
 @click.command('uninstall-app')
 @click.argument('app')
@@ -379,6 +438,8 @@ def uninstall(context, app, dry_run=False, yes=False):
 			remove_app(app, dry_run, yes)
 		finally:
 			frappe.destroy()
+	if not context.sites:
+		raise SiteNotSpecifiedError
 
 
 @click.command('drop-site')
@@ -409,7 +470,7 @@ def _drop_site(site, root_login='root', root_password=None, archived_sites_path=
 		else:
 			click.echo("="*80)
 			click.echo("Error: The operation has stopped because backup of {s}'s database failed.".format(s=site))
-			click.echo("Reason: {reason}{sep}".format(reason=err[1], sep="\n"))
+			click.echo("Reason: {reason}{sep}".format(reason=str(err), sep="\n"))
 			click.echo("Fix the issue and try again.")
 			click.echo(
 				"Hint: Use 'bench drop-site {s} --force' to force the removal of {s}".format(sep="\n", tab="\t", s=site)
@@ -470,6 +531,8 @@ def set_admin_password(context, admin_password, logout_all_sessions=False):
 			admin_password = None
 		finally:
 			frappe.destroy()
+	if not context.sites:
+		raise SiteNotSpecifiedError
 
 @click.command('set-last-active-for-user')
 @click.option('--user', help="Setup last active date for user")
@@ -515,6 +578,8 @@ def publish_realtime(context, event, message, room, user, doctype, docname, afte
 			frappe.db.commit()
 		finally:
 			frappe.destroy()
+	if not context.sites:
+		raise SiteNotSpecifiedError
 
 @click.command('browse')
 @click.argument('site', required=False)
@@ -542,6 +607,8 @@ def start_recording(context):
 	for site in context.sites:
 		frappe.init(site=site)
 		frappe.recorder.start()
+	if not context.sites:
+		raise SiteNotSpecifiedError
 
 
 @click.command('stop-recording')
@@ -550,6 +617,8 @@ def stop_recording(context):
 	for site in context.sites:
 		frappe.init(site=site)
 		frappe.recorder.stop()
+	if not context.sites:
+		raise SiteNotSpecifiedError
 
 
 commands = [
@@ -559,6 +628,7 @@ commands = [
 	install_app,
 	list_apps,
 	migrate,
+	migrate_to,
 	new_site,
 	reinstall,
 	reload_doc,

frappe/commands/translate.py

@@ -1,6 +1,7 @@
 from __future__ import unicode_literals, absolute_import, print_function
 import click
 from frappe.commands import pass_context, get_site
+from frappe.exceptions import SiteNotSpecifiedError
 
 # translation
 @click.command('build-message-files')
@@ -15,6 +16,8 @@ def build_message_files(context):
 			frappe.translate.rebuild_all_translation_files()
 		finally:
 			frappe.destroy()
+	if not context.sites:
+		raise SiteNotSpecifiedError
 
 @click.command('new-language') #, help="Create lang-code.csv for given app")
 @pass_context

frappe/commands/utils.py

@@ -6,6 +6,7 @@ import json, os, sys, subprocess
 from distutils.spawn import find_executable
 import frappe
 from frappe.commands import pass_context, get_site
+from frappe.exceptions import SiteNotSpecifiedError
 from frappe.utils import update_progress_bar, get_bench_path
 from frappe.utils.response import json_handler
 from coverage import Coverage
@@ -51,7 +52,8 @@ def clear_cache(context):
 			frappe.website.render.clear_cache()
 		finally:
 			frappe.destroy()
-
+	if not context.sites:
+		raise SiteNotSpecifiedError
 
 @click.command('clear-website-cache')
 @pass_context
@@ -65,7 +67,8 @@ def clear_website_cache(context):
 			frappe.website.render.clear_cache()
 		finally:
 			frappe.destroy()
-
+	if not context.sites:
+		raise SiteNotSpecifiedError
 
 @click.command('destroy-all-sessions')
 @click.option('--reason')
@@ -81,7 +84,8 @@ def destroy_all_sessions(context, reason=None):
 			frappe.db.commit()
 		finally:
 			frappe.destroy()
-
+	if not context.sites:
+		raise SiteNotSpecifiedError
 
 @click.command('show-config')
 @pass_context
@@ -117,7 +121,8 @@ def reset_perms(context):
 					reset_perms(d)
 		finally:
 			frappe.destroy()
-
+	if not context.sites:
+		raise SiteNotSpecifiedError
 
 @click.command('execute')
 @click.argument('method')
@@ -164,6 +169,9 @@ def execute(context, method, args=None, kwargs=None, profile=False):
 		if ret:
 			print(json.dumps(ret, default=json_handler))
 
+	if not context.sites:
+		raise SiteNotSpecifiedError
+
 
 @click.command('add-to-email-queue')
 @click.argument('email-path')
@@ -197,7 +205,8 @@ def export_doc(context, doctype, docname):
 			frappe.modules.export_doc(doctype, docname)
 		finally:
 			frappe.destroy()
-
+	if not context.sites:
+		raise SiteNotSpecifiedError
 
 @click.command('export-json')
 @click.argument('doctype')
@@ -214,7 +223,8 @@ def export_json(context, doctype, path, name=None):
 			data_import.export_json(doctype, path, name=name)
 		finally:
 			frappe.destroy()
-
+	if not context.sites:
+		raise SiteNotSpecifiedError
 
 @click.command('export-csv')
 @click.argument('doctype')
@@ -230,7 +240,8 @@ def export_csv(context, doctype, path):
 			data_import.export_csv(doctype, path)
 		finally:
 			frappe.destroy()
-
+	if not context.sites:
+		raise SiteNotSpecifiedError
 
 @click.command('export-fixtures')
 @click.option('--app', default=None, help='Export fixtures of a specific app')
@@ -245,7 +256,8 @@ def export_fixtures(context, app=None):
 			export_fixtures(app=app)
 		finally:
 			frappe.destroy()
-
+	if not context.sites:
+		raise SiteNotSpecifiedError
 
 @click.command('import-doc')
 @click.argument('path')
@@ -267,7 +279,8 @@ def import_doc(context, path, force=False):
 			data_import.import_doc(path, overwrite=context.force)
 		finally:
 			frappe.destroy()
-
+	if not context.sites:
+		raise SiteNotSpecifiedError
 
 @click.command('import-csv')
 @click.argument('path')
@@ -364,6 +377,8 @@ def mariadb(context):
 	import os
 
 	site  = get_site(context)
+	if not site:
+		raise SiteNotSpecifiedError
 	frappe.init(site=site)
 
 	# This is assuming you're within the bench instance.
@@ -443,7 +458,7 @@ def console(context):
 	for app in all_apps:
 		locals()[app] = __import__(app)
 	print("Apps in this namespace:\n{}".format(", ".join(all_apps)))
-	IPython.embed(display_banner="", header="")
+	IPython.embed(display_banner="", header="", colors="neutral")
 
 
 @click.command('run-tests')
@@ -577,7 +592,8 @@ def request(context, args=None, path=None):
 			print(frappe.response)
 		finally:
 			frappe.destroy()
-
+	if not context.sites:
+		raise SiteNotSpecifiedError
 
 @click.command('make-app')
 @click.argument('destination')
@@ -658,7 +674,8 @@ def rebuild_global_search(context, static_pages=False):
 
 		finally:
 			frappe.destroy()
-
+	if not context.sites:
+		raise SiteNotSpecifiedError
 
 @click.command('auto-deploy')
 @click.argument('app')

frappe/config/customization.py

@@ -3,7 +3,7 @@ from frappe import _
 
 def get_data():
 	return [
-        {
+		{
 			"label": _("Form Customization"),
 			"icon": "fa fa-glass",
 			"items": [
@@ -57,9 +57,9 @@ def get_data():
 				},
 				{
 					"type": "doctype",
-					"label": _("Custom Tags"),
-					"name": "Tag Category",
-					"description": _("Add your own Tag Categories")
+					"label": _("Package"),
+					"name": "Package",
+					"description": _("Import and Export Packages.")
 				}
 			]
 		}

frappe/contacts/doctype/contact/contact.py

@@ -3,7 +3,7 @@
 
 from __future__ import unicode_literals
 import frappe
-from frappe.utils import cstr, has_gravatar
+from frappe.utils import cstr, has_gravatar, cint
 from frappe import _
 from frappe.model.document import Document
 from frappe.core.doctype.dynamic_link.dynamic_link import deduplicate_dynamic_links
@@ -133,7 +133,7 @@ def get_default_contact(doctype, name):
 			dl.parenttype = "Contact"''', (doctype, name))
 
 	if out:
-		return sorted(out, key = functools.cmp_to_key(lambda x,y: cmp(y[1], x[1])))[0][0]
+		return sorted(out, key = functools.cmp_to_key(lambda x,y: cmp(cint(y[1]), cint(x[1]))))[0][0]
 	else:
 		return None
 

frappe/core/doctype/access_log/test_access_log.py

@@ -158,11 +158,7 @@ class TestAccessLog(unittest.TestCase):
 			request = requests.post(private_file_link, headers=self.header)
 			last_doc = frappe.get_last_doc('Access Log')
 
-			if request.status_code == 403:
-				# if file is not accessible, access log wont be generated
-				pass
-
-			else:
+			if request.ok:
 				# check for the access log of downloaded file
 				self.assertEqual(new_private_file.doctype, last_doc.export_from)
 				self.assertEqual(new_private_file.name, last_doc.reference_document)

frappe/core/doctype/comment/comment.py

@@ -26,6 +26,7 @@ class Comment(Document):
 	def validate(self):
 		if not self.comment_email:
 			self.comment_email = frappe.session.user
+		self.content = frappe.utils.sanitize_html(self.content)
 
 	def on_update(self):
 		update_comment_in_doc(self)

frappe/core/doctype/communication/communication.py

@@ -2,20 +2,21 @@
 # MIT License. See license.txt
 
 from __future__ import unicode_literals, absolute_import
+from collections import Counter
 import frappe
 from frappe import _
 from frappe.model.document import Document
-from frappe.utils import validate_email_address, get_fullname, strip_html, cstr
-from frappe.core.doctype.communication.email import (validate_email,
-	notify, _notify, update_parent_mins_to_first_response)
+from frappe.utils import validate_email_address, strip_html, cstr, time_diff_in_seconds
+from frappe.core.doctype.communication.email import validate_email, notify, _notify
 from frappe.core.utils import get_parent_doc
 from frappe.utils.bot import BotReply
 from frappe.utils import parse_addr
 from frappe.core.doctype.comment.comment import update_comment_in_doc
 from email.utils import parseaddr
 from six.moves.urllib.parse import unquote
-from collections import Counter
+from frappe.utils.user import is_system_user
 from frappe.contacts.doctype.contact.contact import get_contact_name
+from frappe.automation.doctype.assignment_rule.assignment_rule import apply as apply_assignment_rule
 
 exclude_from_linked_with = True
 
@@ -119,7 +120,7 @@ class Communication(Document):
 		update_comment_in_doc(self)
 
 		if self.comment_type != 'Updated':
-			update_parent_mins_to_first_response(self)
+			update_parent_document_on_communication(self)
 			self.bot_reply()
 
 	def on_trash(self):
@@ -258,7 +259,12 @@ class Communication(Document):
 
 	# Timeline Links
 	def set_timeline_links(self):
-		contacts = get_contacts([self.sender, self.recipients, self.cc, self.bcc])
+		contacts = []
+		if (self.email_account and frappe.db.get_value("Email Account", self.email_account, "create_contact")) or \
+			frappe.flags.in_test:
+
+			contacts = get_contacts([self.sender, self.recipients, self.cc, self.bcc])
+
 		for contact_name in contacts:
 			self.add_link('Contact', contact_name)
 
@@ -423,3 +429,39 @@ def get_email_without_link(email):
 	email_host = email.split("@")[1]
 
 	return "{0}@{1}".format(email_id, email_host)
+
+def update_parent_document_on_communication(doc):
+	"""Update mins_to_first_communication of parent document based on who is replying."""
+
+	parent = get_parent_doc(doc)
+	if not parent:
+		return
+
+	# update parent mins_to_first_communication only if we create the Email communication
+	# ignore in case of only Comment is added
+	if doc.communication_type == "Comment":
+		return
+
+	status_field = parent.meta.get_field("status")
+	if status_field:
+		options = (status_field.options or '').splitlines()
+
+		# if status has a "Replied" option, then update the status for received communication
+		if ('Replied' in options) and doc.sent_or_received=="Received":
+			parent.db_set("status", "Open")
+			apply_assignment_rule(parent)
+		else:
+			# update the modified date for document
+			parent.update_modified()
+
+	update_mins_to_first_communication(parent, doc)
+	parent.run_method('notify_communication', doc)
+	parent.notify_update()
+
+def update_mins_to_first_communication(parent, communication):
+	if parent.meta.has_field('mins_to_first_response') and not parent.get('mins_to_first_response'):
+		if is_system_user(communication.sender):
+			first_responded_on = communication.creation
+			if parent.meta.has_field('first_responded_on') and communication.sent_or_received == "Sent":
+				parent.db_set('first_responded_on', first_responded_on)
+			parent.db_set('mins_to_first_response', round(time_diff_in_seconds(first_responded_on, parent.creation) / 60), 2)

frappe/core/doctype/communication/email.py

@@ -9,7 +9,7 @@ import json
 from email.utils import formataddr
 from frappe.core.utils import get_parent_doc
 from frappe.utils import (get_url, get_formatted_email, cint,
-  validate_email_address, split_emails, time_diff_in_seconds, parse_addr, get_datetime)
+  validate_email_address, split_emails, parse_addr, get_datetime)
 from frappe.email.email_body import get_message_id
 import frappe.email.smtp
 import time
@@ -172,33 +172,6 @@ def _notify(doc, print_html=None, print_format=None, attachments=None,
 		print_letterhead=frappe.flags.print_letterhead
 	)
 
-def update_parent_mins_to_first_response(doc):
-	"""Update mins_to_first_communication of parent document based on who is replying."""
-
-	parent = get_parent_doc(doc)
-	if not parent:
-		return
-
-	# update parent mins_to_first_communication only if we create the Email communication
-	# ignore in case of only Comment is added
-	if doc.communication_type == "Comment":
-		return
-
-	status_field = parent.meta.get_field("status")
-	if status_field:
-		options = (status_field.options or '').splitlines()
-
-		# if status has a "Replied" option, then update the status for received communication
-		if ('Replied' in options) and doc.sent_or_received=="Received":
-			parent.db_set("status", "Open")
-		else:
-			# update the modified date for document
-			parent.update_modified()
-
-	update_mins_to_first_communication(parent, doc)
-	parent.run_method('notify_communication', doc)
-	parent.notify_update()
-
 def get_recipients_cc_and_bcc(doc, recipients, cc, bcc, fetched_from_email_account=False):
 	doc.all_email_addresses = []
 	doc.sent_email_addresses = []
@@ -499,15 +472,6 @@ def sendmail(communication_name, print_html=None, print_format=None, attachments
 		traceback = frappe.log_error("frappe.core.doctype.communication.email.sendmail")
 		raise
 
-def update_mins_to_first_communication(parent, communication):
-	if parent.meta.has_field('mins_to_first_response') and not parent.get('mins_to_first_response'):
-		if frappe.db.get_all('User', filters={'email': communication.sender,
-			'user_type': 'System User', 'enabled': 1}, limit=1):
-			first_responded_on = communication.creation
-			if parent.meta.has_field('first_responded_on') and communication.sent_or_received == "Sent":
-				parent.db_set('first_responded_on', first_responded_on)
-			parent.db_set('mins_to_first_response', round(time_diff_in_seconds(first_responded_on, parent.creation) / 60), 2)
-
 @frappe.whitelist(allow_guest=True)
 def mark_email_as_seen(name=None):
 	try:

frappe/core/doctype/communication/test_communication.py

@@ -202,6 +202,8 @@ class TestCommunication(unittest.TestCase):
 		self.assertIn(("Note", note.name), doc_links)
 
 def create_email_account():
+	frappe.delete_doc_if_exists("Email Account", "_Test Comm Account 1")
+
 	frappe.flags.mute_emails = False
 	frappe.flags.sent_mail = None
 

frappe/core/doctype/data_import/importer_new.py

@@ -74,7 +74,6 @@ class Importer:
 			self.read_content(content, extension)
 
 		self.validate_template_content()
-		self.remove_empty_rows_and_columns()
 
 	def read_file(self, file_path):
 		extn = file_path.split(".")[1]
@@ -99,6 +98,8 @@ class Importer:
 		elif extension == "xls":
 			data = read_xls_file_from_attached_file(content)
 
+		data = self.remove_empty_rows_and_columns(data)
+
 		if len(data) <= 1:
 			frappe.throw(
 				_("Import template should contain a Header and atleast one row."), title=error_title
@@ -114,42 +115,41 @@ class Importer:
 				_("Number of columns does not match with data"), title=_("Invalid Template")
 			)
 
-	def remove_empty_rows_and_columns(self):
+	def remove_empty_rows_and_columns(self, raw_data):
 		self.row_index_map = []
 		removed_rows = []
 		removed_columns = []
 
 		# remove empty rows
-		data = []
-		for i, row in enumerate(self.data):
+		data_without_empty_rows = []
+		for i, row in enumerate(raw_data):
 			if all(v in INVALID_VALUES for v in row):
 				# empty row
 				removed_rows.append(i)
 			else:
-				data.append(row)
+				data_without_empty_rows.append(row)
 				self.row_index_map.append(i)
 
 		# remove empty columns
 		# a column with a header and no data is a valid column
 		# a column with no header and no data will be removed
-		header_row = []
-		for i, column in enumerate(self.header_row):
-			column_values = [row[i] for row in data]
-			values = [column] + column_values
-			if all(v in INVALID_VALUES for v in values):
+		first_row = data_without_empty_rows[0]
+		for i, column in enumerate(first_row):
+			column_values = [row[i] for row in data_without_empty_rows]
+			if all(v in INVALID_VALUES for v in column_values):
 				# empty column
 				removed_columns.append(i)
-			else:
-				header_row.append(column)
 
-		data_without_empty_columns = []
-		# remove empty columns from data
-		for i, row in enumerate(data):
-			new_row = [v for j, v in enumerate(row) if j not in removed_columns]
-			data_without_empty_columns.append(new_row)
+		if removed_columns:
+			data_without_empty_rows_and_columns = []
+			# remove empty columns from data
+			for i, row in enumerate(data_without_empty_rows):
+				new_row = [v for j, v in enumerate(row) if j not in removed_columns]
+				data_without_empty_rows_and_columns.append(new_row)
+		else:
+			data_without_empty_rows_and_columns = data_without_empty_rows
 
-		self.data = data_without_empty_columns
-		self.header_row = header_row
+		return data_without_empty_rows_and_columns
 
 	def get_data_for_import_preview(self):
 		out = frappe._dict()
@@ -325,7 +325,7 @@ class Importer:
 
 	def detect_date_formats(self, columns):
 		for col in columns:
-			if col.df and col.df.fieldtype in ['Date', 'Time', 'Datetime']:
+			if col.df and col.df.fieldtype in ["Date", "Time", "Datetime"]:
 				col.date_format = self.guess_date_format_for_column(col, columns)
 		return columns
 
@@ -351,7 +351,16 @@ class Importer:
 		value = cstr(value)
 
 		# convert boolean values to 0 or 1
-		if df.fieldtype == "Check" and value.lower().strip() in ["t", "f", "true", "false", "yes", "no", "y", "n"]:
+		if df.fieldtype == "Check" and value.lower().strip() in [
+			"t",
+			"f",
+			"true",
+			"false",
+			"yes",
+			"no",
+			"y",
+			"n",
+		]:
 			value = value.lower().strip()
 			value = 1 if value in ["t", "true", "y", "yes"] else 0
 
@@ -398,8 +407,9 @@ class Importer:
 			date_values = [
 				row[column_index] for row in self.data[:PARSE_ROW_COUNT] if row[column_index]
 			]
-			date_formats = [guess_date_format(d) if isinstance(d, str) else None
-							for d in date_values]
+			date_formats = [
+				guess_date_format(d) if isinstance(d, str) else None for d in date_values
+			]
 			if not date_formats:
 				return
 			max_occurred_date_format = max(set(date_formats), key=date_formats.count)
@@ -827,9 +837,9 @@ class Importer:
 		id_value = doc[id_fieldname]
 		existing_doc = frappe.get_doc(self.doctype, id_value)
 		existing_doc.flags.updater_reference = {
-			'doctype': self.data_import.doctype,
-			'docname': self.data_import.name,
-			'label': _('via Data Import')
+			"doctype": self.data_import.doctype,
+			"docname": self.data_import.name,
+			"label": _("via Data Import"),
 		}
 		existing_doc.update(doc)
 		existing_doc.save()

frappe/core/doctype/data_import/test_exporter_new.py

@@ -20,7 +20,7 @@ class TestExporter(unittest.TestCase):
 		e = Exporter('Web Page', export_fields='All')
 		csv_array = e.get_csv_array()
 		header = csv_array[0]
-		self.assertEqual(len(header), 36)
+		self.assertEqual(len(header), 37)
 
 
 	def test_exports_selected_fields(self):

frappe/core/doctype/data_import_beta/data_import_beta.js

@@ -177,8 +177,8 @@ frappe.ui.form.on('Data Import Beta', {
 	start_import(frm) {
 		frm
 			.call({
-				doc: frm.doc,
-				method: 'start_import',
+				method: 'form_start_import',
+				args: { data_import: frm.doc.name },
 				btn: frm.page.btn_primary
 			})
 			.then(r => {
@@ -252,8 +252,8 @@ frappe.ui.form.on('Data Import Beta', {
 
 		frm
 			.call({
-				doc: frm.doc,
 				method: 'get_preview_from_template',
+				args: { data_import: frm.doc.name },
 				error_handlers: {
 					TimestampMismatchError() {
 						// ignore this error

frappe/core/doctype/data_import_beta/data_import_beta.py

@@ -61,6 +61,16 @@ class DataImportBeta(Document):
 		return Importer(self.reference_doctype, data_import=self)
 
 
+@frappe.whitelist()
+def get_preview_from_template(data_import):
+	return frappe.get_doc("Data Import Beta", data_import).get_preview_from_template()
+
+
+@frappe.whitelist()
+def form_start_import(data_import):
+	return frappe.get_doc("Data Import Beta", data_import).start_import()
+
+
 def start_import(data_import):
 	"""This method runs in background job"""
 	data_import = frappe.get_doc("Data Import Beta", data_import)
@@ -69,12 +79,11 @@ def start_import(data_import):
 		i.import_data()
 	except:
 		frappe.db.rollback()
-		data_import.db_set('status', 'Error')
+		data_import.db_set("status", "Error")
 		frappe.log_error(title=data_import.name)
 		frappe.db.commit()
-		frappe.publish_realtime(
-			"data_import_refresh", {"data_import": data_import.name}
-		)
+		frappe.publish_realtime("data_import_refresh", {"data_import": data_import.name})
+
 
 @frappe.whitelist()
 def download_template(

frappe/core/doctype/docfield/docfield.json

@@ -13,6 +13,8 @@
   "fieldname",
   "precision",
   "length",
+  "show_days",
+  "show_seconds",
   "reqd",
   "search_index",
   "in_list_view",
@@ -43,6 +45,7 @@
   "report_hide",
   "remember_last_selected_value",
   "ignore_xss_filter",
+  "hide_border",
   "property_depends_on_section",
   "mandatory_depends_on",
   "column_break_38",
@@ -86,7 +89,7 @@
    "label": "Type",
    "oldfieldname": "fieldtype",
    "oldfieldtype": "Select",
-   "options": "Attach\nAttach Image\nBarcode\nButton\nCheck\nCode\nColor\nColumn Break\nCurrency\nData\nDate\nDatetime\nDynamic Link\nFloat\nFold\nGeolocation\nHeading\nHTML\nHTML Editor\nImage\nInt\nLink\nLong Text\nMarkdown Editor\nPassword\nPercent\nRead Only\nRating\nSection Break\nSelect\nSmall Text\nTable\nTable MultiSelect\nText\nText Editor\nTime\nSignature",
+   "options": "Attach\nAttach Image\nBarcode\nButton\nCheck\nCode\nColor\nColumn Break\nCurrency\nData\nDate\nDatetime\nDuration\nDynamic Link\nFloat\nFold\nGeolocation\nHeading\nHTML\nHTML Editor\nImage\nInt\nLink\nLong Text\nMarkdown Editor\nPassword\nPercent\nRead Only\nRating\nSection Break\nSelect\nSmall Text\nTable\nTable MultiSelect\nText\nText Editor\nTime\nSignature",
    "reqd": 1,
    "search_index": 1
   },
@@ -448,12 +451,33 @@
   {
    "fieldname": "column_break_38",
    "fieldtype": "Column Break"
+  },
+  {
+   "default": "1",
+   "depends_on": "eval:doc.fieldtype === \"Duration\";",
+   "fieldname": "show_days",
+   "fieldtype": "Check",
+   "label": "Show Days"
+  },
+  {
+   "default": "1",
+   "depends_on": "eval:doc.fieldtype === \"Duration\";",
+   "fieldname": "show_seconds",
+   "fieldtype": "Check",
+   "label": "Show Seconds"
+  },
+  {
+   "default": "0",
+   "depends_on": "eval:doc.fieldtype=='Section Break'",
+   "fieldname": "hide_border",
+   "fieldtype": "Check",
+   "label": "Hide Border"
   }
  ],
  "idx": 1,
  "istable": 1,
  "links": [],
- "modified": "2020-04-19 21:54:13.783908",
+ "modified": "2020-05-15 09:06:25.224411",
  "modified_by": "Administrator",
  "module": "Core",
  "name": "DocField",

frappe/core/doctype/installed_application/installed_application.json

@@ -0,0 +1,49 @@
+{
+ "actions": [],
+ "creation": "2020-05-11 17:44:54.674657",
+ "doctype": "DocType",
+ "engine": "InnoDB",
+ "field_order": [
+  "app_name",
+  "app_version",
+  "git_branch"
+ ],
+ "fields": [
+  {
+   "fieldname": "git_branch",
+   "fieldtype": "Data",
+   "in_list_view": 1,
+   "label": "Git Branch",
+   "read_only": 1,
+   "reqd": 1
+  },
+  {
+   "fieldname": "app_name",
+   "fieldtype": "Data",
+   "in_list_view": 1,
+   "label": "Application Name",
+   "read_only": 1,
+   "reqd": 1
+  },
+  {
+   "fieldname": "app_version",
+   "fieldtype": "Data",
+   "in_list_view": 1,
+   "label": "Application Version",
+   "read_only": 1,
+   "reqd": 1
+  }
+ ],
+ "istable": 1,
+ "links": [],
+ "modified": "2020-05-12 10:09:49.148087",
+ "modified_by": "Administrator",
+ "module": "Core",
+ "name": "Installed Application",
+ "owner": "Administrator",
+ "permissions": [],
+ "quick_entry": 1,
+ "sort_field": "modified",
+ "sort_order": "DESC",
+ "track_changes": 1
+}

frappe/core/doctype/installed_application/installed_application.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 InstalledApplication(Document):
+	pass

frappe/core/doctype/installed_applications/installed_applications.js

@@ -0,0 +1,8 @@
+// Copyright (c) 2020, Frappe Technologies and contributors
+// For license information, please see license.txt
+
+frappe.ui.form.on('Installed Applications', {
+	// refresh: function(frm) {
+
+	// }
+});

frappe/core/doctype/installed_applications/installed_applications.json

@@ -0,0 +1,42 @@
+{
+ "actions": [],
+ "creation": "2020-05-11 17:45:41.587750",
+ "doctype": "DocType",
+ "editable_grid": 1,
+ "engine": "InnoDB",
+ "field_order": [
+  "installed_applications"
+ ],
+ "fields": [
+  {
+   "fieldname": "installed_applications",
+   "fieldtype": "Table",
+   "label": "Installed Applications",
+   "options": "Installed Application",
+   "read_only": 1
+  }
+ ],
+ "issingle": 1,
+ "links": [],
+ "modified": "2020-05-12 10:09:14.310622",
+ "modified_by": "Administrator",
+ "module": "Core",
+ "name": "Installed Applications",
+ "owner": "Administrator",
+ "permissions": [
+  {
+   "create": 1,
+   "delete": 1,
+   "email": 1,
+   "print": 1,
+   "read": 1,
+   "role": "System Manager",
+   "share": 1,
+   "write": 1
+  }
+ ],
+ "quick_entry": 1,
+ "sort_field": "modified",
+ "sort_order": "DESC",
+ "track_changes": 1
+}

frappe/core/doctype/installed_applications/installed_applications.py

@@ -0,0 +1,18 @@
+# -*- 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 InstalledApplications(Document):
+	def update_versions(self):
+		self.delete_key("installed_applications")
+		for app in frappe.utils.get_installed_apps_info():
+			self.append("installed_applications", {
+				"app_name": app.get("app_name"),
+				"app_version": app.get("version"),
+				"git_branch": app.get("branch")
+			})
+		self.save()

frappe/core/doctype/installed_applications/test_installed_applications.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 TestInstalledApplications(unittest.TestCase):
+	pass

frappe/core/doctype/scheduled_job_type/scheduled_job_type.py

@@ -84,7 +84,7 @@ class ScheduledJobType(Document):
 
 	def log_status(self, status):
 		# log file
-		frappe.logger(__name__).info('Scheduled Job {0}: {1} for {2}'.format(status, self.method, frappe.local.site))
+		frappe.logger("scheduler").info('Scheduled Job {0}: {1} for {2}'.format(status, self.method, frappe.local.site))
 		self.update_scheduler_log(status)
 
 	def update_scheduler_log(self, status):

frappe/core/page/dashboard/dashboard.css

@@ -0,0 +1,5 @@
+.restricted-button {
+	cursor: default;
+	position: relative;
+	right: -5px;
+}

frappe/core/page/dashboard/dashboard.js

@@ -6,7 +6,7 @@ frappe.provide('frappe.dashboards.chart_sources');
 
 
 frappe.pages['dashboard'].on_page_load = function(wrapper) {
-	var page = frappe.ui.make_app_page({
+	frappe.ui.make_app_page({
 		parent: wrapper,
 		title: __("Dashboard"),
 		single_column: true
@@ -21,11 +21,18 @@ frappe.pages['dashboard'].on_page_load = function(wrapper) {
 class Dashboard {
 	constructor(wrapper) {
 		this.wrapper = $(wrapper);
-		$(`<div class="dashboard">
+		$(`<div class="dashboard" style="overflow-y: hidden">
 			<div class="dashboard-graph"></div>
 		</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() {

frappe/custom/doctype/custom_field/custom_field.json

@@ -16,6 +16,8 @@
   "column_break_6",
   "fieldtype",
   "precision",
+  "show_seconds",
+  "show_days",
   "options",
   "fetch_from",
   "fetch_if_empty",
@@ -48,6 +50,7 @@
   "allow_in_quick_entry",
   "ignore_xss_filter",
   "translatable",
+  "hide_border",
   "description",
   "permlevel",
   "width",
@@ -55,361 +58,386 @@
  ],
  "fields": [
   {
-   "bold": 1,
-   "fieldname": "dt",
-   "fieldtype": "Link",
-   "in_filter": 1,
-   "in_list_view": 1,
-   "label": "Document",
-   "oldfieldname": "dt",
-   "oldfieldtype": "Link",
-   "options": "DocType",
-   "reqd": 1,
-   "search_index": 1
+	"bold": 1,
+	"fieldname": "dt",
+	"fieldtype": "Link",
+	"in_filter": 1,
+	"in_list_view": 1,
+	"label": "Document",
+	"oldfieldname": "dt",
+	"oldfieldtype": "Link",
+	"options": "DocType",
+	"reqd": 1,
+	"search_index": 1
   },
   {
-   "bold": 1,
-   "fieldname": "label",
-   "fieldtype": "Data",
-   "in_filter": 1,
-   "label": "Label",
-   "no_copy": 1,
-   "oldfieldname": "label",
-   "oldfieldtype": "Data"
+	"bold": 1,
+	"fieldname": "label",
+	"fieldtype": "Data",
+	"in_filter": 1,
+	"label": "Label",
+	"no_copy": 1,
+	"oldfieldname": "label",
+	"oldfieldtype": "Data"
   },
   {
-   "fieldname": "label_help",
-   "fieldtype": "HTML",
-   "label": "Label Help",
-   "oldfieldtype": "HTML"
+	"fieldname": "label_help",
+	"fieldtype": "HTML",
+	"label": "Label Help",
+	"oldfieldtype": "HTML"
   },
   {
-   "fieldname": "fieldname",
-   "fieldtype": "Data",
-   "in_list_view": 1,
-   "label": "Fieldname",
-   "no_copy": 1,
-   "oldfieldname": "fieldname",
-   "oldfieldtype": "Data",
-   "read_only": 1
+	"fieldname": "fieldname",
+	"fieldtype": "Data",
+	"in_list_view": 1,
+	"label": "Fieldname",
+	"no_copy": 1,
+	"oldfieldname": "fieldname",
+	"oldfieldtype": "Data",
+	"read_only": 1
   },
   {
-   "description": "Select the label after which you want to insert new field.",
-   "fieldname": "insert_after",
-   "fieldtype": "Select",
-   "label": "Insert After",
-   "no_copy": 1,
-   "oldfieldname": "insert_after",
-   "oldfieldtype": "Select"
+	"description": "Select the label after which you want to insert new field.",
+	"fieldname": "insert_after",
+	"fieldtype": "Select",
+	"label": "Insert After",
+	"no_copy": 1,
+	"oldfieldname": "insert_after",
+	"oldfieldtype": "Select"
   },
   {
-   "fieldname": "column_break_6",
-   "fieldtype": "Column Break"
+	"fieldname": "column_break_6",
+	"fieldtype": "Column Break"
   },
   {
-   "bold": 1,
-   "default": "Data",
-   "fieldname": "fieldtype",
-   "fieldtype": "Select",
-   "in_filter": 1,
-   "in_list_view": 1,
-   "label": "Field Type",
-   "oldfieldname": "fieldtype",
-   "oldfieldtype": "Select",
-   "options": "Attach\nAttach Image\nBarcode\nButton\nCheck\nCode\nColor\nColumn Break\nCurrency\nData\nDate\nDatetime\nDynamic Link\nFloat\nGeolocation\nHTML\nImage\nInt\nLink\nLong Text\nMarkdown Editor\nPassword\nPercent\nRating\nRead Only\nSection Break\nSelect\nSmall Text\nTable\nTable MultiSelect\nText\nText Editor\nTime\nSignature",
-   "reqd": 1
+	"bold": 1,
+	"default": "Data",
+	"fieldname": "fieldtype",
+	"fieldtype": "Select",
+	"in_filter": 1,
+	"in_list_view": 1,
+	"label": "Field Type",
+	"oldfieldname": "fieldtype",
+	"oldfieldtype": "Select",
+	"options": "Attach\nAttach Image\nBarcode\nButton\nCheck\nCode\nColor\nColumn Break\nCurrency\nData\nDate\nDatetime\nDuration\nDynamic Link\nFloat\nGeolocation\nHTML\nImage\nInt\nLink\nLong Text\nMarkdown Editor\nPassword\nPercent\nRating\nRead Only\nSection Break\nSelect\nSmall Text\nTable\nTable MultiSelect\nText\nText Editor\nTime\nSignature",
+	"reqd": 1
   },
   {
-   "depends_on": "eval:in_list([\"Float\", \"Currency\", \"Percent\"], doc.fieldtype)",
-   "description": "Set non-standard precision for a Float or Currency field",
-   "fieldname": "precision",
-   "fieldtype": "Select",
-   "label": "Precision",
-   "options": "\n0\n1\n2\n3\n4\n5\n6\n7\n8\n9"
+	"depends_on": "eval:in_list([\"Float\", \"Currency\", \"Percent\"], doc.fieldtype)",
+	"description": "Set non-standard precision for a Float or Currency field",
+	"fieldname": "precision",
+	"fieldtype": "Select",
+	"label": "Precision",
+	"options": "\n0\n1\n2\n3\n4\n5\n6\n7\n8\n9"
   },
   {
-   "fieldname": "options",
-   "fieldtype": "Small Text",
-   "in_list_view": 1,
-   "label": "Options",
-   "oldfieldname": "options",
-   "oldfieldtype": "Text"
+	"fieldname": "options",
+	"fieldtype": "Small Text",
+	"in_list_view": 1,
+	"label": "Options",
+	"oldfieldname": "options",
+	"oldfieldtype": "Text"
   },
   {
-   "fieldname": "fetch_from",
-   "fieldtype": "Small Text",
-   "label": "Fetch From"
+	"fieldname": "fetch_from",
+	"fieldtype": "Small Text",
+	"label": "Fetch From"
   },
   {
-   "default": "0",
-   "description": "If checked, this field will be not overwritten based on Fetch From if a value already exists.",
-   "fieldname": "fetch_if_empty",
-   "fieldtype": "Check",
-   "label": "Fetch If Empty"
+	"default": "0",
+	"description": "If checked, this field will be not overwritten based on Fetch From if a value already exists.",
+	"fieldname": "fetch_if_empty",
+	"fieldtype": "Check",
+	"label": "Fetch If Empty"
   },
   {
-   "fieldname": "options_help",
-   "fieldtype": "HTML",
-   "label": "Options Help",
-   "oldfieldtype": "HTML"
+	"fieldname": "options_help",
+	"fieldtype": "HTML",
+	"label": "Options Help",
+	"oldfieldtype": "HTML"
   },
   {
-   "fieldname": "section_break_11",
-   "fieldtype": "Section Break"
+	"fieldname": "section_break_11",
+	"fieldtype": "Section Break"
   },
   {
-   "default": "0",
-   "depends_on": "eval:doc.fieldtype==\"Section Break\"",
-   "fieldname": "collapsible",
-   "fieldtype": "Check",
-   "label": "Collapsible"
+	"default": "0",
+	"depends_on": "eval:doc.fieldtype==\"Section Break\"",
+	"fieldname": "collapsible",
+	"fieldtype": "Check",
+	"label": "Collapsible"
   },
   {
-   "depends_on": "eval:doc.fieldtype==\"Section Break\"",
-   "fieldname": "collapsible_depends_on",
-   "fieldtype": "Code",
-   "label": "Collapsible Depends On"
+	"depends_on": "eval:doc.fieldtype==\"Section Break\"",
+	"fieldname": "collapsible_depends_on",
+	"fieldtype": "Code",
+	"label": "Collapsible Depends On"
   },
   {
-   "fieldname": "default",
-   "fieldtype": "Text",
-   "label": "Default Value",
-   "oldfieldname": "default",
-   "oldfieldtype": "Text"
+	"fieldname": "default",
+	"fieldtype": "Text",
+	"label": "Default Value",
+	"oldfieldname": "default",
+	"oldfieldtype": "Text"
   },
   {
-   "fieldname": "depends_on",
-   "fieldtype": "Code",
-   "label": "Depends On",
-   "length": 255
+	"fieldname": "depends_on",
+	"fieldtype": "Code",
+	"label": "Depends On",
+	"length": 255
   },
   {
-   "fieldname": "description",
-   "fieldtype": "Text",
-   "label": "Field Description",
-   "oldfieldname": "description",
-   "oldfieldtype": "Text",
-   "print_width": "300px",
-   "width": "300px"
+	"fieldname": "description",
+	"fieldtype": "Text",
+	"label": "Field Description",
+	"oldfieldname": "description",
+	"oldfieldtype": "Text",
+	"print_width": "300px",
+	"width": "300px"
   },
   {
-   "default": "0",
-   "fieldname": "permlevel",
-   "fieldtype": "Int",
-   "label": "Permission Level",
-   "oldfieldname": "permlevel",
-   "oldfieldtype": "Int"
+	"default": "0",
+	"fieldname": "permlevel",
+	"fieldtype": "Int",
+	"label": "Permission Level",
+	"oldfieldname": "permlevel",
+	"oldfieldtype": "Int"
   },
   {
-   "fieldname": "width",
-   "fieldtype": "Data",
-   "label": "Width",
-   "oldfieldname": "width",
-   "oldfieldtype": "Data"
+	"fieldname": "width",
+	"fieldtype": "Data",
+	"label": "Width",
+	"oldfieldname": "width",
+	"oldfieldtype": "Data"
   },
   {
-   "description": "Number of columns for a field in a List View or a Grid (Total Columns should be less than 11)",
-   "fieldname": "columns",
-   "fieldtype": "Int",
-   "label": "Columns"
+	"description": "Number of columns for a field in a List View or a Grid (Total Columns should be less than 11)",
+	"fieldname": "columns",
+	"fieldtype": "Int",
+	"label": "Columns"
   },
   {
-   "fieldname": "properties",
-   "fieldtype": "Column Break",
-   "oldfieldtype": "Column Break",
-   "print_width": "50%",
-   "width": "50%"
+	"fieldname": "properties",
+	"fieldtype": "Column Break",
+	"oldfieldtype": "Column Break",
+	"print_width": "50%",
+	"width": "50%"
   },
   {
-   "default": "0",
-   "fieldname": "reqd",
-   "fieldtype": "Check",
-   "in_list_view": 1,
-   "label": "Is Mandatory Field",
-   "oldfieldname": "reqd",
-   "oldfieldtype": "Check"
+	"default": "0",
+	"fieldname": "reqd",
+	"fieldtype": "Check",
+	"in_list_view": 1,
+	"label": "Is Mandatory Field",
+	"oldfieldname": "reqd",
+	"oldfieldtype": "Check"
   },
   {
-   "default": "0",
-   "fieldname": "unique",
-   "fieldtype": "Check",
-   "label": "Unique"
+	"default": "0",
+	"fieldname": "unique",
+	"fieldtype": "Check",
+	"label": "Unique"
   },
   {
-   "default": "0",
-   "fieldname": "read_only",
-   "fieldtype": "Check",
-   "label": "Read Only"
+	"default": "0",
+	"fieldname": "read_only",
+	"fieldtype": "Check",
+	"label": "Read Only"
   },
   {
-   "default": "0",
-   "depends_on": "eval:doc.fieldtype===\"Link\"",
-   "fieldname": "ignore_user_permissions",
-   "fieldtype": "Check",
-   "label": "Ignore User Permissions"
+	"default": "0",
+	"depends_on": "eval:doc.fieldtype===\"Link\"",
+	"fieldname": "ignore_user_permissions",
+	"fieldtype": "Check",
+	"label": "Ignore User Permissions"
   },
   {
-   "default": "0",
-   "fieldname": "hidden",
-   "fieldtype": "Check",
-   "label": "Hidden"
+	"default": "0",
+	"fieldname": "hidden",
+	"fieldtype": "Check",
+	"label": "Hidden"
   },
   {
-   "default": "0",
-   "fieldname": "print_hide",
-   "fieldtype": "Check",
-   "label": "Print Hide",
-   "oldfieldname": "print_hide",
-   "oldfieldtype": "Check"
+	"default": "0",
+	"fieldname": "print_hide",
+	"fieldtype": "Check",
+	"label": "Print Hide",
+	"oldfieldname": "print_hide",
+	"oldfieldtype": "Check"
   },
   {
-   "default": "0",
-   "depends_on": "eval:[\"Int\", \"Float\", \"Currency\", \"Percent\"].indexOf(doc.fieldtype)!==-1",
-   "fieldname": "print_hide_if_no_value",
-   "fieldtype": "Check",
-   "label": "Print Hide If No Value"
+	"default": "0",
+	"depends_on": "eval:[\"Int\", \"Float\", \"Currency\", \"Percent\"].indexOf(doc.fieldtype)!==-1",
+	"fieldname": "print_hide_if_no_value",
+	"fieldtype": "Check",
+	"label": "Print Hide If No Value"
   },
   {
-   "fieldname": "print_width",
-   "fieldtype": "Data",
-   "hidden": 1,
-   "label": "Print Width",
-   "no_copy": 1,
-   "print_hide": 1
+	"fieldname": "print_width",
+	"fieldtype": "Data",
+	"hidden": 1,
+	"label": "Print Width",
+	"no_copy": 1,
+	"print_hide": 1
   },
   {
-   "default": "0",
-   "fieldname": "no_copy",
-   "fieldtype": "Check",
-   "label": "No Copy",
-   "oldfieldname": "no_copy",
-   "oldfieldtype": "Check"
+	"default": "0",
+	"fieldname": "no_copy",
+	"fieldtype": "Check",
+	"label": "No Copy",
+	"oldfieldname": "no_copy",
+	"oldfieldtype": "Check"
   },
   {
-   "default": "0",
-   "fieldname": "allow_on_submit",
-   "fieldtype": "Check",
-   "label": "Allow on Submit",
-   "oldfieldname": "allow_on_submit",
-   "oldfieldtype": "Check"
+	"default": "0",
+	"fieldname": "allow_on_submit",
+	"fieldtype": "Check",
+	"label": "Allow on Submit",
+	"oldfieldname": "allow_on_submit",
+	"oldfieldtype": "Check"
   },
   {
-   "default": "0",
-   "fieldname": "in_list_view",
-   "fieldtype": "Check",
-   "label": "In List View"
+	"default": "0",
+	"fieldname": "in_list_view",
+	"fieldtype": "Check",
+	"label": "In List View"
   },
   {
-   "default": "0",
-   "fieldname": "in_standard_filter",
-   "fieldtype": "Check",
-   "label": "In Standard Filter"
+	"default": "0",
+	"fieldname": "in_standard_filter",
+	"fieldtype": "Check",
+	"label": "In Standard Filter"
   },
   {
-   "default": "0",
-   "depends_on": "eval:([\"Data\", \"Select\", \"Table\", \"Text\", \"Text Editor\", \"Link\", \"Small Text\", \"Long Text\", \"Read Only\", \"Heading\", \"Dynamic Link\"].indexOf(doc.fieldtype) !== -1)",
-   "fieldname": "in_global_search",
-   "fieldtype": "Check",
-   "label": "In Global Search"
+	"default": "0",
+	"depends_on": "eval:([\"Data\", \"Select\", \"Table\", \"Text\", \"Text Editor\", \"Link\", \"Small Text\", \"Long Text\", \"Read Only\", \"Heading\", \"Dynamic Link\"].indexOf(doc.fieldtype) !== -1)",
+	"fieldname": "in_global_search",
+	"fieldtype": "Check",
+	"label": "In Global Search"
   },
   {
-   "default": "0",
-   "fieldname": "bold",
-   "fieldtype": "Check",
-   "label": "Bold"
+	"default": "0",
+	"fieldname": "bold",
+	"fieldtype": "Check",
+	"label": "Bold"
   },
   {
-   "default": "0",
-   "fieldname": "report_hide",
-   "fieldtype": "Check",
-   "label": "Report Hide",
-   "oldfieldname": "report_hide",
-   "oldfieldtype": "Check"
+	"default": "0",
+	"fieldname": "report_hide",
+	"fieldtype": "Check",
+	"label": "Report Hide",
+	"oldfieldname": "report_hide",
+	"oldfieldtype": "Check"
   },
   {
-   "default": "0",
-   "fieldname": "search_index",
-   "fieldtype": "Check",
-   "hidden": 1,
-   "label": "Index",
-   "no_copy": 1,
-   "print_hide": 1
+	"default": "0",
+	"fieldname": "search_index",
+	"fieldtype": "Check",
+	"hidden": 1,
+	"label": "Index",
+	"no_copy": 1,
+	"print_hide": 1
   },
   {
-   "default": "0",
-   "description": "Don't HTML Encode HTML tags like <script> or just characters like < or >, as they could be intentionally used in this field",
-   "fieldname": "ignore_xss_filter",
-   "fieldtype": "Check",
-   "label": "Ignore XSS Filter"
+	"default": "0",
+	"description": "Don't HTML Encode HTML tags like <script> or just characters like < or >, as they could be intentionally used in this field",
+	"fieldname": "ignore_xss_filter",
+	"fieldtype": "Check",
+	"label": "Ignore XSS Filter"
   },
   {
-   "default": "1",
-   "depends_on": "eval:['Data', 'Select', 'Text', 'Small Text', 'Text Editor'].includes(doc.fieldtype)",
-   "fieldname": "translatable",
-   "fieldtype": "Check",
-   "label": "Translatable"
+	"default": "1",
+	"depends_on": "eval:['Data', 'Select', 'Text', 'Small Text', 'Text Editor'].includes(doc.fieldtype)",
+	"fieldname": "translatable",
+	"fieldtype": "Check",
+	"label": "Translatable"
   },
   {
-   "depends_on": "eval:in_list(['Data', 'Link', 'Dynamic Link', 'Password', 'Select', 'Read Only', 'Attach', 'Attach Image', 'Int'], doc.fieldtype)",
-   "fieldname": "length",
-   "fieldtype": "Int",
-   "label": "Length"
+	"depends_on": "eval:in_list(['Data', 'Link', 'Dynamic Link', 'Password', 'Select', 'Read Only', 'Attach', 'Attach Image', 'Int'], doc.fieldtype)",
+	"fieldname": "length",
+	"fieldtype": "Int",
+	"label": "Length"
   },
   {
-   "fieldname": "mandatory_depends_on",
-   "fieldtype": "Code",
-   "label": "Mandatory Depends On",
-   "length": 255
+	"fieldname": "mandatory_depends_on",
+	"fieldtype": "Code",
+	"label": "Mandatory Depends On",
+	"length": 255
   },
   {
-   "fieldname": "read_only_depends_on",
-   "fieldtype": "Code",
-   "label": "Read Only Depends On",
-   "length": 255
+	"fieldname": "read_only_depends_on",
+	"fieldtype": "Code",
+	"label": "Read Only Depends On",
+	"length": 255
   },
   {
-   "default": "0",
-   "fieldname": "allow_in_quick_entry",
-   "fieldtype": "Check",
-   "label": "Allow in Quick Entry"
+	"default": "0",
+	"fieldname": "allow_in_quick_entry",
+	"fieldtype": "Check",
+	"label": "Allow in Quick Entry"
   },
   {
-   "default": "0",
-   "fieldname": "in_preview",
-   "fieldtype": "Check",
-   "label": "In Preview"
+	"default": "0",
+	"fieldname": "in_preview",
+	"fieldtype": "Check",
+	"label": "In Preview"
+  },
+  {
+	"default": "1",
+	"depends_on": "eval:doc.fieldtype === \"Duration\";",
+	"fieldname": "show_seconds",
+	"fieldtype": "Check",
+	"label": "Show Seconds",
+	"show_days": 1,
+	"show_seconds": 1
+  },
+  {
+	"default": "1",
+	"depends_on": "eval:doc.fieldtype === \"Duration\";",
+	"fieldname": "show_days",
+	"fieldtype": "Check",
+	"label": "Show Days",
+	"show_days": 1,
+	"show_seconds": 1
+  },
+  {
+	"default": "0",
+	"depends_on": "eval:doc.fieldtype=='Section Break'",
+	"fieldname": "hide_border",
+	"fieldtype": "Check",
+	"label": "Hide Border"
   }
  ],
  "icon": "fa fa-glass",
  "idx": 1,
  "links": [],
- "modified": "2020-04-10 11:57:10.392218",
+ "modified": "2020-05-15 23:43:00.123572",
  "modified_by": "Administrator",
  "module": "Custom",
  "name": "Custom Field",
  "owner": "Administrator",
  "permissions": [
   {
-   "create": 1,
-   "delete": 1,
-   "email": 1,
-   "print": 1,
-   "read": 1,
-   "report": 1,
-   "role": "Administrator",
-   "share": 1,
-   "write": 1
+	"create": 1,
+	"delete": 1,
+	"email": 1,
+	"print": 1,
+	"read": 1,
+	"report": 1,
+	"role": "Administrator",
+	"share": 1,
+	"write": 1
   },
   {
-   "create": 1,
-   "delete": 1,
-   "email": 1,
-   "print": 1,
-   "read": 1,
-   "report": 1,
-   "role": "System Manager",
-   "share": 1,
-   "write": 1
+	"create": 1,
+	"delete": 1,
+	"email": 1,
+	"print": 1,
+	"read": 1,
+	"report": 1,
+	"role": "System Manager",
+	"share": 1,
+	"write": 1
   }
  ],
  "search_fields": "dt,label,fieldtype,options",

frappe/custom/doctype/custom_field/custom_field.py

@@ -46,6 +46,9 @@ class CustomField(Document):
 		if not self.fieldname:
 			frappe.throw(_("Fieldname not set for Custom Field"))
 
+		if self.fieldname in fieldnames:
+			frappe.throw(_("A field with the name '{}' already exists in doctype {}.").format(self.fieldname, self.dt))
+
 		if self.get('translatable', 0) and not supports_translation(self.fieldtype):
 			self.translatable = 0
 

frappe/custom/doctype/custom_link/custom_link.js

@@ -0,0 +1,20 @@
+// Copyright (c) 2020, Frappe Technologies and contributors
+// For license information, please see license.txt
+
+frappe.ui.form.on('Custom Link', {
+	refresh: function(frm) {
+		frm.set_query("document_type", function () {
+			return {
+				filters: {
+					custom: 0,
+					istable: 0,
+					module: ['not in', ["Email", "Core", "Custom", "Event Streaming", "Social", "Data Migration", "Geo", "Desk"]]
+				}
+			};
+		});
+
+		frm.add_custom_button(__('Go to {0} List', [frm.doc.document_type]), function() {
+			frappe.set_route('List', frm.doc.document_type);
+		});
+	}
+});

frappe/custom/doctype/custom_link/custom_link.json

@@ -0,0 +1,52 @@
+{
+ "actions": [],
+ "autoname": "field:document_type",
+ "creation": "2020-04-08 15:16:44.342509",
+ "doctype": "DocType",
+ "editable_grid": 1,
+ "engine": "InnoDB",
+ "field_order": [
+  "document_type",
+  "links"
+ ],
+ "fields": [
+  {
+   "fieldname": "document_type",
+   "fieldtype": "Link",
+   "in_list_view": 1,
+   "label": "Document Type",
+   "options": "DocType",
+   "reqd": 1,
+   "unique": 1
+  },
+  {
+   "fieldname": "links",
+   "fieldtype": "Table",
+   "label": "Links",
+   "options": "DocType Link"
+  }
+ ],
+ "links": [],
+ "modified": "2020-04-08 16:42:59.402671",
+ "modified_by": "Administrator",
+ "module": "Custom",
+ "name": "Custom Link",
+ "owner": "Administrator",
+ "permissions": [
+  {
+   "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
+}

frappe/custom/doctype/custom_link/custom_link.py

@@ -1,10 +1,10 @@
 # -*- coding: utf-8 -*-
-# Copyright (c) 2019, Frappe Technologies and contributors
+# 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 ListViewSetting(Document):
+class CustomLink(Document):
 	pass

frappe/custom/doctype/custom_link/test_custom_link.py

@@ -6,5 +6,5 @@ from __future__ import unicode_literals
 # import frappe
 import unittest
 
-class TestOnboarding(unittest.TestCase):
+class TestCustomLink(unittest.TestCase):
 	pass

frappe/custom/doctype/customize_form/customize_form.py

@@ -76,7 +76,8 @@ docfield_properties = {
 	'remember_last_selected_value': 'Check',
 	'allow_bulk_edit': 'Check',
 	'auto_repeat': 'Link',
-	'allow_in_quick_entry': 'Check'
+	'allow_in_quick_entry': 'Check',
+	'hide_border': 'Check'
 }
 
 allowed_fieldtype_change = (('Currency', 'Float', 'Percent'), ('Small Text', 'Data'),

frappe/custom/doctype/customize_form_field/customize_form_field.json

@@ -11,6 +11,8 @@
   "label",
   "fieldtype",
   "fieldname",
+  "show_seconds",
+  "show_days",
   "reqd",
   "unique",
   "in_list_view",
@@ -39,6 +41,7 @@
   "allow_on_submit",
   "report_hide",
   "remember_last_selected_value",
+  "hide_border",
   "property_depends_on_section",
   "mandatory_depends_on",
   "column_break_33",
@@ -57,343 +60,368 @@
  ],
  "fields": [
   {
-   "fieldname": "label_and_type",
-   "fieldtype": "Section Break",
-   "label": "Label and Type"
+	"fieldname": "label_and_type",
+	"fieldtype": "Section Break",
+	"label": "Label and Type"
   },
   {
-   "fieldname": "label",
-   "fieldtype": "Data",
-   "in_list_view": 1,
-   "label": "Label",
-   "oldfieldname": "label",
-   "oldfieldtype": "Data",
-   "search_index": 1
+	"fieldname": "label",
+	"fieldtype": "Data",
+	"in_list_view": 1,
+	"label": "Label",
+	"oldfieldname": "label",
+	"oldfieldtype": "Data",
+	"search_index": 1
   },
   {
-   "default": "Data",
-   "fieldname": "fieldtype",
-   "fieldtype": "Select",
-   "in_list_view": 1,
-   "label": "Type",
-   "oldfieldname": "fieldtype",
-   "oldfieldtype": "Select",
-   "options": "Attach\nAttach Image\nBarcode\nButton\nCheck\nCode\nColor\nColumn Break\nCurrency\nData\nDate\nDatetime\nDynamic Link\nFloat\nFold\nGeolocation\nHeading\nHTML\nHTML Editor\nImage\nInt\nLink\nLong Text\nMarkdown Editor\nPassword\nPercent\nRating\nRead Only\nSection Break\nSelect\nSignature\nSmall Text\nTable\nTable MultiSelect\nText\nText Editor\nTime",
-   "reqd": 1,
-   "search_index": 1
+	"default": "Data",
+	"fieldname": "fieldtype",
+	"fieldtype": "Select",
+	"in_list_view": 1,
+	"label": "Type",
+	"oldfieldname": "fieldtype",
+	"oldfieldtype": "Select",
+	"options": "Attach\nAttach Image\nBarcode\nButton\nCheck\nCode\nColor\nColumn Break\nCurrency\nData\nDate\nDatetime\nDuration\nDynamic Link\nFloat\nFold\nGeolocation\nHeading\nHTML\nHTML Editor\nImage\nInt\nLink\nLong Text\nMarkdown Editor\nPassword\nPercent\nRating\nRead Only\nSection Break\nSelect\nSignature\nSmall Text\nTable\nTable MultiSelect\nText\nText Editor\nTime",
+	"reqd": 1,
+	"search_index": 1
   },
   {
-   "fieldname": "fieldname",
-   "fieldtype": "Data",
-   "in_list_view": 1,
-   "label": "Name",
-   "oldfieldname": "fieldname",
-   "oldfieldtype": "Data",
-   "read_only": 1,
-   "search_index": 1
+	"fieldname": "fieldname",
+	"fieldtype": "Data",
+	"in_list_view": 1,
+	"label": "Name",
+	"oldfieldname": "fieldname",
+	"oldfieldtype": "Data",
+	"read_only": 1,
+	"search_index": 1
   },
   {
-   "default": "0",
-   "depends_on": "eval:!in_list([\"Section Break\", \"Column Break\", \"Button\", \"HTML\"], doc.fieldtype)",
-   "fieldname": "reqd",
-   "fieldtype": "Check",
-   "label": "Mandatory",
-   "oldfieldname": "reqd",
-   "oldfieldtype": "Check",
-   "print_width": "50px",
-   "width": "50px"
+	"default": "0",
+	"depends_on": "eval:!in_list([\"Section Break\", \"Column Break\", \"Button\", \"HTML\"], doc.fieldtype)",
+	"fieldname": "reqd",
+	"fieldtype": "Check",
+	"label": "Mandatory",
+	"oldfieldname": "reqd",
+	"oldfieldtype": "Check",
+	"print_width": "50px",
+	"width": "50px"
   },
   {
-   "default": "0",
-   "fieldname": "unique",
-   "fieldtype": "Check",
-   "label": "Unique"
+	"default": "0",
+	"fieldname": "unique",
+	"fieldtype": "Check",
+	"label": "Unique"
   },
   {
-   "default": "0",
-   "fieldname": "in_list_view",
-   "fieldtype": "Check",
-   "label": "In List View"
+	"default": "0",
+	"fieldname": "in_list_view",
+	"fieldtype": "Check",
+	"label": "In List View"
   },
   {
-   "default": "0",
-   "fieldname": "in_standard_filter",
-   "fieldtype": "Check",
-   "label": "In Standard Filter"
+	"default": "0",
+	"fieldname": "in_standard_filter",
+	"fieldtype": "Check",
+	"label": "In Standard Filter"
   },
   {
-   "default": "0",
-   "depends_on": "eval:([\"Data\", \"Select\", \"Table\", \"Text\", \"Text Editor\", \"Link\", \"Small Text\", \"Long Text\", \"Read Only\", \"Heading\", \"Dynamic Link\"].indexOf(doc.fieldtype) !== -1)",
-   "fieldname": "in_global_search",
-   "fieldtype": "Check",
-   "label": "In Global Search"
+	"default": "0",
+	"depends_on": "eval:([\"Data\", \"Select\", \"Table\", \"Text\", \"Text Editor\", \"Link\", \"Small Text\", \"Long Text\", \"Read Only\", \"Heading\", \"Dynamic Link\"].indexOf(doc.fieldtype) !== -1)",
+	"fieldname": "in_global_search",
+	"fieldtype": "Check",
+	"label": "In Global Search"
   },
   {
-   "default": "0",
-   "fieldname": "bold",
-   "fieldtype": "Check",
-   "label": "Bold"
+	"default": "0",
+	"fieldname": "bold",
+	"fieldtype": "Check",
+	"label": "Bold"
   },
   {
-   "default": "1",
-   "depends_on": "eval:['Data', 'Select', 'Text', 'Small Text', 'Text Editor'].includes(doc.fieldtype)",
-   "fieldname": "translatable",
-   "fieldtype": "Check",
-   "label": "Translatable"
+	"default": "1",
+	"depends_on": "eval:['Data', 'Select', 'Text', 'Small Text', 'Text Editor'].includes(doc.fieldtype)",
+	"fieldname": "translatable",
+	"fieldtype": "Check",
+	"label": "Translatable"
   },
   {
-   "fieldname": "column_break_7",
-   "fieldtype": "Column Break"
+	"fieldname": "column_break_7",
+	"fieldtype": "Column Break"
   },
   {
-   "depends_on": "eval:in_list([\"Float\", \"Currency\", \"Percent\"], doc.fieldtype)",
-   "description": "Set non-standard precision for a Float or Currency field",
-   "fieldname": "precision",
-   "fieldtype": "Select",
-   "label": "Precision",
-   "options": "\n0\n1\n2\n3\n4\n5\n6\n7\n8\n9"
+	"depends_on": "eval:in_list([\"Float\", \"Currency\", \"Percent\"], doc.fieldtype)",
+	"description": "Set non-standard precision for a Float or Currency field",
+	"fieldname": "precision",
+	"fieldtype": "Select",
+	"label": "Precision",
+	"options": "\n0\n1\n2\n3\n4\n5\n6\n7\n8\n9"
   },
   {
-   "depends_on": "eval:in_list(['Data', 'Link', 'Dynamic Link', 'Password', 'Select', 'Read Only', 'Attach', 'Attach Image'], doc.fieldtype)",
-   "fieldname": "length",
-   "fieldtype": "Int",
-   "label": "Length"
+	"depends_on": "eval:in_list(['Data', 'Link', 'Dynamic Link', 'Password', 'Select', 'Read Only', 'Attach', 'Attach Image'], doc.fieldtype)",
+	"fieldname": "length",
+	"fieldtype": "Int",
+	"label": "Length"
   },
   {
-   "description": "For Links, enter the DocType as range.\nFor Select, enter list of Options, each on a new line.",
-   "fieldname": "options",
-   "fieldtype": "Small Text",
-   "in_list_view": 1,
-   "label": "Options",
-   "oldfieldname": "options",
-   "oldfieldtype": "Text"
+	"description": "For Links, enter the DocType as range.\nFor Select, enter list of Options, each on a new line.",
+	"fieldname": "options",
+	"fieldtype": "Small Text",
+	"in_list_view": 1,
+	"label": "Options",
+	"oldfieldname": "options",
+	"oldfieldtype": "Text"
   },
   {
-   "fieldname": "fetch_from",
-   "fieldtype": "Small Text",
-   "label": "Fetch From"
+	"fieldname": "fetch_from",
+	"fieldtype": "Small Text",
+	"label": "Fetch From"
   },
   {
-   "default": "0",
-   "description": "If checked, this field will be not overwritten based on Fetch From if a value already exists.",
-   "fieldname": "fetch_if_empty",
-   "fieldtype": "Check",
-   "label": "Fetch If Empty"
+	"default": "0",
+	"description": "If checked, this field will be not overwritten based on Fetch From if a value already exists.",
+	"fieldname": "fetch_if_empty",
+	"fieldtype": "Check",
+	"label": "Fetch If Empty"
   },
   {
-   "fieldname": "permissions",
-   "fieldtype": "Section Break",
-   "label": "Permissions"
+	"fieldname": "permissions",
+	"fieldtype": "Section Break",
+	"label": "Permissions"
   },
   {
-   "description": "This field will appear only if the fieldname defined here has value OR the rules are true (examples): \nmyfield\neval:doc.myfield=='My Value'\neval:doc.age>18",
-   "fieldname": "depends_on",
-   "fieldtype": "Code",
-   "label": "Depends On",
-   "oldfieldname": "depends_on",
-   "oldfieldtype": "Data",
-   "options": "JS"
+	"description": "This field will appear only if the fieldname defined here has value OR the rules are true (examples): \nmyfield\neval:doc.myfield=='My Value'\neval:doc.age>18",
+	"fieldname": "depends_on",
+	"fieldtype": "Code",
+	"label": "Depends On",
+	"oldfieldname": "depends_on",
+	"oldfieldtype": "Data",
+	"options": "JS"
   },
   {
-   "default": "0",
-   "fieldname": "permlevel",
-   "fieldtype": "Int",
-   "in_list_view": 1,
-   "label": "Perm Level",
-   "oldfieldname": "permlevel",
-   "oldfieldtype": "Int"
+	"default": "0",
+	"fieldname": "permlevel",
+	"fieldtype": "Int",
+	"in_list_view": 1,
+	"label": "Perm Level",
+	"oldfieldname": "permlevel",
+	"oldfieldtype": "Int"
   },
   {
-   "default": "0",
-   "fieldname": "hidden",
-   "fieldtype": "Check",
-   "label": "Hidden",
-   "oldfieldname": "hidden",
-   "oldfieldtype": "Check",
-   "print_width": "50px",
-   "width": "50px"
+	"default": "0",
+	"fieldname": "hidden",
+	"fieldtype": "Check",
+	"label": "Hidden",
+	"oldfieldname": "hidden",
+	"oldfieldtype": "Check",
+	"print_width": "50px",
+	"width": "50px"
   },
   {
-   "default": "0",
-   "fieldname": "read_only",
-   "fieldtype": "Check",
-   "label": "Read Only"
+	"default": "0",
+	"fieldname": "read_only",
+	"fieldtype": "Check",
+	"label": "Read Only"
   },
   {
-   "default": "0",
-   "depends_on": "eval:doc.fieldtype==\"Section Break\"",
-   "fieldname": "collapsible",
-   "fieldtype": "Check",
-   "label": "Collapsible"
+	"default": "0",
+	"depends_on": "eval:doc.fieldtype==\"Section Break\"",
+	"fieldname": "collapsible",
+	"fieldtype": "Check",
+	"label": "Collapsible"
   },
   {
-   "default": "0",
-   "depends_on": "eval: doc.fieldtype == \"Table\"",
-   "fieldname": "allow_bulk_edit",
-   "fieldtype": "Check",
-   "label": "Allow Bulk Edit"
+	"default": "0",
+	"depends_on": "eval: doc.fieldtype == \"Table\"",
+	"fieldname": "allow_bulk_edit",
+	"fieldtype": "Check",
+	"label": "Allow Bulk Edit"
   },
   {
-   "depends_on": "eval:doc.fieldtype==\"Section Break\"",
-   "fieldname": "collapsible_depends_on",
-   "fieldtype": "Code",
-   "label": "Collapsible Depends On",
-   "options": "JS"
+	"depends_on": "eval:doc.fieldtype==\"Section Break\"",
+	"fieldname": "collapsible_depends_on",
+	"fieldtype": "Code",
+	"label": "Collapsible Depends On",
+	"options": "JS"
   },
   {
-   "fieldname": "column_break_14",
-   "fieldtype": "Column Break"
+	"fieldname": "column_break_14",
+	"fieldtype": "Column Break"
   },
   {
-   "default": "0",
-   "fieldname": "ignore_user_permissions",
-   "fieldtype": "Check",
-   "label": "Ignore User Permissions"
+	"default": "0",
+	"fieldname": "ignore_user_permissions",
+	"fieldtype": "Check",
+	"label": "Ignore User Permissions"
   },
   {
-   "default": "0",
-   "fieldname": "allow_on_submit",
-   "fieldtype": "Check",
-   "label": "Allow on Submit",
-   "oldfieldname": "allow_on_submit",
-   "oldfieldtype": "Check"
+	"default": "0",
+	"fieldname": "allow_on_submit",
+	"fieldtype": "Check",
+	"label": "Allow on Submit",
+	"oldfieldname": "allow_on_submit",
+	"oldfieldtype": "Check"
   },
   {
-   "default": "0",
-   "fieldname": "report_hide",
-   "fieldtype": "Check",
-   "label": "Report Hide",
-   "oldfieldname": "report_hide",
-   "oldfieldtype": "Check"
+	"default": "0",
+	"fieldname": "report_hide",
+	"fieldtype": "Check",
+	"label": "Report Hide",
+	"oldfieldname": "report_hide",
+	"oldfieldtype": "Check"
   },
   {
-   "default": "0",
-   "depends_on": "eval:(doc.fieldtype == 'Link')",
-   "fieldname": "remember_last_selected_value",
-   "fieldtype": "Check",
-   "label": "Remember Last Selected Value"
+	"default": "0",
+	"depends_on": "eval:(doc.fieldtype == 'Link')",
+	"fieldname": "remember_last_selected_value",
+	"fieldtype": "Check",
+	"label": "Remember Last Selected Value"
   },
   {
-   "fieldname": "display",
-   "fieldtype": "Section Break",
-   "label": "Display"
+	"fieldname": "display",
+	"fieldtype": "Section Break",
+	"label": "Display"
   },
   {
-   "fieldname": "default",
-   "fieldtype": "Text",
-   "label": "Default",
-   "oldfieldname": "default",
-   "oldfieldtype": "Text"
+	"fieldname": "default",
+	"fieldtype": "Text",
+	"label": "Default",
+	"oldfieldname": "default",
+	"oldfieldtype": "Text"
   },
   {
-   "default": "0",
-   "fieldname": "in_filter",
-   "fieldtype": "Check",
-   "label": "In Filter",
-   "oldfieldname": "in_filter",
-   "oldfieldtype": "Check",
-   "print_width": "50px",
-   "width": "50px"
+	"default": "0",
+	"fieldname": "in_filter",
+	"fieldtype": "Check",
+	"label": "In Filter",
+	"oldfieldname": "in_filter",
+	"oldfieldtype": "Check",
+	"print_width": "50px",
+	"width": "50px"
   },
   {
-   "fieldname": "column_break_21",
-   "fieldtype": "Column Break"
+	"fieldname": "column_break_21",
+	"fieldtype": "Column Break"
   },
   {
-   "fieldname": "description",
-   "fieldtype": "Text",
-   "label": "Description",
-   "oldfieldname": "description",
-   "oldfieldtype": "Text",
-   "print_width": "300px",
-   "width": "300px"
+	"fieldname": "description",
+	"fieldtype": "Text",
+	"label": "Description",
+	"oldfieldname": "description",
+	"oldfieldtype": "Text",
+	"print_width": "300px",
+	"width": "300px"
   },
   {
-   "default": "0",
-   "fieldname": "print_hide",
-   "fieldtype": "Check",
-   "label": "Print Hide",
-   "oldfieldname": "print_hide",
-   "oldfieldtype": "Check"
+	"default": "0",
+	"fieldname": "print_hide",
+	"fieldtype": "Check",
+	"label": "Print Hide",
+	"oldfieldname": "print_hide",
+	"oldfieldtype": "Check"
   },
   {
-   "default": "0",
-   "depends_on": "eval:[\"Int\", \"Float\", \"Currency\", \"Percent\"].indexOf(doc.fieldtype)!==-1",
-   "fieldname": "print_hide_if_no_value",
-   "fieldtype": "Check",
-   "label": "Print Hide If No Value"
+	"default": "0",
+	"depends_on": "eval:[\"Int\", \"Float\", \"Currency\", \"Percent\"].indexOf(doc.fieldtype)!==-1",
+	"fieldname": "print_hide_if_no_value",
+	"fieldtype": "Check",
+	"label": "Print Hide If No Value"
   },
   {
-   "description": "Print Width of the field, if the field is a column in a table",
-   "fieldname": "print_width",
-   "fieldtype": "Data",
-   "label": "Print Width",
-   "print_width": "50px",
-   "width": "50px"
+	"description": "Print Width of the field, if the field is a column in a table",
+	"fieldname": "print_width",
+	"fieldtype": "Data",
+	"label": "Print Width",
+	"print_width": "50px",
+	"width": "50px"
   },
   {
-   "depends_on": "eval:cur_frm.doc.istable",
-   "description": "Number of columns for a field in a Grid (Total Columns in a grid should be less than 11)",
-   "fieldname": "columns",
-   "fieldtype": "Int",
-   "label": "Columns"
+	"depends_on": "eval:cur_frm.doc.istable",
+	"description": "Number of columns for a field in a Grid (Total Columns in a grid should be less than 11)",
+	"fieldname": "columns",
+	"fieldtype": "Int",
+	"label": "Columns"
   },
   {
-   "fieldname": "width",
-   "fieldtype": "Data",
-   "in_list_view": 1,
-   "label": "Width",
-   "oldfieldname": "width",
-   "oldfieldtype": "Data",
-   "print_width": "50px",
-   "width": "50px"
+	"fieldname": "width",
+	"fieldtype": "Data",
+	"in_list_view": 1,
+	"label": "Width",
+	"oldfieldname": "width",
+	"oldfieldtype": "Data",
+	"print_width": "50px",
+	"width": "50px"
   },
   {
-   "default": "0",
-   "fieldname": "is_custom_field",
-   "fieldtype": "Check",
-   "hidden": 1,
-   "label": "Is Custom Field",
-   "read_only": 1
+	"default": "0",
+	"fieldname": "is_custom_field",
+	"fieldtype": "Check",
+	"hidden": 1,
+	"label": "Is Custom Field",
+	"read_only": 1
   },
   {
-   "default": "0",
-   "fieldname": "allow_in_quick_entry",
-   "fieldtype": "Check",
-   "label": "Allow in Quick Entry"
+	"default": "0",
+	"fieldname": "allow_in_quick_entry",
+	"fieldtype": "Check",
+	"label": "Allow in Quick Entry"
   },
   {
-   "fieldname": "property_depends_on_section",
-   "fieldtype": "Section Break",
-   "label": "Property Depends On"
+	"fieldname": "property_depends_on_section",
+	"fieldtype": "Section Break",
+	"label": "Property Depends On"
   },
   {
-   "fieldname": "mandatory_depends_on",
-   "fieldtype": "Code",
-   "label": "Mandatory Depends On",
-   "options": "JS"
+	"fieldname": "mandatory_depends_on",
+	"fieldtype": "Code",
+	"label": "Mandatory Depends On",
+	"options": "JS"
   },
   {
-   "fieldname": "column_break_33",
-   "fieldtype": "Column Break"
+	"fieldname": "column_break_33",
+	"fieldtype": "Column Break"
   },
   {
-   "fieldname": "read_only_depends_on",
-   "fieldtype": "Code",
-   "label": "Read Only Depends On",
-   "options": "JS"
+	"fieldname": "read_only_depends_on",
+	"fieldtype": "Code",
+	"label": "Read Only Depends On",
+	"options": "JS"
   },
   {
-   "default": "0",
-   "fieldname": "in_preview",
-   "fieldtype": "Check",
-   "label": "In Preview"
+	"default": "0",
+	"fieldname": "in_preview",
+	"fieldtype": "Check",
+	"label": "In Preview"
+  },
+  {
+	"default": "1",
+	"depends_on": "eval:doc.fieldtype === \"Duration\";",
+	"fieldname": "show_seconds",
+	"fieldtype": "Check",
+	"label": "Show Seconds",
+	"show_days": 1,
+	"show_seconds": 1
+  },
+  {
+	"default": "1",
+	"depends_on": "eval:doc.fieldtype === \"Duration\";",
+	"fieldname": "show_days",
+	"fieldtype": "Check",
+	"label": "Show Days",
+	"show_days": 1,
+	"show_seconds": 1
+  },
+  {
+	"default": "0",
+	"depends_on": "eval:doc.fieldtype=='Section Break'",
+	"fieldname": "hide_border",
+	"fieldtype": "Check",
+	"label": "Hide Border"
   }
  ],
  "idx": 1,
  "istable": 1,
  "links": [],
- "modified": "2020-04-10 11:58:44.573537",
+ "modified": "2020-05-15 23:45:46.810869",
  "modified_by": "Administrator",
  "module": "Custom",
  "name": "Customize Form Field",

frappe/custom/doctype/package_document_type/package_document_type.json

@@ -0,0 +1,65 @@
+{
+ "actions": [],
+ "creation": "2020-05-14 16:45:47.196395",
+ "doctype": "DocType",
+ "editable_grid": 1,
+ "engine": "InnoDB",
+ "field_order": [
+  "document_type",
+  "column_break_2",
+  "attachments",
+  "overwrite",
+  "section_break_4",
+  "filters_json"
+ ],
+ "fields": [
+  {
+   "fieldname": "document_type",
+   "fieldtype": "Link",
+   "in_list_view": 1,
+   "label": "Document Type",
+   "options": "DocType",
+   "reqd": 1
+  },
+  {
+   "fieldname": "column_break_2",
+   "fieldtype": "Column Break"
+  },
+  {
+   "default": "0",
+   "fieldname": "attachments",
+   "fieldtype": "Check",
+   "in_list_view": 1,
+   "label": "Include Attachments"
+  },
+  {
+   "default": "0",
+   "fieldname": "overwrite",
+   "fieldtype": "Check",
+   "in_list_view": 1,
+   "label": "Overwrite"
+  },
+  {
+   "fieldname": "section_break_4",
+   "fieldtype": "Section Break"
+  },
+  {
+   "fieldname": "filters_json",
+   "fieldtype": "Code",
+   "label": "Filters",
+   "options": "JSON"
+  }
+ ],
+ "istable": 1,
+ "links": [],
+ "modified": "2020-05-14 16:45:47.196395",
+ "modified_by": "Administrator",
+ "module": "Custom",
+ "name": "Package Document Type",
+ "owner": "Administrator",
+ "permissions": [],
+ "quick_entry": 1,
+ "sort_field": "modified",
+ "sort_order": "DESC",
+ "track_changes": 1
+}

frappe/custom/doctype/package_document_type/package_document_type.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 PackageDocumentType(Document):
+	pass

frappe/custom/doctype/package_publish_target/package_publish_target.json

@@ -0,0 +1,47 @@
+{
+ "actions": [],
+ "creation": "2020-05-13 16:04:32.724663",
+ "doctype": "DocType",
+ "editable_grid": 1,
+ "engine": "InnoDB",
+ "field_order": [
+  "instance_url",
+  "username",
+  "password"
+ ],
+ "fields": [
+  {
+   "fieldname": "instance_url",
+   "fieldtype": "Data",
+   "in_list_view": 1,
+   "label": "Site URL",
+   "reqd": 1
+  },
+  {
+   "fieldname": "username",
+   "fieldtype": "Data",
+   "in_list_view": 1,
+   "label": "Username",
+   "reqd": 1
+  },
+  {
+   "fieldname": "password",
+   "fieldtype": "Password",
+   "in_list_view": 1,
+   "label": "Password",
+   "reqd": 1
+  }
+ ],
+ "istable": 1,
+ "links": [],
+ "modified": "2020-05-15 17:35:16.282235",
+ "modified_by": "Administrator",
+ "module": "Custom",
+ "name": "Package Publish Target",
+ "owner": "Administrator",
+ "permissions": [],
+ "quick_entry": 1,
+ "sort_field": "modified",
+ "sort_order": "DESC",
+ "track_changes": 1
+}

frappe/custom/doctype/package_publish_target/package_publish_target.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 PackagePublishTarget(Document):
+	pass

frappe/custom/doctype/package_publish_tool/package_publish_tool.js

@@ -0,0 +1,159 @@
+// Copyright (c) 2020, Frappe Technologies and contributors
+// For license information, please see license.txt
+
+frappe.ui.form.on('Package Publish Tool', {
+	refresh: function(frm) {
+		frm.set_query("document_type", "package_details", function () {
+			return {
+				filters: {
+					"istable": 0,
+				}
+			};
+		});
+
+		frappe.realtime.on("package", (data) => {
+			frm.dashboard.show_progress(data.prefix, data.progress / data.total * 100, __("{0}", [data.message]));
+			if ((data.progress+1) != data.total) {
+				frm.dashboard.show_progress(data.prefix, data.progress / data.total * 100, __("{0}", [data.message]));
+			} else {
+				frm.dashboard.hide_progress();
+			}
+		});
+
+		frm.trigger("show_instructions");
+		frm.trigger("last_deployed_on");
+		frm.trigger("set_dirty_trigger");
+		frm.trigger("set_deploy_primary_action");
+	},
+	last_deployed_on: function(frm) {
+		if (frm.doc.last_deployed_on) {
+			frm.trigger("show_indicator");
+		}
+	},
+	show_indicator: function(frm) {
+		let pretty_date = frappe.datetime.prettyDate(frm.doc.last_deployed_on);
+		frm.page.set_indicator(__("Last published {0}", [pretty_date]), "blue");
+	},
+	set_dirty_trigger: function(frm) {
+		$(frm.wrapper).on("dirty", function() {
+			frm.page.set_primary_action(__('Save'), () => frm.save());
+		});
+	},
+	set_deploy_primary_action: function(frm) {
+		if (frm.doc.package_details.length && frm.doc.instances.length) {
+			frm.page.set_primary_action(__("Publish"), function () {
+				frappe.show_alert({
+					message: __("Publishing documents..."),
+					indicator: "green"
+				});
+
+				frappe.call({
+					method: "frappe.custom.doctype.package_publish_tool.package_publish_tool.deploy_package",
+					callback: function() {
+						frm.reload_doc();
+						frappe.msgprint(__("Documents have been published."));
+					}
+				});
+			});
+		}
+	},
+	show_instructions: function(frm) {
+		let field = frm.get_field("html_info");
+		field.html(`
+			<p class="text-muted text-medium">
+				Package Publish Tool let's you copy documents from your site to any other remote site.
+				Follow the steps below to publish.
+			</p>
+			<ol class="text-muted small">
+				<li>Add Document Types that you want to copy from the table below. You can also add filters by expanding the row.</li>
+				<li>Add the Sites URL where you want to copy these documents, and enter the Username and Password.</li>
+				<li>Click on Save. Now, you can click on Publish and the documents will be copied.</li>
+			</ol>
+		`);
+	}
+});
+
+frappe.ui.form.on('Package Document Type', {
+	form_render: function (frm, cdt, cdn) {
+		function _show_filters(filters, table) {
+			table.find('tbody').empty();
+
+			if (filters.length > 0) {
+				filters.forEach(filter => {
+					const filter_row =
+						$(`<tr>
+							<td>${filter[1]}</td>
+							<td>${filter[2] || ""}</td>
+							<td>${filter[3]}</td>
+						</tr>`);
+
+					table.find('tbody').append(filter_row);
+				});
+			} else {
+				const filter_row = $(`<tr><td colspan="3" class="text-muted text-center">
+					${__("Click to Set Filters")}</td></tr>`);
+				table.find('tbody').append(filter_row);
+			}
+		}
+
+		let row = frappe.get_doc(cdt, cdn);
+
+		let wrapper = $(`[data-fieldname="filters_json"]`).empty();
+		let table = $(`<table class="table table-bordered" style="cursor:pointer; margin:0px;">
+				<thead>
+					<tr>
+						<th style="width: 33%">${__('Filter')}</th>
+						<th style="width: 33%">${__('Condition')}</th>
+						<th>${__('Value')}</th>
+					</tr>
+				</thead>
+				<tbody>
+				</tbody>
+			</table>`).appendTo(wrapper);
+		$(`<p class="text-muted small">${__("Click table to edit")}</p>`).appendTo(wrapper);
+
+		let filters = JSON.parse(row.filters_json || '[]');
+		_show_filters(filters, table);
+
+		table.on('click', () => {
+			if (!row.document_type) {
+				frappe.msgprint(__("Select Document Type."));
+				return;
+			}
+
+			frappe.model.with_doctype(row.document_type, function() {
+				let dialog = new frappe.ui.Dialog({
+					title: __('Set Filters'),
+					fields: [
+						{
+							fieldtype: 'HTML',
+							label: 'Filters',
+							fieldname: 'filter_area',
+						}
+					],
+					primary_action: function() {
+						let values = filter_group.get_filters();
+						let flt = [];
+						if (values) {
+							values.forEach(function(value) {
+								flt.push([value[0], value[1], value[2], value[3]]);
+							});
+						}
+						row.filters_json = JSON.stringify(flt);
+						_show_filters(flt, table);
+						dialog.hide();
+					},
+					primary_action_label: "Set"
+				});
+
+				let filter_group = new frappe.ui.FilterGroup({
+					parent: dialog.get_field('filter_area').$wrapper,
+					doctype: row.document_type,
+					on_change: () => {},
+				});
+				filter_group.add_filters_to_filter_group(filters);
+				dialog.show();
+			});
+		});
+	},
+});

frappe/custom/doctype/package_publish_tool/package_publish_tool.json

@@ -0,0 +1,84 @@
+{
+ "actions": [],
+ "creation": "2020-05-13 15:54:38.082657",
+ "doctype": "DocType",
+ "editable_grid": 1,
+ "engine": "InnoDB",
+ "field_order": [
+  "html_info",
+  "sb_00",
+  "package_details",
+  "sb_01",
+  "instances",
+  "last_deployed_on"
+ ],
+ "fields": [
+  {
+   "description": "Click on the row for accessing filters.",
+   "fieldname": "package_details",
+   "fieldtype": "Table",
+   "label": "Document Types",
+   "options": "Package Document Type",
+   "reqd": 1
+  },
+  {
+   "fieldname": "instances",
+   "fieldtype": "Table",
+   "label": "Sites",
+   "options": "Package Publish Target",
+   "reqd": 1
+  },
+  {
+   "fieldname": "html_info",
+   "fieldtype": "HTML"
+  },
+  {
+   "fieldname": "last_deployed_on",
+   "fieldtype": "Datetime",
+   "hidden": 1,
+   "label": "Last Deployed On",
+   "read_only": 1
+  },
+  {
+   "fieldname": "sb_00",
+   "fieldtype": "Section Break"
+  },
+  {
+   "fieldname": "sb_01",
+   "fieldtype": "Section Break"
+  }
+ ],
+ "issingle": 1,
+ "links": [],
+ "modified": "2020-05-15 17:31:37.060199",
+ "modified_by": "Administrator",
+ "module": "Custom",
+ "name": "Package Publish Tool",
+ "owner": "Administrator",
+ "permissions": [
+  {
+   "create": 1,
+   "delete": 1,
+   "email": 1,
+   "print": 1,
+   "read": 1,
+   "role": "System Manager",
+   "share": 1,
+   "write": 1
+  },
+  {
+   "create": 1,
+   "delete": 1,
+   "email": 1,
+   "print": 1,
+   "read": 1,
+   "role": "All",
+   "share": 1,
+   "write": 1
+  }
+ ],
+ "quick_entry": 1,
+ "sort_field": "modified",
+ "sort_order": "DESC",
+ "track_changes": 1
+}

frappe/custom/doctype/package_publish_tool/package_publish_tool.py

@@ -0,0 +1,177 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2020, Frappe Technologies and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+import json
+import datetime
+import base64
+from frappe.model.document import Document
+from frappe.utils.file_manager import save_file, get_file
+from frappe import _
+from six import string_types
+from frappe.frappeclient import FrappeClient
+from frappe.utils import get_datetime_str, get_datetime
+from frappe.utils.password import get_decrypted_password
+
+class PackagePublishTool(Document):
+	pass
+
+@frappe.whitelist()
+def deploy_package():
+	package, doc = export_package()
+
+	file_name = "Package-" + get_datetime_str(get_datetime())
+
+	length = len(doc.instances)
+	for idx, instance in enumerate(doc.instances):
+		frappe.publish_realtime("package",  {"progress": idx, "total": length, "message": instance.instance_url, "prefix": _("Deploying")},
+			user=frappe.session.user)
+
+		install_package_to_remote(package, instance)
+
+	frappe.db.set_value("Package Publish Tool", "Package Publish Tool", "last_deployed_on", frappe.utils.now_datetime())
+
+def install_package_to_remote(package, instance):
+	try:
+		connection = FrappeClient(instance.instance_url, instance.username, get_decrypted_password(instance.doctype, instance.name))
+	except Exception:
+		frappe.log_error(frappe.get_traceback())
+		frappe.throw(_("Couldn't connect to site {0}. Please check Error Logs.").format(instance.instance_url))
+
+	try:
+		connection.post_request({
+			"cmd": "frappe.custom.doctype.package_publish_tool.package_publish_tool.import_package",
+			"package": json.dumps(package)
+		})
+	except Exception:
+		frappe.log_error(frappe.get_traceback())
+		frappe.throw(_("Error while installing package to site {0}. Please check Error Logs.").format(instance.instance_url))
+
+@frappe.whitelist()
+def export_package():
+	"""Export package as JSON."""
+	package_doc = frappe.get_single("Package Publish Tool")
+	package = []
+
+	for doctype in package_doc.package_details:
+		filters = []
+
+		if doctype.get("filters_json"):
+			filters = json.loads(doctype.get("filters_json"))
+
+		docs = frappe.get_all(doctype.get("document_type"), filters=filters)
+		length = len(docs)
+
+		for idx, doc in enumerate(docs):
+			frappe.publish_realtime("package", {
+					"progress":idx, "total":length,
+					"message":doctype.get("document_type"),
+					"prefix": _("Exporting")
+				},
+				user=frappe.session.user)
+
+			document = frappe.get_doc(doctype.get("document_type"), doc.name).as_dict()
+			attachments = []
+
+			if doctype.attachments:
+				filters = {
+					"attached_to_doctype": document.get("doctype"),
+					"attached_to_name": document.get("name")
+				}
+
+				for f in frappe.get_list("File", filters=filters):
+					fname, fcontents = get_file(f.name)
+					attachments.append({
+						"fname": fname,
+						"content": base64.b64encode(fcontents).decode('ascii')
+					})
+
+			document.update({
+				"__attachments": attachments,
+				"__overwrite": True if doctype.overwrite else False
+			})
+
+			package.append(document)
+
+	return post_process(package), package_doc
+
+@frappe.whitelist()
+def import_package(package=None):
+	"""Import package from JSON."""
+	if isinstance(package, string_types):
+		package = json.loads(package)
+
+	for doc in package:
+		modified = doc.pop("modified")
+		overwrite = doc.pop("__overwrite")
+		attachments = doc.pop("__attachments")
+		exists = frappe.db.exists(doc.get("doctype"), doc.get("name"))
+
+		if not exists:
+			d = frappe.get_doc(doc).insert(ignore_permissions=True, ignore_if_duplicate=True)
+			if attachments:
+				add_attachment(attachments, d)
+		else:
+			docname = doc.pop("name")
+			document = frappe.get_doc(doc.get("doctype"), docname)
+
+			if overwrite:
+				update_document(document, doc, attachments)
+
+			else:
+				if frappe.utils.get_datetime(document.modified) < frappe.utils.get_datetime(modified):
+					update_document(document, doc, attachments)
+
+def update_document(document, doc, attachments):
+	document.update(doc)
+	document.save()
+	if attachments:
+		add_attachment(attachments, document)
+
+def add_attachment(attachments, doc):
+	for attachment in attachments:
+		save_file(attachment.get("fname"), base64.b64decode(attachment.get("content")), doc.get("doctype"), doc.get("name"))
+
+def post_process(package):
+	"""Remove the keys from Document and Child Document. Convert datetime, date, time to str."""
+	del_keys = ('modified_by', 'creation', 'owner', 'idx', 'docstatus')
+	child_del_keys = ('modified_by', 'creation', 'owner', 'idx', 'docstatus', 'name')
+
+	for doc in package:
+		for key in del_keys:
+			if key in doc:
+				del doc[key]
+
+		for key, value in doc.items():
+			stringified_value = get_stringified_value(value)
+			if stringified_value:
+				doc[key] = stringified_value
+
+			if not isinstance(value, list):
+				continue
+
+			for child in value:
+				for child_key in child_del_keys:
+					if child_key in child:
+						del child[child_key]
+
+				for child_key, child_value in child.items():
+					stringified_value = get_stringified_value(child_value)
+					if stringified_value:
+						child[child_key] = stringified_value
+
+	return package
+
+def get_stringified_value(value):
+	if isinstance(value, datetime.datetime):
+		return frappe.utils.get_datetime_str(value)
+
+	if isinstance(value, datetime.date):
+		return frappe.utils.get_date_str(value)
+
+	if isinstance(value, datetime.timedelta):
+		return frappe.utils.get_time_str(value)
+
+	return None

frappe/custom/doctype/package_publish_tool/test_package_publish_tool.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 TestPackagePublishTool(unittest.TestCase):
+	pass

frappe/database/mariadb/database.py

@@ -55,7 +55,8 @@ class MariaDBDatabase(Database):
 			'Signature':	('longtext', ''),
 			'Color':		('varchar', self.VARCHAR_LEN),
 			'Barcode':		('longtext', ''),
-			'Geolocation':	('longtext', '')
+			'Geolocation':	('longtext', ''),
+			'Duration':		('decimal', '18,6')
 		}
 
 	def get_connection(self):

frappe/database/mariadb/framework_mariadb.sql

@@ -63,6 +63,7 @@ CREATE TABLE `tabDocField` (
   `precision` varchar(255) DEFAULT NULL,
   `length` int(11) NOT NULL DEFAULT 0,
   `translatable` int(1) NOT NULL DEFAULT 0,
+  `hide_border` int(1) NOT NULL DEFAULT 0,
   PRIMARY KEY (`name`),
   KEY `parent` (`parent`),
   KEY `label` (`label`),

frappe/database/postgres/database.py

@@ -60,7 +60,8 @@ class PostgresDatabase(Database):
 			'Signature':	('text', ''),
 			'Color':		('varchar', self.VARCHAR_LEN),
 			'Barcode':		('text', ''),
-			'Geolocation':	('text', '')
+			'Geolocation':	('text', ''),
+			'Duration':		('decimal', '18,6')
 		}
 
 	def get_connection(self):

frappe/database/postgres/framework_postgres.sql

@@ -63,6 +63,7 @@ CREATE TABLE "tabDocField" (
   "precision" varchar(255) DEFAULT NULL,
   "length" bigint NOT NULL DEFAULT 0,
   "translatable" smallint NOT NULL DEFAULT 0,
+  "hide_border" smallint NOT NULL DEFAULT 0,
   PRIMARY KEY ("name")
 ) ;
 

frappe/desk/desktop.py

@@ -21,19 +21,17 @@ class Workspace:
 		self.extended_charts = []
 		self.extended_shortcuts = []
 
-		user = frappe.get_user()
-		user.build_permissions()
-
-		user_doc = frappe.get_doc('User', frappe.session.user)
-		self.blocked_modules = user_doc.get_blocked_modules()
+		self.user = frappe.get_user()
+		self.allowed_modules = self.get_cached_value('user_allowed_modules', self.get_allowed_modules)
 		self.doc = self.get_page_for_user()
 
-		if self.doc.module in self.blocked_modules:
+		if self.doc.module not in self.allowed_modules:
 			raise frappe.PermissionError
 
-		self.user = user
-		self.allowed_pages = get_allowed_pages()
-		self.allowed_reports = get_allowed_reports()
+		self.can_read = self.get_cached_value('user_perm_can_read', self.get_can_read_items)
+
+		self.allowed_pages = get_allowed_pages(cache=True)
+		self.allowed_reports = get_allowed_reports(cache=True)
 		self.onboarding_doc = self.get_onboarding_doc()
 		self.onboarding = None
 
@@ -41,6 +39,31 @@ class Workspace:
 		self.restricted_doctypes = frappe.cache().get_value("domain_restricted_doctypes") or build_domain_restriced_doctype_cache()
 		self.restricted_pages = frappe.cache().get_value("domain_restricted_pages") or build_domain_restriced_page_cache()
 
+	def get_cached_value(self, cache_key, fallback_fn):
+		_cache = frappe.cache()
+
+		value = _cache.get_value(cache_key, user=frappe.session.user)
+		if value:
+			return value
+
+		value = fallback_fn()
+
+		# Expire every six hour
+		_cache.set_value(cache_key, value, frappe.session.user, 21600)
+		return value
+
+	def get_can_read_items(self):
+		if not self.user.can_read:
+			self.user.build_permissions()
+
+		return self.user.can_read
+
+	def get_allowed_modules(self):
+		if not self.user.allow_modules:
+			self.user.build_permissions()
+
+		return self.user.allow_modules
+
 	def get_page_for_user(self):
 		filters = {
 			'extends': self.page_name,
@@ -61,14 +84,14 @@ class Workspace:
 		if not self.doc.onboarding:
 			return None
 
-		if frappe.db.get_value("Onboarding", self.doc.onboarding, "is_complete"):
+		if frappe.db.get_value("Module Onboarding", self.doc.onboarding, "is_complete"):
 			return None
 
-		doc = frappe.get_doc("Onboarding", self.doc.onboarding)
+		doc = frappe.get_doc("Module Onboarding", self.doc.onboarding)
 
 		# Check if user is allowed
 		allowed_roles = set(doc.get_allowed_roles())
-		user_roles = set(self.user.get_roles())
+		user_roles = set(frappe.get_roles())
 		if not allowed_roles & user_roles:
 			return None
 
@@ -83,7 +106,7 @@ class Workspace:
 			"extends": self.page_name,
 			'restrict_to_domain': ['in', frappe.get_active_domains()],
 			'for_user': '',
-			'module': ['not in', self.blocked_modules]
+			'module': ['in', self.allowed_modules]
 		})
 
 		pages = [frappe.get_doc("Desk Page", page['name']) for page in pages]
@@ -97,13 +120,15 @@ class Workspace:
 		item_type = item_type.lower()
 
 		if item_type == "doctype":
-			return (name in self.user.can_read and name in self.restricted_doctypes)
+			return (name in self.can_read and name in self.restricted_doctypes)
 		if item_type == "page":
 			return (name in self.allowed_pages and name in self.restricted_pages)
 		if item_type == "report":
 			return name in self.allowed_reports
 		if item_type == "help":
 			return True
+		if item_type == "dashboard":
+			return True
 
 		return False
 
@@ -134,15 +159,18 @@ class Workspace:
 			}
 
 	def get_cards(self):
-		cards = self.doc.cards + get_custom_reports_and_doctypes(self.doc.module)
+		cards = self.doc.cards
+		if not self.doc.hide_custom:
+			cards = cards + get_custom_reports_and_doctypes(self.doc.module)
+
 		if len(self.extended_cards):
 			cards = cards + self.extended_cards
 		default_country = frappe.db.get_default("country")
 
 		def _doctype_contains_a_record(name):
-			exists = self.table_counts.get(name)
-			if not exists:
-				if not frappe.db.get_value('DocType', name, 'issingle'):
+			exists = self.table_counts.get(name, None)
+			if exists is None:
+				if not frappe.db.get_value('DocType', name, 'issingle', cache=True):
 					exists = frappe.db.count(name)
 				else:
 					exists = True
@@ -249,6 +277,8 @@ class Workspace:
 		for doc in self.onboarding_doc.get_steps():
 			step = doc.as_dict().copy()
 			step.label = _(doc.title)
+			if step.action == "Create Entry":
+				step.is_submittable = frappe.db.get_value("DocType", step.reference_document, 'is_submittable', cache=True)
 			steps.append(step)
 
 		return steps
@@ -292,7 +322,6 @@ def get_desk_sidebar_items(flatten=False):
 	filters = {
 		'restrict_to_domain': ['in', frappe.get_active_domains()],
 		'extends_another_page': 0,
-		'is_standard': 1,
 		'for_user': '',
 		'module': ['not in', blocked_modules]
 	}

frappe/desk/doctype/dashboard/dashboard.json

@@ -9,6 +9,7 @@
   "dashboard_name",
   "is_default",
   "charts",
+  "chart_options",
   "cards"
  ],
  "fields": [
@@ -33,6 +34,13 @@
    "options": "Dashboard Chart Link",
    "reqd": 1
   },
+  {
+    "description": "Set Default Options for all charts on this Dashboard (Ex: \"colors\": [\"#d1d8dd\", \"#ff5858\"])",
+    "fieldname": "chart_options",
+    "fieldtype": "Code",
+    "label": "Chart Options",
+    "options": "JSON"
+  },
   {
    "fieldname": "cards",
    "fieldtype": "Table",
@@ -41,7 +49,7 @@
   }
  ],
  "links": [],
- "modified": "2020-04-19 17:44:36.237163",
+ "modified": "2020-04-29 13:26:37.362482",
  "modified_by": "Administrator",
  "module": "Desk",
  "name": "Dashboard",

frappe/desk/doctype/dashboard/dashboard.py

@@ -5,6 +5,8 @@
 from __future__ import unicode_literals
 from frappe.model.document import Document
 import frappe
+from frappe import _
+import json
 
 class Dashboard(Document):
 	def on_update(self):
@@ -13,13 +15,29 @@ class Dashboard(Document):
 			frappe.db.sql('''update
 				tabDashboard set is_default = 0 where name != %s''', self.name)
 
+	def validate(self):
+		self.validate_custom_options()
+
+	def validate_custom_options(self):
+		if self.chart_options:
+			try:
+				json.loads(self.chart_options)
+			except ValueError as error:
+				frappe.throw(_("Invalid json added in the custom options: {0}").format(error))
+
 @frappe.whitelist()
 def get_permitted_charts(dashboard_name):
 	permitted_charts = []
 	dashboard = frappe.get_doc('Dashboard', dashboard_name)
 	for chart in dashboard.charts:
 		if frappe.has_permission('Dashboard Chart', doc=chart.chart):
-			permitted_charts.append(chart)
+			chart_dict = frappe._dict()
+			chart_dict.update(chart.as_dict())
+
+			if dashboard.get('chart_options'):
+				chart_dict.custom_options = dashboard.get('chart_options')
+			permitted_charts.append(chart_dict)
+
 	return permitted_charts
 
 @frappe.whitelist()

frappe/desk/doctype/dashboard_chart/dashboard_chart.js

@@ -49,6 +49,7 @@ frappe.ui.form.on('Dashboard Chart', {
 		});
 
 		frm.set_df_property("filters_section", "hidden", 1);
+		frm.trigger('set_time_series');
 		frm.set_query('document_type', function() {
 			return {
 				filters: {
@@ -57,6 +58,7 @@ frappe.ui.form.on('Dashboard Chart', {
 			}
 		});
 		frm.trigger('update_options');
+		frm.trigger('set_heatmap_year_options');
 		if (frm.doc.report_name) {
 			frm.trigger('set_chart_report_filters');
 		}
@@ -70,7 +72,17 @@ frappe.ui.form.on('Dashboard Chart', {
 		frm.trigger("show_filters");
 	},
 
+	set_heatmap_year_options: function(frm) {
+		if (frm.doc.type == 'Heatmap') {
+			frappe.db.get_doc('System Settings').then(doc => {
+				const creation_date = doc.creation;
+				frm.set_df_property('heatmap_year', 'options', frappe.dashboard_utils.get_years_since_creation(creation_date));
+			});
+		}
+	},
+
 	chart_type: function(frm) {
+		frm.trigger('set_time_series');
 		if (frm.doc.chart_type == 'Report') {
 			frm.set_query('report_name', () => {
 				return {
@@ -80,23 +92,19 @@ frappe.ui.form.on('Dashboard Chart', {
 				}
 			});
 		} else {
-			// set timeseries based on chart type
-			if (['Count', 'Average', 'Sum'].includes(frm.doc.chart_type)) {
-				frm.set_value('timeseries', 1);
-			} else {
-				frm.set_value('timeseries', 0);
-			}
-
-			if (frm.doc.chart_type == 'Group By') {
-				frm.set_df_property('type', 'options', ['Line', 'Bar', 'Percentage', 'Pie']);
-			} else {
-				frm.set_df_property('type', 'options', ['Line', 'Bar']);
-			}
-
 			frm.set_value('document_type', '');
 		}
 	},
 
+	set_time_series: function(frm) {
+		// set timeseries based on chart type
+		if (['Count', 'Average', 'Sum'].includes(frm.doc.chart_type)) {
+			frm.set_value('timeseries', 1);
+		} else {
+			frm.set_value('timeseries', 0);
+		}
+	},
+
 	document_type: function(frm) {
 		// update `based_on` options based on date / datetime fields
 		frm.set_value('source', '');
@@ -243,6 +251,7 @@ frappe.ui.form.on('Dashboard Chart', {
 	render_filters_table: function(frm) {
 		frm.set_df_property("filters_section", "hidden", 0);
 		let is_document_type = frm.doc.chart_type!== 'Report' && frm.doc.chart_type!=='Custom';
+		let is_dynamic_filter = f => ['Date', 'DateRange'].includes(f.fieldtype) && f.default;
 
 		let wrapper = $(frm.get_field('filters_json').wrapper).empty();
 		let table = $(`<table class="table table-bordered" style="cursor:pointer; margin:0px;">
@@ -260,6 +269,18 @@ frappe.ui.form.on('Dashboard Chart', {
 		let filters = JSON.parse(frm.doc.filters_json || '[]');
 		var filters_set = false;
 
+		// Set dynamic filters for reports
+		if (frm.doc.chart_type == 'Report') {
+			let set_filters = false;
+			frm.chart_filters.forEach(f => {
+				if (is_dynamic_filter(f)) {
+					filters[f.fieldname] = f.default;
+					set_filters = true;
+				}
+			});
+			set_filters && frm.set_value('filters_json', JSON.stringify(filters));
+		}
+
 		let fields;
 		if (is_document_type) {
 			fields = [
@@ -283,16 +304,7 @@ frappe.ui.form.on('Dashboard Chart', {
 				});
 			}
 		} else if (frm.chart_filters.length) {
-			fields = frm.chart_filters.filter(f => {
-				if (f.on_change && !f.reqd) {
-					return false;
-				}
-				if (f.get_query || f.get_data) {
-					f.read_only = 1;
-				}
-
-				return f.fieldname;
-			});
+			fields = frm.chart_filters.filter(f => f.fieldname);
 
 			fields.map( f => {
 				if (filters[f.fieldname]) {
@@ -320,7 +332,7 @@ frappe.ui.form.on('Dashboard Chart', {
 
 			let dialog = new frappe.ui.Dialog({
 				title: __('Set Filters'),
-				fields: fields,
+				fields: fields.filter(f => !is_dynamic_filter(f)),
 				primary_action: function() {
 					let values = this.get_values();
 					if (values) {
@@ -353,10 +365,17 @@ frappe.ui.form.on('Dashboard Chart', {
 			}
 
 			dialog.show();
+
+			if (frm.doc.chart_type == 'Report') {
+				//Set query report object so that it can be used while fetching filter values in the report
+				frappe.query_report = new frappe.views.QueryReport({'filters': dialog.fields_list});
+				frappe.query_reports[frm.doc.report_name]
+					&& frappe.query_reports[frm.doc.report_name].onload
+						&& frappe.query_reports[frm.doc.report_name].onload(frappe.query_report);
+			}
+
 			dialog.set_values(filters);
 		});
 	},
 
 });
-
-

frappe/desk/doctype/dashboard_chart/dashboard_chart.json

@@ -23,17 +23,18 @@
   "number_of_groups",
   "column_break_6",
   "is_public",
+  "heatmap_year",
   "timespan",
   "from_date",
   "to_date",
   "time_interval",
   "timeseries",
+  "type",
   "filters_section",
   "filters_json",
   "chart_options_section",
-  "type",
-  "column_break_2",
   "color",
+  "column_break_2",
   "custom_options",
   "section_break_10",
   "last_synced_on"
@@ -85,14 +86,14 @@
    "fieldtype": "Column Break"
   },
   {
-   "depends_on": "timeseries",
+   "depends_on": "eval: doc.timeseries && doc.type !== 'Heatmap'",
    "fieldname": "timespan",
    "fieldtype": "Select",
    "label": "Timespan",
    "options": "Last Year\nLast Quarter\nLast Month\nLast Week\nSelect Date Range"
   },
   {
-   "depends_on": "timeseries",
+   "depends_on": "eval: doc.timeseries && doc.type !== 'Heatmap'",
    "fieldname": "time_interval",
    "fieldtype": "Select",
    "label": "Time Interval",
@@ -100,7 +101,7 @@
   },
   {
    "default": "0",
-   "depends_on": "eval: ['Count', 'Sum', 'Average'].includes(doc.chart_type)",
+   "depends_on": "eval: !['Group By', 'Report'].includes(doc.chart_type)\n",
    "fieldname": "timeseries",
    "fieldtype": "Check",
    "label": "Time Series"
@@ -123,18 +124,18 @@
    "label": "Chart Options"
   },
   {
+   "default": "Line",
    "fieldname": "type",
    "fieldtype": "Select",
    "label": "Type",
-   "options": "Line\nBar\nPercentage\nPie\nDonut",
-   "reqd": 1
+   "options": "Line\nBar\nPercentage\nPie\nDonut\nHeatmap"
   },
   {
    "fieldname": "column_break_2",
    "fieldtype": "Column Break"
   },
   {
-   "depends_on": "eval:doc.chart_type !== 'Report'",
+   "depends_on": "eval: doc.chart_type !== 'Report' && doc.type !== 'Heatmap'",
    "fieldname": "color",
    "fieldtype": "Color",
    "label": "Color"
@@ -228,10 +229,16 @@
    "fieldname": "is_public",
    "fieldtype": "Check",
    "label": "Is Public"
+  },
+  {
+   "depends_on": "eval: doc.type == 'Heatmap'",
+   "fieldname": "heatmap_year",
+   "fieldtype": "Select",
+   "label": "Year"
   }
  ],
  "links": [],
- "modified": "2020-05-01 15:22:59.119341",
+ "modified": "2020-05-16 15:03:02.455395",
  "modified_by": "Administrator",
  "module": "Desk",
  "name": "Dashboard Chart",

frappe/desk/doctype/dashboard_chart/dashboard_chart.py

@@ -7,8 +7,8 @@ import frappe
 from frappe import _
 import datetime
 import json
-from frappe.core.page.dashboard.dashboard import cache_source, get_from_date_from_timespan
-from frappe.utils import nowdate, add_to_date, getdate, get_last_day, formatdate, get_datetime
+from frappe.utils.dashboard import cache_source, get_from_date_from_timespan
+from frappe.utils import nowdate, add_to_date, getdate, get_last_day, formatdate, get_datetime, cint
 from frappe.model.naming import append_number_if_name_exists
 from frappe.boot import get_allowed_reports
 from frappe.model.document import Document
@@ -58,13 +58,13 @@ def has_permission(doc, ptype, user):
 @frappe.whitelist()
 @cache_source
 def get(chart_name = None, chart = None, no_cache = None, filters = None, from_date = None,
-	to_date = None, timespan = None, time_interval = None, refresh = None):
+	to_date = None, timespan = None, time_interval = None, heatmap_year=None, refresh = None):
 	if chart_name:
 		chart = frappe.get_doc('Dashboard Chart', chart_name)
 	else:
 		chart = frappe._dict(frappe.parse_json(chart))
 
-
+	heatmap_year = heatmap_year or chart.heatmap_year
 	timespan = timespan or chart.timespan
 
 	if timespan == 'Select Date Range':
@@ -87,7 +87,10 @@ def get(chart_name = None, chart = None, no_cache = None, filters = None, from_d
 	if chart.chart_type == 'Group By':
 		chart_config = get_group_by_chart_config(chart, filters)
 	else:
-		chart_config =  get_chart_config(chart, filters, timespan, timegrain, from_date, to_date)
+		if chart.type == 'Heatmap':
+			chart_config = get_heatmap_chart_config(chart, filters, heatmap_year)
+		else:
+			chart_config =  get_chart_config(chart, filters, timespan, timegrain, from_date, to_date)
 
 	return chart_config
 
@@ -107,11 +110,11 @@ def create_dashboard_chart(args):
 	doc.insert(ignore_permissions=True)
 	return doc
 
-
 @frappe.whitelist()
 def create_report_chart(args):
-	create_dashboard_chart(args)
+	doc = create_dashboard_chart(args)
 	args = frappe.parse_json(args)
+	args.chart_name = doc.chart_name
 	if args.dashboard:
 		add_chart_to_dashboard(json.dumps(args))
 
@@ -134,7 +137,6 @@ def get_chart_config(chart, filters, timespan, timegrain, from_date, to_date):
 		to_date = datetime.datetime.now()
 
 	doctype = chart.document_type
-	unit_function = get_unit_function(doctype, chart.based_on, timegrain)
 	datefield = chart.based_on
 	aggregate_function = get_aggregate_function(chart.chart_type)
 	value_field = chart.value_based_on or '1'
@@ -144,26 +146,21 @@ def get_chart_config(chart, filters, timespan, timegrain, from_date, to_date):
 	filters.append([doctype, datefield, '>=', from_date, False])
 	filters.append([doctype, datefield, '<=', to_date, False])
 
-	data = frappe.db.get_all(
+	data = frappe.db.get_list(
 		doctype,
 		fields = [
-			'extract(year from `tab{doctype}`.{datefield}) as _year'.format(doctype=doctype, datefield=datefield),
-			'{} as _unit'.format(unit_function),
+			'{} as _unit'.format(datefield),
 			'{aggregate_function}({value_field})'.format(aggregate_function=aggregate_function, value_field=value_field),
 		],
 		filters = filters,
-		group_by = '_year, _unit',
-		order_by = '_year asc, _unit asc',
+		group_by = '_unit',
+		order_by = '_unit asc',
 		as_list = True,
 		ignore_ifnull = True
 	)
 
+	result = get_result(data, timegrain, from_date, to_date)
 
-	# result given as year, unit -> convert it to end of period of that unit
-	result = convert_to_dates(data, timegrain)
-
-	# add missing data points for periods where there was no result
-	result = add_missing_values(result, timegrain, timespan, from_date, to_date)
 	chart_config = {
 		"labels": [formatdate(r[0].strftime('%Y-%m-%d')) for r in result],
 		"datasets": [{
@@ -174,6 +171,41 @@ def get_chart_config(chart, filters, timespan, timegrain, from_date, to_date):
 
 	return chart_config
 
+def get_heatmap_chart_config(chart, filters, heatmap_year):
+	aggregate_function = get_aggregate_function(chart.chart_type)
+	value_field = chart.value_based_on or '1'
+	doctype = chart.document_type
+	datefield = chart.based_on
+	year = cint(heatmap_year) if heatmap_year else getdate(nowdate()).year
+	year_start_date = datetime.date(year, 1, 1).strftime('%Y-%m-%d')
+	next_year_start_date = datetime.date(year + 1, 1, 1).strftime('%Y-%m-%d')
+
+	filters.append([doctype, datefield, '>', "{date}".format(date=year_start_date), False])
+	filters.append([doctype, datefield, '<', "{date}".format(date=next_year_start_date), False])
+
+	if frappe.db.db_type == 'mariadb':
+		timestamp_field = 'unix_timestamp({datefield})'.format(datefield=datefield)
+	else:
+		timestamp_field = 'extract(epoch from timestamp {datefield})'.format(datefield=datefield)
+
+	data = dict(frappe.db.get_all(
+		doctype,
+		fields = [
+			timestamp_field,
+			'{aggregate_function}({value_field})'.format(aggregate_function=aggregate_function, value_field=value_field),
+		],
+		filters = filters,
+		group_by = 'date({datefield})'.format(datefield=datefield),
+		as_list = 1,
+		order_by = '{datefield} asc'.format(datefield=datefield),
+		ignore_ifnull = True
+	))
+
+	chart_config = {
+		'labels': [],
+		'dataPoints': data,
+	}
+	return chart_config
 
 def get_group_by_chart_config(chart, filters):
 
@@ -182,7 +214,7 @@ def get_group_by_chart_config(chart, filters):
 	group_by_field = chart.group_by_based_on
 	doctype = chart.document_type
 
-	data = frappe.db.get_all(
+	data = frappe.db.get_list(
 		doctype,
 		fields = [
 			'{} as name'.format(group_by_field),
@@ -223,75 +255,22 @@ def get_aggregate_function(chart_type):
 	}[chart_type]
 
 
-def convert_to_dates(data, timegrain):
-	""" Converts individual dates within data to the end of period """
-	result = []
-	for d in data:
-		if d[2] != 0:
-			if timegrain == 'Daily':
-				result.append([add_to_date('{:d}-01-01'.format(int(d[0])), days = d[1] - 1), d[2]])
-			elif timegrain == 'Weekly':
-				result.append([add_to_date(add_to_date('{:d}-01-01'.format(int(d[0])), weeks = d[1] + 1), days = -1), d[2]])
-			elif timegrain == 'Monthly':
-				result.append([add_to_date(add_to_date('{:d}-01-01'.format(int(d[0])), months=d[1]), days = -1), d[2]])
-			elif timegrain == 'Quarterly':
-				result.append([add_to_date(add_to_date('{:d}-01-01'.format(int(d[0])), months=d[1] * 3), days = -1), d[2]])
-			elif timegrain == 'Yearly':
-				result.append([add_to_date(add_to_date('{:d}-01-01'.format(int(d[0])), months=12), days = -1), d[2]])
-			result[-1][0] = getdate(result[-1][0])
-
-	return result
-
-def get_unit_function(doctype, datefield, timegrain):
-	unit_function = ''
-	if timegrain=='Daily':
-		if frappe.db.db_type == 'mariadb':
-			unit_function = 'dayofyear(`tab{doctype}`.{datefield})'.format(
-				doctype=doctype, datefield=datefield)
-		else:
-			unit_function = 'extract(doy from `tab{doctype}`.{datefield})'.format(
-				doctype=doctype, datefield=datefield)
-
-	else:
-		unit_function = 'extract({unit} from `tab{doctype}`.{datefield})'.format(
-			unit = timegrain[:-2].lower(), doctype=doctype, datefield=datefield)
-
-	return unit_function
-
-def add_missing_values(data, timegrain, timespan, from_date, to_date):
-	# add missing intervals
+def get_result(data, timegrain, from_date, to_date):
+	start_date = getdate(from_date)
+	end_date = getdate(to_date)
 	result = []
 
-	if timespan != 'All Time':
-		first_expected_date = get_period_ending(from_date, timegrain)
-		# fill out data before the first data point
-		first_data_point_date = data[0][0] if data else getdate(add_to_date(to_date, days=1))
-		while first_data_point_date > first_expected_date:
-			result.append([first_expected_date, 0.0])
-			first_expected_date = get_next_expected_date(first_expected_date, timegrain)
+	while start_date <= end_date:
+		next_date = get_next_expected_date(start_date, timegrain)
+		result.append([next_date, 0.0])
+		start_date = next_date
 
-	# fill data points and missing points
-	for i, d in enumerate(data):
-		result.append(d)
-
-		next_expected_date = get_next_expected_date(d[0], timegrain)
-
-		if i < len(data)-1:
-			next_date = data[i+1][0]
-		else:
-			# already reached at end of data, see if we need any more dates
-			next_date = getdate(nowdate())
-
-		# if next data point is earler than the expected date
-		# need to fill out missing data points
-		while next_date > next_expected_date:
-			# fill missing value
-			result.append([next_expected_date, 0.0])
-			next_expected_date = get_next_expected_date(next_expected_date, timegrain)
-
-	# add date for the last period (if missing)
-	if result and get_period_ending(to_date, timegrain) > result[-1][0]:
-		result.append([get_period_ending(to_date, timegrain), 0.0])
+	data_index = 0
+	if data:
+		for i, d in enumerate(result):
+			while data_index < len(data) and getdate(data[data_index][0]) <= d[0]:
+				d[1] += data[data_index][1]
+				data_index += 1
 
 	return result
 
@@ -320,17 +299,12 @@ def get_period_ending(date, timegrain):
 	return getdate(date)
 
 def get_week_ending(date):
-	# fun fact: week ends on the day before 1st Jan of the year.
-	# for 2019 it is Monday
+	# week starts on monday
+	from datetime import timedelta
+	start = date - timedelta(days = date.weekday())
+	end = start + timedelta(days=6)
 
-	week_of_the_year = int(date.strftime('%U'))
-
-	if week_of_the_year == 52:
-		date = add_to_date(date, years=1)
-	# first day of next week
-	date = add_to_date('{}-01-01'.format(date.year), weeks = (week_of_the_year%52) + 1)
-	# last day of this week
-	return add_to_date(date, days=-1)
+	return end
 
 def get_month_ending(date):
 	month_of_the_year = int(date.strftime('%m'))
@@ -397,11 +371,11 @@ class DashboardChart(Document):
 
 	def check_document_type(self):
 		if frappe.get_meta(self.document_type).issingle:
-			frappe.throw("You cannot create a dashboard chart from single DocTypes")
+			frappe.throw(_("You cannot create a dashboard chart from single DocTypes"))
 
 	def validate_custom_options(self):
 		if self.custom_options:
 			try:
 				json.loads(self.custom_options)
 			except ValueError as error:
-				frappe.throw("Invalid json added in the custom options: %s" % error)
+				frappe.throw(_("Invalid json added in the custom options: {0}").format(error))

frappe/desk/doctype/dashboard_chart/test_dashboard_chart.py

@@ -17,10 +17,9 @@ class TestDashboardChart(unittest.TestCase):
 		self.assertEqual(get_period_ending('2019-04-10', 'Daily'),
 			getdate('2019-04-10'))
 
-		# fun fact: week ends on the day before 1st Jan of the year.
-		# for 2019 it is Monday
+		# week starts on monday
 		self.assertEqual(get_period_ending('2019-04-10', 'Weekly'),
-			getdate('2019-04-15'))
+			getdate('2019-04-14'))
 
 		self.assertEqual(get_period_ending('2019-04-10', 'Monthly'),
 			getdate('2019-04-30'))
@@ -133,6 +132,34 @@ class TestDashboardChart(unittest.TestCase):
 
 		frappe.db.rollback()
 
+	def test_weekly_dashboard_chart(self):
+		insert_test_records()
+
+		if frappe.db.exists('Dashboard Chart', 'Test Weekly Dashboard Chart'):
+			frappe.delete_doc('Dashboard Chart', 'Test Weekly Dashboard Chart')
+
+		frappe.get_doc(dict(
+			doctype = 'Dashboard Chart',
+			chart_name = 'Test Weekly Dashboard Chart',
+			chart_type = 'Sum',
+			document_type = 'Communication',
+			based_on = 'communication_date',
+			value_based_on = 'rating',
+			timespan = 'Select Date Range',
+			time_interval = 'Weekly',
+			from_date = datetime(2018, 12, 30),
+			to_date = datetime(2019, 1, 15),
+			filters_json = '[]',
+			timeseries = 1
+		)).insert()
+
+		result = get(chart_name ='Test Weekly Dashboard Chart', refresh = 1)
+
+		self.assertEqual(result.get('datasets')[0].get('values'), [200.0, 400.0, 0.0])
+		self.assertEqual(result.get('labels'), [formatdate('2019-01-06'), formatdate('2019-01-13'), formatdate('2019-01-20')])
+
+		frappe.db.rollback()
+
 	def test_group_by_chart_type(self):
 		if frappe.db.exists('Dashboard Chart', 'Test Group By Dashboard Chart'):
 			frappe.delete_doc('Dashboard Chart', 'Test Group By Dashboard Chart')
@@ -155,17 +182,16 @@ class TestDashboardChart(unittest.TestCase):
 
 		frappe.db.rollback()
 
-	def test_dashboard_with_single_doctype(self):
-		if frappe.db.exists('Dashboard Chart', 'Test Single DocType In Dashboard Chart'):
-			frappe.delete_doc('Dashboard Chart', 'Test Single DocType In Dashboard Chart')
+def insert_test_records():
+	create_new_communication(datetime(2019, 1, 10), 100)
+	create_new_communication(datetime(2019, 1, 6), 200)
+	create_new_communication(datetime(2019, 1, 8), 300)
 
-		chart_doc = frappe.get_doc(dict(
-			doctype = 'Dashboard Chart',
-			chart_name = 'Test Single DocType In Dashboard Chart',
-			chart_type = 'Count',
-			document_type = 'System Settings',
-			group_by_based_on = 'Created On',
-			filters_json = '{}',
-		))
-
-		self.assertRaises(frappe.ValidationError, chart_doc.insert)
+def create_new_communication(date, rating):
+	communication = {
+		'doctype': 'Communication',
+		'subject': 'Test Communication',
+		'rating': rating,
+		'communication_date': date
+	}
+	frappe.get_doc(communication).insert()

frappe/desk/doctype/desk_page/desk_page.js

@@ -2,16 +2,22 @@
 // For license information, please see license.txt
 
 frappe.ui.form.on('Desk Page', {
-	setup: function(frm) {
+	refresh: function(frm) {
+		frm.enable_save();
 		frm.get_field("is_standard").toggle(frappe.boot.developer_mode);
 		frm.get_field("extends_another_page").toggle(frappe.boot.developer_mode);
-		if (!frappe.boot.developer_mode || frm.doc.for_user) {
+		frm.get_field("developer_mode_only").toggle(frappe.boot.developer_mode);
+
+		if (frm.doc.for_user) {
+			frm.set_df_property("extends", "read_only", true);
+		}
+
+		if (frm.doc.for_user || (frm.doc.is_standard && !frappe.boot.developer_mode)) {
 			frm.trigger('disable_form');
 		}
 	},
 
 	disable_form: function(frm) {
-		frm.set_read_only();
 		frm.fields
 			.filter(field => field.has_input)
 			.forEach(field => {

frappe/desk/doctype/desk_page/desk_page.json

@@ -8,8 +8,8 @@
  "engine": "InnoDB",
  "field_order": [
   "label",
-  "extends",
   "for_user",
+  "extends",
   "module",
   "category",
   "restrict_to_domain",
@@ -21,6 +21,7 @@
   "disable_user_customization",
   "pin_to_top",
   "pin_to_bottom",
+  "hide_custom",
   "section_break_2",
   "charts_label",
   "charts",
@@ -170,7 +171,7 @@
    "search_index": 1
   },
   {
-   "depends_on": "eval:doc.extends_another_page == 1",
+   "depends_on": "eval:doc.extends_another_page == 1 || doc.for_user",
    "fieldname": "extends",
    "fieldtype": "Link",
    "in_standard_filter": 1,
@@ -188,11 +189,18 @@
    "fieldname": "onboarding",
    "fieldtype": "Link",
    "label": "Onboarding",
-   "options": "Onboarding"
+   "options": "Module Onboarding"
+  },
+  {
+   "default": "0",
+   "description": "Checking this will hide custom doctypes and reports cards in Links section",
+   "fieldname": "hide_custom",
+   "fieldtype": "Check",
+   "label": "Hide Custom DocTypes and Reports"
   }
  ],
  "links": [],
- "modified": "2020-04-26 12:21:46.205079",
+ "modified": "2020-05-18 19:17:27.206646",
  "modified_by": "Administrator",
  "module": "Desk",
  "name": "Desk Page",

frappe/desk/doctype/desk_page/desk_page.py

@@ -20,6 +20,17 @@ class DeskPage(Document):
 		if frappe.conf.developer_mode and self.is_standard:
 			export_to_files(record_list=[['Desk Page', self.name]], record_module=self.module)
 
+	@staticmethod
+	def get_module_page_map():
+		filters = {
+			'extends_another_page': 0,
+			'for_user': '',
+		}
+
+		pages = frappe.get_all("Desk Page", fields=["name", "module"], filters=filters, as_list=1)
+
+		return { page[1]: page[0]  for page in pages }
+
 def disable_saving_as_standard():
 	return frappe.flags.in_install or \
 			frappe.flags.in_patch or \

frappe/desk/doctype/desk_shortcut/desk_shortcut.json

@@ -6,9 +6,9 @@
  "engine": "InnoDB",
  "field_order": [
   "type",
-  "label",
-  "column_break_4",
   "link_to",
+  "column_break_4",
+  "label",
   "icon",
   "restrict_to_domain",
   "section_break_5",
@@ -23,7 +23,7 @@
    "fieldtype": "Select",
    "in_list_view": 1,
    "label": "Type",
-   "options": "DocType\nReport\nPage",
+   "options": "DocType\nReport\nPage\nDashboard",
    "reqd": 1
   },
   {
@@ -81,13 +81,14 @@
   {
    "fieldname": "label",
    "fieldtype": "Data",
+   "in_list_view": 1,
    "label": "Label",
    "reqd": 1
   }
  ],
  "istable": 1,
  "links": [],
- "modified": "2020-04-07 19:04:23.645198",
+ "modified": "2020-05-14 16:02:15.420993",
  "modified_by": "Administrator",
  "module": "Desk",
  "name": "Desk Shortcut",

frappe/desk/doctype/event/test_event.py

@@ -71,7 +71,7 @@ class TestEvent(unittest.TestCase):
 		ev = frappe.get_doc(self.test_records[0]).insert()
 
 		add({
-			"assign_to": "test@example.com",
+			"assign_to": ["test@example.com"],
 			"doctype": "Event",
 			"name": ev.name,
 			"description": "Test Assignment"
@@ -83,7 +83,7 @@ class TestEvent(unittest.TestCase):
 
 		# add another one
 		add({
-			"assign_to": self.test_user,
+			"assign_to": [self.test_user],
 			"doctype": "Event",
 			"name": ev.name,
 			"description": "Test Assignment"
@@ -93,10 +93,10 @@ class TestEvent(unittest.TestCase):
 
 		self.assertEqual(set(json.loads(ev._assign)), set(["test@example.com", self.test_user]))
 
-		# close an assignment
+		# Remove an assignment
 		todo = frappe.get_doc("ToDo", {"reference_type": ev.doctype, "reference_name": ev.name,
 			"owner": self.test_user})
-		todo.status = "Closed"
+		todo.status = "Cancelled"
 		todo.save()
 
 		ev = frappe.get_doc("Event", ev.name)

frappe/desk/doctype/list_view_setting/list_view_setting.js

@@ -1,8 +0,0 @@
-// Copyright (c) 2019, Frappe Technologies and contributors
-// For license information, please see license.txt
-
-frappe.ui.form.on('List View Setting', {
-	// refresh: function(frm) {
-
-	// }
-});

frappe/desk/doctype/list_view_setting/list_view_setting.json

@@ -1,160 +0,0 @@
-{
- "allow_copy": 0,
- "allow_events_in_timeline": 0,
- "allow_guest_to_view": 0,
- "allow_import": 0,
- "allow_rename": 0,
- "autoname": "Prompt",
- "beta": 0,
- "creation": "2019-03-06 13:29:21.101860",
- "custom": 0,
- "docstatus": 0,
- "doctype": "DocType",
- "document_type": "",
- "editable_grid": 1,
- "engine": "InnoDB",
- "fields": [
-  {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "disable_count",
-   "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": "Disable Count",
-   "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
-  },
-  {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "disable_sidebar_stats",
-   "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": "Disable Sidebar Stats",
-   "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
-  },
-  {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "disable_auto_refresh",
-   "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": "Disable Auto Refresh",
-   "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
-  }
- ],
- "has_web_view": 0,
- "hide_heading": 0,
- "hide_toolbar": 0,
- "idx": 0,
- "image_view": 0,
- "in_create": 0,
- "is_submittable": 0,
- "issingle": 0,
- "istable": 0,
- "max_attachments": 0,
- "modified": "2019-03-06 13:40:59.533586",
- "modified_by": "Administrator",
- "module": "Desk",
- "name": "List View Setting",
- "name_case": "",
- "owner": "Administrator",
- "permissions": [
-  {
-   "amend": 0,
-   "cancel": 0,
-   "create": 1,
-   "delete": 1,
-   "email": 1,
-   "export": 0,
-   "if_owner": 0,
-   "import": 0,
-   "permlevel": 0,
-   "print": 1,
-   "read": 1,
-   "report": 0,
-   "role": "System Manager",
-   "set_user_permissions": 0,
-   "share": 1,
-   "submit": 0,
-   "write": 1
-  }
- ],
- "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
-}

frappe/desk/doctype/list_view_settings/list_view_settings.js

@@ -0,0 +1,8 @@
+// Copyright (c) 2020, Frappe Technologies and contributors
+// For license information, please see license.txt
+
+frappe.ui.form.on('List View Settings', {
+	// refresh: function(frm) {
+
+	// }
+});

frappe/desk/doctype/list_view_settings/list_view_settings.json

@@ -0,0 +1,76 @@
+{
+ "actions": [],
+ "autoname": "Prompt",
+ "creation": "2019-10-23 15:00:48.392374",
+ "doctype": "DocType",
+ "editable_grid": 1,
+ "engine": "InnoDB",
+ "field_order": [
+  "disable_count",
+  "disable_sidebar_stats",
+  "disable_auto_refresh",
+  "total_fields",
+  "fields_html",
+  "fields"
+ ],
+ "fields": [
+  {
+   "default": "0",
+   "fieldname": "disable_count",
+   "fieldtype": "Check",
+   "label": "Disable Count"
+  },
+  {
+   "default": "0",
+   "fieldname": "disable_sidebar_stats",
+   "fieldtype": "Check",
+   "label": "Disable Sidebar Stats"
+  },
+  {
+   "default": "0",
+   "fieldname": "disable_auto_refresh",
+   "fieldtype": "Check",
+   "label": "Disable Auto Refresh"
+  },
+  {
+   "fieldname": "total_fields",
+   "fieldtype": "Select",
+   "label": "Maximum Number of Fields",
+   "options": "\n4\n5\n6\n7\n8\n9\n10"
+  },
+  {
+   "fieldname": "fields_html",
+   "fieldtype": "HTML",
+   "label": "Fields"
+  },
+  {
+   "fieldname": "fields",
+   "fieldtype": "Code",
+   "hidden": 1,
+   "label": "Fields",
+   "read_only": 1
+  }
+ ],
+ "links": [],
+ "modified": "2020-05-12 18:27:15.568199",
+ "modified_by": "Administrator",
+ "module": "Desk",
+ "name": "List View Settings",
+ "owner": "Administrator",
+ "permissions": [
+  {
+   "create": 1,
+   "delete": 1,
+   "email": 1,
+   "print": 1,
+   "read": 1,
+   "role": "System Manager",
+   "share": 1,
+   "write": 1
+  }
+ ],
+ "read_only": 1,
+ "sort_field": "modified",
+ "sort_order": "DESC",
+ "track_changes": 1
+}

frappe/desk/doctype/list_view_settings/list_view_settings.py

@@ -0,0 +1,79 @@
+# -*- 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 ListViewSettings(Document):
+
+	def on_update(self):
+		frappe.clear_document_cache(self.doctype, self.name)
+
+@frappe.whitelist()
+def save_listview_settings(doctype, listview_settings, removed_listview_fields):
+
+	listview_settings = frappe.parse_json(listview_settings)
+	removed_listview_fields = frappe.parse_json(removed_listview_fields)
+
+	if frappe.get_all("List View Settings", filters={"name": doctype}):
+		doc = frappe.get_doc("List View Settings", doctype)
+		doc.update(listview_settings)
+		doc.save()
+	else:
+		doc = frappe.new_doc("List View Settings")
+		doc.name = doctype
+		doc.update(listview_settings)
+		doc.insert()
+
+	set_listview_fields(doctype, listview_settings.get("fields"), removed_listview_fields)
+
+	return {
+		"meta": frappe.get_meta(doctype, False),
+		"listview_settings": doc
+	}
+
+def set_listview_fields(doctype, listview_fields, removed_listview_fields):
+	meta = frappe.get_meta(doctype)
+
+	listview_fields = [f.get("fieldname") for f in frappe.parse_json(listview_fields) if f.get("fieldname")]
+
+	for field in removed_listview_fields:
+		set_in_list_view_property(doctype, meta.get_field(field), "0")
+
+	for field in listview_fields:
+		set_in_list_view_property(doctype, meta.get_field(field), "1")
+
+def set_in_list_view_property(doctype, field, value):
+	if not field or field.fieldname == "status_field":
+		return
+
+	property_setter = frappe.db.get_value("Property Setter", {"doc_type": doctype, "field_name": field.fieldname, "property": "in_list_view"})
+	if property_setter:
+		doc = frappe.get_doc("Property Setter", property_setter)
+		doc.value = value
+		doc.save()
+	else:
+		frappe.make_property_setter({
+			"doctype": doctype,
+			"doctype_or_field": "DocField",
+			"fieldname": field.fieldname,
+			"property": "in_list_view",
+			"value": value,
+			"property_type": "Check"
+		}, ignore_validate=True)
+
+@frappe.whitelist()
+def get_default_listview_fields(doctype):
+	meta = frappe.get_meta(doctype)
+	path = frappe.get_module_path(frappe.scrub(meta.module), "doctype", frappe.scrub(meta.name), frappe.scrub(meta.name) + ".json")
+	doctype_json = frappe.get_file_json(path)
+
+	fields = [f.get("fieldname") for f in doctype_json.get("fields") if f.get("in_list_view")]
+
+	if meta.title_field:
+		if not meta.title_field.strip() in fields:
+			fields.append(meta.title_field.strip())
+
+	return fields

frappe/desk/doctype/list_view_settings/test_list_view_settings.py

@@ -3,7 +3,8 @@
 # See license.txt
 from __future__ import unicode_literals
 
+# import frappe
 import unittest
 
-class TestListViewSetting(unittest.TestCase):
+class TestListViewSettings(unittest.TestCase):
 	pass

frappe/desk/doctype/module_onboarding/module_onboarding.js

@@ -1,7 +1,7 @@
 // Copyright (c) 2020, Frappe Technologies and contributors
 // For license information, please see license.txt
 
-frappe.ui.form.on("Onboarding", {
+frappe.ui.form.on("Module Onboarding", {
 	refresh: function(frm) {
 		frappe.boot.developer_mode &&
 			frm.set_intro(

frappe/desk/doctype/module_onboarding/module_onboarding.json

@@ -90,10 +90,10 @@
   }
  ],
  "links": [],
- "modified": "2020-05-01 19:37:21.492405",
+ "modified": "2020-05-18 19:42:39.738869",
  "modified_by": "Administrator",
  "module": "Desk",
- "name": "Onboarding",
+ "name": "Module Onboarding",
  "owner": "Administrator",
  "permissions": [
   {
@@ -118,6 +118,7 @@
    "share": 1
   }
  ],
+ "read_only": 1,
  "sort_field": "modified",
  "sort_order": "DESC",
  "track_changes": 1

frappe/desk/doctype/module_onboarding/module_onboarding.py

@@ -8,10 +8,10 @@ from frappe.model.document import Document
 from frappe.modules.export_file import export_to_files
 
 
-class Onboarding(Document):
+class ModuleOnboarding(Document):
 	def on_update(self):
 		if frappe.conf.developer_mode:
-			export_to_files(record_list=[['Onboarding', self.name]], record_module=self.module)
+			export_to_files(record_list=[['Module Onboarding', self.name]], record_module=self.module)
 
 			for step in self.steps:
 				export_to_files(record_list=[['Onboarding Step', step.step]], record_module=self.module)

frappe/desk/doctype/module_onboarding/test_module_onboarding.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 TestModuleOnboarding(unittest.TestCase):
+	pass

frappe/desk/doctype/note/note.js

@@ -1,9 +1,9 @@
 frappe.ui.form.on("Note", {
 	refresh: function(frm) {
-		if(frm.doc.__islocal) {
+		if (frm.doc.__islocal) {
 			frm.events.set_editable(frm, true);
 		} else {
-			if(!frm.doc.content) {
+			if (!frm.doc.content) {
 				frm.doc.content = "<span></span>";
 			}
 
@@ -18,16 +18,15 @@ frappe.ui.form.on("Note", {
 		// hide all fields other than content
 
 		// no permission
-		if(editable && !frm.perm[0].write) return;
+		if (editable && !frm.perm[0].write) return;
 
 		// content read_only
-		frm.set_df_property("content", "read_only", editable ? 0: 1);
+		frm.set_df_property("content", "read_only", editable ? 0 : 1);
 
 		// hide all other fields
 		$.each(frm.fields_dict, function(fieldname) {
-
-			if(fieldname !== "content") {
-				frm.set_df_property(fieldname, "hidden", editable ? 0: 1);
+			if (fieldname !== "content") {
+				frm.set_df_property(fieldname, "hidden", editable ? 0 : 1);
 			}
 		});
 
@@ -39,3 +38,16 @@ frappe.ui.form.on("Note", {
 		frm.is_note_editable = editable;
 	}
 });
+
+frappe.tour['Note'] = [
+	{
+		fieldname: "title",
+		title: "Title of the Note",
+		description: "This is the name by which the note will be saved, you can change this later",
+	},
+	{
+		fieldname: "public",
+		title: "Sets the Note to Public",
+		description: "You can change the visibility of the note with this, setting it to public will allow other users to view it.",
+	},
+];

frappe/desk/doctype/note/test_note.py

@@ -20,7 +20,7 @@ class TestNote(unittest.TestCase):
 		note = self.insert_note()
 		note.title = 'test note 1'
 		note.content = '1'
-		note.save()
+		note.save(ignore_version=False)
 
 		version = frappe.get_doc('Version', dict(docname=note.name))
 		data = version.get_data()
@@ -33,7 +33,7 @@ class TestNote(unittest.TestCase):
 
 		# test add
 		note.append('seen_by', {'user': 'Administrator'})
-		note.save()
+		note.save(ignore_version=False)
 
 		version = frappe.get_doc('Version', dict(docname=note.name))
 		data = version.get_data()
@@ -48,7 +48,7 @@ class TestNote(unittest.TestCase):
 
 		# test row change
 		note.seen_by[0].user = 'Guest'
-		note.save()
+		note.save(ignore_version=False)
 
 		version = frappe.get_doc('Version', dict(docname=note.name))
 		data = version.get_data()
@@ -62,7 +62,7 @@ class TestNote(unittest.TestCase):
 
 		# test remove
 		note.seen_by = []
-		note.save()
+		note.save(ignore_version=False)
 
 		version = frappe.get_doc('Version', dict(docname=note.name))
 		data = version.get_data()

frappe/desk/doctype/notification_log/notification_log.js

@@ -3,10 +3,43 @@
 
 frappe.ui.form.on('Notification Log', {
 	refresh: function(frm) {
-		let dt = frm.doc.document_type;
-		let dn = frm.doc.document_name;
-		frm.fields_dict.document_name.$input_wrapper
-			.find('.control-value')
-			.wrapInner(`<a href='#Form/${dt}/${dn}'></a>`);
+		if (frm.doc.attached_file) {
+			frm.trigger('set_attachment');
+		} else {
+			frm.get_field('attachment_link').$wrapper.empty();
+		}
+	},
+
+	open_reference_document: function(frm) {
+		const dt = frm.doc.document_type;
+		const dn = frm.doc.document_name;
+		frappe.set_route('Form', dt, dn);
+	},
+
+	set_attachment: function(frm) {
+		const attachment = JSON.parse(frm.doc.attached_file);
+
+		const $wrapper = frm.get_field('attachment_link').$wrapper;
+		$wrapper.html(`
+			<div class="attached-file text-medium">
+				<div class="ellipsis">
+					<i class="fa fa-paperclip"></i>
+					<a class="attached-file-link">${attachment.name}.pdf</a>
+				</div>
+			</div>
+		`);
+
+		$wrapper.find(".attached-file-link").click(() => {
+			const w = window.open(
+				frappe.urllib.get_full_url(`/api/method/frappe.utils.print_format.download_pdf?
+					doctype=${encodeURIComponent(attachment.doctype)}
+					&name=${encodeURIComponent(attachment.name)}
+					&format=${encodeURIComponent(attachment.print_format)}
+					&lang=${encodeURIComponent(attachment.lang)}`)
+			);
+			if (!w) {
+				frappe.msgprint(__("Please enable pop-ups"));
+			}
+		});
 	}
 });

frappe/desk/doctype/notification_log/notification_log.json

@@ -1,4 +1,5 @@
 {
+ "actions": [],
  "creation": "2019-08-26 13:37:34.165254",
  "doctype": "DocType",
  "editable_grid": 1,
@@ -8,10 +9,12 @@
   "for_user",
   "type",
   "email_content",
-  "column_break_4",
   "document_type",
   "read",
   "document_name",
+  "attached_file",
+  "attachment_link",
+  "open_reference_document",
   "from_user"
  ],
  "fields": [
@@ -20,57 +23,65 @@
    "fieldtype": "Text",
    "in_list_view": 1,
    "label": "Subject",
-   "read_only": 1
+   "show_days": 1,
+   "show_seconds": 1
   },
   {
    "fieldname": "for_user",
    "fieldtype": "Link",
+   "hidden": 1,
    "label": "For User",
    "options": "User",
-   "read_only": 1
+   "show_days": 1,
+   "show_seconds": 1
   },
   {
    "fieldname": "type",
    "fieldtype": "Select",
+   "hidden": 1,
    "in_list_view": 1,
    "in_standard_filter": 1,
    "label": "Type",
-   "options": "Mention\nEnergy Point\nAssignment\nShare",
-   "read_only": 1,
-   "search_index": 1
+   "options": "Mention\nEnergy Point\nAssignment\nShare\nAlert",
+   "search_index": 1,
+   "show_days": 1,
+   "show_seconds": 1
   },
   {
    "fieldname": "email_content",
-   "fieldtype": "Text",
-   "label": "Email Content",
-   "read_only": 1
-  },
-  {
-   "fieldname": "column_break_4",
-   "fieldtype": "Column Break"
+   "fieldtype": "Text Editor",
+   "label": "Message",
+   "show_days": 1,
+   "show_seconds": 1
   },
   {
    "fieldname": "document_type",
    "fieldtype": "Link",
+   "hidden": 1,
    "label": "Document Type",
    "options": "DocType",
-   "read_only": 1,
-   "search_index": 1
+   "search_index": 1,
+   "show_days": 1,
+   "show_seconds": 1
   },
   {
    "fieldname": "document_name",
    "fieldtype": "Data",
-   "label": "Document Name",
-   "read_only": 1,
-   "search_index": 1
+   "hidden": 1,
+   "label": "Document Link",
+   "search_index": 1,
+   "show_days": 1,
+   "show_seconds": 1
   },
   {
    "fieldname": "from_user",
    "fieldtype": "Link",
+   "hidden": 1,
    "label": "From User",
    "options": "User",
-   "read_only": 1,
-   "search_index": 1
+   "search_index": 1,
+   "show_days": 1,
+   "show_seconds": 1
   },
   {
    "default": "0",
@@ -78,26 +89,51 @@
    "fieldtype": "Check",
    "hidden": 1,
    "ignore_user_permissions": 1,
-   "label": "Read"
+   "label": "Read",
+   "show_days": 1,
+   "show_seconds": 1
+  },
+  {
+   "fieldname": "open_reference_document",
+   "fieldtype": "Button",
+   "label": "Open Reference Document",
+   "show_days": 1,
+   "show_seconds": 1
+  },
+  {
+   "fieldname": "attached_file",
+   "fieldtype": "Code",
+   "hidden": 1,
+   "label": "Attached File",
+   "options": "JSON",
+   "show_days": 1,
+   "show_seconds": 1
+  },
+  {
+   "fieldname": "attachment_link",
+   "fieldtype": "HTML",
+   "label": "Attachment Link",
+   "show_days": 1,
+   "show_seconds": 1
   }
  ],
+ "hide_toolbar": 1,
  "in_create": 1,
- "modified": "2019-11-12 15:22:35.283678",
+ "links": [],
+ "modified": "2020-05-31 22:31:12.886950",
  "modified_by": "umair@erpnext.com",
  "module": "Desk",
  "name": "Notification Log",
  "owner": "Administrator",
  "permissions": [
   {
-   "create": 1,
    "email": 1,
    "export": 1,
    "print": 1,
    "read": 1,
    "report": 1,
    "role": "All",
-   "share": 1,
-   "write": 1
+   "share": 1
   }
  ],
  "sort_field": "modified",

frappe/desk/doctype/notification_log/notification_log.py

@@ -48,6 +48,7 @@ def enqueue_create_notification(users, doc):
 
 	if isinstance(users, frappe.string_types):
 		users = [user.strip() for user in users.split(',') if user.strip()]
+	users = list(set(users))
 
 	frappe.enqueue(
 		'frappe.desk.doctype.notification_log.notification_log.make_notification_logs',
@@ -58,6 +59,7 @@ def enqueue_create_notification(users, doc):
 
 def make_notification_logs(doc, users):
 	from frappe.social.doctype.energy_point_settings.energy_point_settings import is_energy_point_enabled
+
 	for user in users:
 		if frappe.db.exists('User', user):
 			if is_notifications_enabled(user):
@@ -68,7 +70,7 @@ def make_notification_logs(doc, users):
 				_doc.update(doc)
 				_doc.for_user = user
 				_doc.subject = _doc.subject.replace('<div>', '').replace('</div>', '')
-				if _doc.for_user != _doc.from_user or doc.type == 'Energy Point':
+				if _doc.for_user != _doc.from_user or doc.type == 'Energy Point' or doc.type == 'Alert':
 					_doc.insert(ignore_permissions=True)
 
 def send_notification_email(doc):

frappe/desk/doctype/notification_log/test_notification_log.py

@@ -13,7 +13,7 @@ class TestNotificationLog(unittest.TestCase):
 		user = get_user()
 
 		assign_task({
-			"assign_to": user,
+			"assign_to": [user],
 			"doctype": 'ToDo',
 			"name": todo.name,
 			"description": todo.description

frappe/desk/doctype/notification_settings/notification_settings.json

@@ -1,4 +1,5 @@
 {
+ "actions": [],
  "autoname": "Prompt",
  "creation": "2019-09-11 22:15:44.851526",
  "doctype": "DocType",
@@ -21,52 +22,68 @@
    "default": "1",
    "fieldname": "enabled",
    "fieldtype": "Check",
-   "label": "Enabled"
+   "label": "Enabled",
+   "show_days": 1,
+   "show_seconds": 1
   },
   {
    "fieldname": "subscribed_documents",
    "fieldtype": "Table MultiSelect",
    "label": "Subscribed Documents",
-   "options": "Notification Subscribed Document"
+   "options": "Notification Subscribed Document",
+   "show_days": 1,
+   "show_seconds": 1
   },
   {
    "fieldname": "column_break_3",
    "fieldtype": "Section Break",
-   "label": "Email Settings"
+   "label": "Email Settings",
+   "show_days": 1,
+   "show_seconds": 1
   },
   {
    "default": "1",
    "fieldname": "enable_email_notifications",
    "fieldtype": "Check",
-   "label": "Enable Email Notifications"
+   "label": "Enable Email Notifications",
+   "show_days": 1,
+   "show_seconds": 1
   },
   {
    "default": "1",
    "depends_on": "enable_email_notifications",
    "fieldname": "enable_email_mention",
    "fieldtype": "Check",
-   "label": "Mentions"
+   "label": "Mentions",
+   "show_days": 1,
+   "show_seconds": 1
   },
   {
    "default": "1",
    "depends_on": "enable_email_notifications",
    "fieldname": "enable_email_assignment",
    "fieldtype": "Check",
-   "label": "Assignments"
+   "label": "Assignments",
+   "show_days": 1,
+   "show_seconds": 1
   },
   {
    "default": "1",
    "depends_on": "enable_email_notifications",
    "fieldname": "enable_email_energy_point",
    "fieldtype": "Check",
-   "label": "Energy Points"
+   "label": "Energy Points",
+   "show_days": 1,
+   "show_seconds": 1
   },
   {
    "default": "1",
    "depends_on": "enable_email_notifications",
    "fieldname": "enable_email_share",
    "fieldtype": "Check",
-   "label": "Document Share"
+   "label": "Document Share",
+   "show_days": 1,
+   "show_seconds": 1
   },
   {
    "default": "__user",
@@ -75,18 +92,23 @@
    "hidden": 1,
    "label": "User",
    "options": "User",
-   "read_only": 1
+   "read_only": 1,
+   "show_days": 1,
+   "show_seconds": 1
   },
   {
    "default": "0",
    "fieldname": "seen",
    "fieldtype": "Check",
    "hidden": 1,
-   "label": "Seen"
+   "label": "Seen",
+   "show_days": 1,
+   "show_seconds": 1
   }
  ],
  "in_create": 1,
- "modified": "2019-11-19 12:57:59.356786",
+ "links": [],
+ "modified": "2020-05-31 22:16:40.798019",
  "modified_by": "Administrator",
  "module": "Desk",
  "name": "Notification Settings",

frappe/desk/doctype/notification_settings/notification_settings.py

@@ -28,6 +28,9 @@ def is_email_notifications_enabled_for_type(user, notification_type):
 	if not is_email_notifications_enabled(user):
 		return False
 
+	if notification_type == 'Alert':
+		return False
+
 	fieldname = 'enable_email_' + frappe.scrub(notification_type)
 	enabled = frappe.db.get_value('Notification Settings', user, fieldname)
 	if enabled is None:

frappe/desk/doctype/number_card/number_card.json

@@ -1,6 +1,5 @@
 {
  "actions": [],
- "autoname": "CARD.#####",
  "creation": "2020-04-15 18:06:39.444683",
  "doctype": "DocType",
  "editable_grid": 1,
@@ -99,7 +98,7 @@
   }
  ],
  "links": [],
- "modified": "2020-05-01 15:23:29.550243",
+ "modified": "2020-05-06 19:47:57.753574",
  "modified_by": "Administrator",
  "module": "Desk",
  "name": "Number Card",