Merge branch 'develop' of https://github.com/frappe/frappe into server_script_enhancements

.github/helper/install.sh

@@ -17,6 +17,7 @@ if [ "$TYPE" == "server" ]; then
 fi
 
 if [ "$DB" == "mariadb" ];then
+      sudo apt install mariadb-client-10.3
       mysql --host 127.0.0.1 --port 3306 -u root -e "SET GLOBAL character_set_server = 'utf8mb4'";
       mysql --host 127.0.0.1 --port 3306 -u root -e "SET GLOBAL collation_server = 'utf8mb4_unicode_ci'";
 
@@ -58,4 +59,4 @@ cd ../..
 bench start &
 bench --site test_site reinstall --yes
 if [ "$TYPE" == "server" ]; then bench --site test_site_producer reinstall --yes; fi
-bench build --app frappe
+bench build --app frappe

.github/workflows/docs-checker.yml

@@ -12,7 +12,7 @@ jobs:
       - name: 'Setup Environment'
         uses: actions/setup-python@v2
         with:
-          python-version: 3.6
+          python-version: 3.7
 
       - name: 'Clone repo'
         uses: actions/checkout@v2

.github/workflows/patch-mariadb-tests.yml

@@ -9,7 +9,7 @@ concurrency:
 
 jobs:
   test:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-latest
 
     name: Patch Test
 
@@ -102,4 +102,25 @@ jobs:
           cd ~/frappe-bench/
           wget https://frappeframework.com/files/v10-frappe.sql.gz
           bench --site test_site --force restore ~/frappe-bench/v10-frappe.sql.gz
+
+          source env/bin/activate
+          cd apps/frappe/
+          git remote set-url upstream https://github.com/frappe/frappe.git
+          git fetch --all --tags
+
+          taglist=$(git tag --sort version:refname | grep -v "beta")
+          last_release=$(echo "$taglist" | tail -1 | cut -d . -f 1 | cut -c 2-)
+
+          for version in $(seq 12 "$last_release")
+          do
+              last_tag=$(echo "$taglist" | grep "v$version" | tail -1)
+              echo "Updating to $last_tag"
+              git checkout -q -f "$last_tag"
+              pip install -q -r requirements.txt
+              bench --site test_site migrate
+          done
+
+          echo "Updating to last commit"
+          git checkout -q -f "$GITHUB_SHA"
+          bench setup requirements --python
           bench --site test_site migrate

.github/workflows/publish-assets-develop.yml

@@ -18,7 +18,7 @@ jobs:
           node-version: 14
       - uses: actions/setup-python@v2
         with:
-          python-version: '3.6'
+          python-version: '3.7'
       - name: Set up bench and build assets
         run: |
           npm install -g yarn

.github/workflows/publish-assets-releases.yml

@@ -21,7 +21,7 @@ jobs:
           python-version: '12.x'
       - uses: actions/setup-python@v2
         with:
-          python-version: '3.6'
+          python-version: '3.7'
       - name: Set up bench and build assets
         run: |
           npm install -g yarn

.github/workflows/server-mariadb-tests.yml

@@ -13,7 +13,7 @@ concurrency:
 
 jobs:
   test:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-latest
 
     strategy:
       fail-fast: false
@@ -127,4 +127,4 @@ jobs:
           name: MariaDB
           fail_ci_if_error: true
           files: /home/runner/frappe-bench/sites/coverage.xml
-          verbose: true
+          verbose: true

.github/workflows/server-postgres-tests.yml

@@ -12,7 +12,7 @@ concurrency:
 
 jobs:
   test:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-latest
 
     strategy:
       fail-fast: false

.github/workflows/translation_linter.yml

@@ -1,22 +0,0 @@
-name: Frappe Linter
-on:
-  pull_request:
-    branches:
-      - develop
-      - version-12-hotfix
-      - version-11-hotfix
-jobs:
-  check_translation:
-    name: Translation Syntax Check
-    runs-on: ubuntu-18.04
-    steps:
-    - uses: actions/checkout@v2
-    - name: Setup python3
-      uses: actions/setup-python@v1
-      with:
-        python-version: 3.6
-    - name: Validating Translation Syntax
-      run: |
-        git fetch origin $GITHUB_BASE_REF:$GITHUB_BASE_REF -q
-        files=$(git diff --name-only --diff-filter=d $GITHUB_BASE_REF)
-        python $GITHUB_WORKSPACE/.github/helper/translation.py $files

.github/workflows/ui-tests.yml

@@ -12,7 +12,7 @@ concurrency:
 
 jobs:
   test:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-latest
 
     strategy:
       fail-fast: false

codecov.yml

@@ -1,9 +1,13 @@
 codecov:
   require_ci_to_pass: yes
+
+coverage:
   status:
     project:
       default:
+        target: auto
         threshold: 0.5%
+
 comment:
-  layout: "diff, flags, files"
+  layout: "diff"
   require_changes: true

cypress/fixtures/doctype_with_tab_break.js

@@ -0,0 +1,59 @@
+export default {
+	name: 'Form With Tab Break',
+	custom: 1,
+	actions: [],
+	doctype: 'DocType',
+	engine: 'InnoDB',
+	fields: [
+		{
+			fieldname: 'username',
+			fieldtype: 'Data',
+			label: 'Name',
+			options: 'Name'
+		},
+		{
+			fieldname: 'tab',
+			fieldtype: 'Tab Break',
+			label: 'Tab 2',
+		},
+		{
+			fieldname: 'Phone',
+			fieldtype: 'Data',
+			label: 'Phone',
+			options: 'Phone',
+			reqd: 1
+		},
+	],
+	links: [
+		{
+			"group": "Profile",
+			"link_doctype": "Contact",
+			"link_fieldname": "user"
+		},
+		{
+			"group": "Profile",
+			"link_doctype": "Chat Profile",
+			"link_fieldname": "user"
+		},
+	],
+	modified_by: 'Administrator',
+	module: 'Custom',
+	owner: 'Administrator',
+	permissions: [
+		{
+			create: 1,
+			delete: 1,
+			email: 1,
+			print: 1,
+			read: 1,
+			role: 'System Manager',
+			share: 1,
+			write: 1
+		}
+	],
+	quick_entry: 1,
+	autoname: "format: Test-{####}",
+	sort_field: 'modified',
+	sort_order: 'ASC',
+	track_changes: 1
+};

cypress/integration/api.js

@@ -31,8 +31,13 @@ context('API Resources', () => {
 	});
 
 	it('Removes the Comments', () => {
-		cy.get_list('Comment').then(body => body.data.forEach(comment => {
-			cy.remove_doc('Comment', comment.name);
-		}));
+		cy.get_list('Comment').then(body => {
+			let comment_names = [];
+			body.data.map(comment => comment_names.push(comment.name));
+			comment_names = [...new Set(comment_names)]; // remove duplicates
+			comment_names.forEach((comment_name) => {
+				cy.remove_doc('Comment', comment_name);
+			});
+		});
 	});
 });

cypress/integration/control_float.js

@@ -0,0 +1,93 @@
+context("Control Float", () => {
+	before(() => {
+		cy.login();
+		cy.visit("/app/website");
+	});
+
+	function get_dialog_with_float() {
+		return cy.dialog({
+			title: "Float Check",
+			fields: [
+				{
+					fieldname: "float_number",
+					fieldtype: "Float",
+					Label: "Float"
+				}
+			]
+		});
+	}
+
+	it("check value changes", () => {
+		get_dialog_with_float().as("dialog");
+
+		let data = get_data();
+		data.forEach(x => {
+			cy.window()
+				.its("frappe")
+				.then(frappe => {
+					frappe.boot.sysdefaults.number_format = x.number_format;
+				});
+			x.values.forEach(d => {
+				cy.get_field("float_number", "Float").clear();
+				cy.fill_field("float_number", d.input, "Float").blur();
+				cy.get_field("float_number", "Float").should(
+					"have.value",
+					d.blur_expected
+				);
+
+				cy.get_field("float_number", "Float").focus();
+				cy.get_field("float_number", "Float").blur();
+				cy.get_field("float_number", "Float").focus();
+				cy.get_field("float_number", "Float").should(
+					"have.value",
+					d.focus_expected
+				);
+			});
+		});
+	});
+
+	function get_data() {
+		return [
+			{
+				number_format: "#.###,##",
+				values: [
+					{
+						input: "364.87,334",
+						blur_expected: "36.487,334",
+						focus_expected: "36487.334"
+					},
+					{
+						input: "36487,334",
+						blur_expected: "36.487,334",
+						focus_expected: "36487.334"
+					},
+					{
+						input: "100",
+						blur_expected: "100,000",
+						focus_expected: "100"
+					}
+				]
+			},
+			{
+				number_format: "#,###.##",
+				values: [
+					{
+						input: "364,87.334",
+						blur_expected: "36,487.334",
+						focus_expected: "36487.334"
+					},
+					{
+						input: "36487.334",
+						blur_expected: "36,487.334",
+						focus_expected: "36487.334"
+					},
+					{
+						input: "100",
+						blur_expected: "100.000",
+						focus_expected: "100"
+					}
+				]
+			}
+		];
+	}
+});

cypress/integration/dashboard_links.js

@@ -9,17 +9,20 @@ context('Dashboard links', () => {
 		cy.clear_filters();
 
 		cy.visit('/app/user');
-		cy.get('.list-row-col > .level-item > .ellipsis').eq(0).click();
+		cy.get('.list-row-col > .level-item > .ellipsis').eq(0).click({ force: true });
 
 		//To check if initially the dashboard contains only the "Contact" link and there is no counter
 		cy.get('[data-doctype="Contact"]').should('contain', 'Contact');
 
 		//Adding a new contact
-		cy.get('.btn[data-doctype="Contact"]').click();
+		cy.get('.document-link-badge[data-doctype="Contact"]').click();
+		cy.wait(300);
+		cy.findByRole('button', {name: 'Add Contact'}).should('be.visible');
+		cy.findByRole('button', {name: 'Add Contact'}).click();
 		cy.get('[data-doctype="Contact"][data-fieldname="first_name"]').type('Admin');
 		cy.findByRole('button', {name: 'Save'}).click();
 		cy.visit('/app/user');
-		cy.get('.list-row-col > .level-item > .ellipsis').eq(0).click();
+		cy.get('.list-row-col > .level-item > .ellipsis').eq(0).click({ force: true });
 
 		//To check if the counter for contact doc is "1" after adding the contact
 		cy.get('[data-doctype="Contact"] > .count').should('contain', '1');
@@ -27,7 +30,7 @@ context('Dashboard links', () => {
 
 		//Deleting the newly created contact
 		cy.visit('/app/contact');
-		cy.get('.list-subject > .select-like > .list-row-checkbox').eq(0).click();
+		cy.get('.list-subject > .select-like > .list-row-checkbox').eq(0).click({ force: true });
 		cy.findByRole('button', {name: 'Actions'}).click();
 		cy.get('.actions-btn-group [data-label="Delete"]').click();
 		cy.findByRole('button', {name: 'Yes'}).click({delay: 700});
@@ -36,7 +39,7 @@ context('Dashboard links', () => {
 		//To check if the counter from the "Contact" doc link is removed
 		cy.wait(700);
 		cy.visit('/app/user');
-		cy.get('.list-row-col > .level-item > .ellipsis').eq(0).click();
+		cy.get('.list-row-col > .level-item > .ellipsis').eq(0).click({ force: true });
 		cy.get('[data-doctype="Contact"]').should('contain', 'Contact');
 	});
 

cypress/integration/datetime_field_form_validation.js

@@ -1,19 +1,19 @@
-context('Datetime Field Validation', () => {
-	before(() => {
-		cy.login();
-		cy.visit('/app/communication');
-		cy.window().its('frappe').then(frappe => {
-			frappe.call("frappe.tests.ui_test_helpers.create_communication_records");
-		});
-	});
+// TODO: Enable this again
+// currently this is flaky possibly because of different timezone in CI
 
-	// validating datetime field value when value is set from backend and get validated on form load.
-	it('datetime field form validation', () => {
-		cy.visit('/app/communication');
-		cy.get('a[title="Test Form Communication 1"]').invoke('attr', 'data-name')
-			.then((name) => {
-				cy.visit(`/app/communication/${name}`);
-				cy.get('.indicator-pill').should('contain', 'Open').should('have.class', 'red');
-			});
-	});
-});
+// context('Datetime Field Validation', () => {
+// 	before(() => {
+// 		cy.login();
+// 		cy.visit('/app/communication');
+// 	});
+
+// 	it('datetime field form validation', () => {
+// 		// validating datetime field value when value is set from backend and get validated on form load.
+// 		cy.window().its('frappe').then(frappe => {
+// 			return frappe.xcall("frappe.tests.ui_test_helpers.create_communication_record");
+// 		}).then(doc => {
+// 			cy.visit(`/app/communication/${doc.name}`);
+// 			cy.get('.indicator-pill').should('contain', 'Open').should('have.class', 'red');
+// 		});
+// 	});
+// });

cypress/integration/discussions.js

@@ -0,0 +1,63 @@
+context('Discussions', () => {
+	before(() => {
+		cy.login();
+		cy.visit('/app');
+		return cy.window().its('frappe').then(frappe => {
+			return frappe.call('frappe.tests.ui_test_helpers.create_data_for_discussions');
+		});
+	});
+
+	const reply_through_modal = () => {
+		cy.visit('/test-page-discussions');
+
+		// Open the modal
+		cy.get('.reply').click();
+		cy.wait(500);
+		cy.get('.discussion-modal').should('be.visible');
+
+		// Enter title
+		cy.get('.modal .topic-title').type('Discussion from tests')
+			.should('have.value', 'Discussion from tests');
+
+		// Enter comment
+		cy.get('.modal .comment-field')
+			.type('This is a discussion from the cypress ui tests.')
+			.should('have.value', 'This is a discussion from the cypress ui tests.');
+
+		// Submit
+		cy.get('.modal .submit-discussion').click();
+		cy.wait(2000);
+
+		// Check if discussion is added to page and content is visible
+		cy.get('.sidebar-parent:first .discussion-topic-title').should('have.text', 'Discussion from tests');
+		cy.get('.discussion-on-page:visible').should('have.class', 'show');
+		cy.get('.discussion-on-page:visible .reply-card .reply-text')
+			.should('have.text', 'This is a discussion from the cypress ui tests.\n');
+
+	};
+
+	const reply_through_comment_box = () => {
+		cy.get('.discussion-on-page:visible .comment-field')
+			.type('This is a discussion from the cypress ui tests. \n\nThis comment was entered through the commentbox on the page.')
+			.should('have.value', 'This is a discussion from the cypress ui tests. \n\nThis comment was entered through the commentbox on the page.');
+
+		cy.get('.discussion-on-page:visible .submit-discussion').click();
+		cy.wait(3000);
+		cy.get('.discussion-on-page:visible').should('have.class', 'show');
+		cy.get('.discussion-on-page:visible').children(".reply-card").eq(1).children(".reply-text")
+			.should('have.text', 'This is a discussion from the cypress ui tests. \n\nThis comment was entered through the commentbox on the page.\n');
+	};
+
+	const cancel_and_clear_comment_box = () => {
+		cy.get('.discussion-on-page:visible .comment-field')
+			.type('This is a discussion from the cypress ui tests.')
+			.should('have.value', 'This is a discussion from the cypress ui tests.');
+
+		cy.get('.discussion-on-page:visible .cancel-comment').click();
+		cy.get('.discussion-on-page:visible .comment-field').should('have.value', '');
+	};
+
+	it('reply through modal', reply_through_modal);
+	it('reply through comment box', reply_through_comment_box);
+	it('cancel and clear comment box', cancel_and_clear_comment_box);
+});

cypress/integration/folder_navigation.js

@@ -71,7 +71,7 @@ context('Folder Navigation', () => {
 	it('Deleting Test Folder from the home', () => {
 	//Deleting the Test Folder added in the home directory
 		cy.visit('/app/file/view/home');
-		cy.get('.level-left > .list-subject > .list-row-checkbox').eq(0).click({force: true, delay: 500});
+		cy.get('.level-left > .list-subject > .file-select >.list-row-checkbox').eq(0).click({force: true, delay: 500});
 		cy.findByRole('button', {name: 'Actions'}).click();
 		cy.get('.actions-btn-group [data-label="Delete"]').click();
 		cy.findByRole('button', {name: 'Yes'}).click();

cypress/integration/form.js

@@ -8,7 +8,10 @@ context('Form', () => {
 	});
 	it('create a new form', () => {
 		cy.visit('/app/todo/new');
-		cy.fill_field('description', 'this is a test todo', 'Text Editor');
+		cy.get('[data-fieldname="description"] .ql-editor')
+			.first()
+			.click()
+			.type('this is a test todo');
 		cy.wait(300);
 		cy.get('.page-title').should('contain', 'Not Saved');
 		cy.intercept({

cypress/integration/form_tab_break.js

@@ -0,0 +1,31 @@
+import doctype_with_tab_break from '../fixtures/doctype_with_tab_break';
+const doctype_name = doctype_with_tab_break.name;
+context("Form Tab Break", () => {
+	before(() => {
+		cy.login();
+		cy.visit('/app/website');
+		return cy.insert_doc('DocType', doctype_with_tab_break, true);
+	});
+	it("Should switch tab and open correct tabs on validation error", () => {
+		cy.new_form(doctype_name);
+		// test tab switch
+		cy.findByRole("tab", {name: "Tab 2"}).click();
+		cy.findByText("Phone");
+		cy.findByRole("tab", {name: "Details"}).click();
+		cy.findByText("Name");
+
+		// form should switch to the tab with un-filled mandatory field
+		cy.fill_field("username", "Test");
+		cy.findByRole("button", {name: "Save"}).click();
+		cy.findByText("Missing Fields");
+		cy.hide_dialog();
+		cy.findByText("Phone");
+		cy.fill_field("phone", "12345678");
+		cy.findByRole("button", {name: "Save"}).click();
+
+		// After save, first tab should have dashboard
+		cy.get(".form-tabs > .nav-item").eq(0).click();
+		cy.findByText("Connections");
+
+	});
+});

cypress/integration/list_view.js

@@ -6,12 +6,29 @@ context('List View', () => {
 			return frappe.xcall("frappe.tests.ui_test_helpers.setup_workflow");
 		});
 	});
+
+	it('Keep checkbox checked after Bulk Update', () => {
+		cy.go_to_list('ToDo');
+		cy.get('.list-row-container .list-row-checkbox').click({ multiple: true, force: true });
+		cy.get('.actions-btn-group button').contains('Actions').should('be.visible').click();
+		cy.get('.dropdown-menu li:visible .dropdown-item .menu-item-label[data-label="Edit"]').click();
+
+		cy.get('.modal-body .form-control[data-fieldname="field"]').first().select('Due Date').wait(200);
+		cy.fill_field('value', '09-28-21', 'Date');
+
+		cy.get('.modal-footer .standard-actions .btn-primary').click();
+		cy.wait(500);
+
+		cy.get('.actions-btn-group button').contains('Actions').should('be.visible').click();
+		cy.get('.list-row-container .list-row-checkbox:checked').should('be.visible');
+	});
+
 	it('enables "Actions" button', () => {
-		const actions = ['Approve', 'Reject', 'Edit', 'Assign To', 'Apply Assignment Rule', 'Add Tags', 'Print', 'Delete'];
+		const actions = ['Approve', 'Reject', 'Edit', 'Export', 'Assign To', 'Apply Assignment Rule', 'Add Tags', 'Print', 'Delete'];
 		cy.go_to_list('ToDo');
 		cy.get('.list-row-container:contains("Pending") .list-row-checkbox').click({ multiple: true, force: true });
 		cy.get('.actions-btn-group button').contains('Actions').should('be.visible').click();
-		cy.get('.dropdown-menu li:visible .dropdown-item').should('have.length', 8).each((el, index) => {
+		cy.get('.dropdown-menu li:visible .dropdown-item').should('have.length', 9).each((el, index) => {
 			cy.wrap(el).contains(actions[index]);
 		}).then((elements) => {
 			cy.intercept({
@@ -24,10 +41,11 @@ context('List View', () => {
 			}).as('real-time-update');
 			cy.wrap(elements).contains('Approve').click();
 			cy.wait(['@bulk-approval', '@real-time-update']);
-			cy.hide_dialog();
+			cy.wait(300);
+			cy.get_open_dialog().find('.btn-modal-close').click();
+			cy.reload();
 			cy.clear_filters();
 			cy.get('.list-row-container:visible').should('contain', 'Approved');
 		});
 	});
 });
-

cypress/integration/multi_select_dialog.js

@@ -0,0 +1,58 @@
+context('MultiSelectDialog', () => {
+	before(() => {
+		cy.login();
+		cy.visit('/app');
+	});
+
+	function open_multi_select_dialog() {
+		cy.window().its('frappe').then(frappe => {
+			new frappe.ui.form.MultiSelectDialog({
+				doctype: "Assignment Rule",
+				target: {},
+				setters: {
+					document_type: null,
+					priority: null
+				},
+				add_filters_group: 1,
+				allow_child_item_selection: 1,
+				child_fieldname: "assignment_days",
+				child_columns: ["day"]
+			});
+		});
+	}
+
+	it('multi select dialog api works', () => {
+		open_multi_select_dialog();
+		cy.get_open_dialog().should('contain', 'Select Assignment Rules');
+	});
+
+	it('checks for filters', () => {
+		['search_term', 'document_type', 'priority'].forEach(fieldname => {
+			cy.get_open_dialog().get(`.frappe-control[data-fieldname="${fieldname}"]`).should('exist');
+		});
+
+		// add_filters_group: 1 should add a filter group
+		cy.get_open_dialog().get(`.frappe-control[data-fieldname="filter_area"]`).should('exist');
+
+	});
+
+	it('checks for child item selection', () => {
+		cy.get_open_dialog()
+			.get(`.dt-row-header`).should('not.exist');
+
+		cy.get_open_dialog()
+			.get(`.frappe-control[data-fieldname="allow_child_item_selection"]`)
+			.should('exist')
+			.click();
+
+		cy.get_open_dialog()
+			.get(`.frappe-control[data-fieldname="child_selection_area"]`)
+			.should('exist');
+
+		cy.get_open_dialog()
+			.get(`.dt-row-header`).should('contain', 'Assignment Rule');
+
+		cy.get_open_dialog()
+			.get(`.dt-row-header`).should('contain', 'Day');
+	});
+});

cypress/integration/navigation.js

@@ -1,7 +1,6 @@
 context('Navigation', () => {
 	before(() => {
 		cy.login();
-		cy.visit('/app/website');
 	});
 	it('Navigate to route with hash in document name', () => {
 		cy.insert_doc('ToDo', {'__newname': 'ABC#123', 'description': 'Test this', 'ignore_duplicate': true});
@@ -11,4 +10,16 @@ context('Navigation', () => {
 		cy.go('back');
 		cy.title().should('eq', 'Website');
 	});
+
+	it.only('Navigate to previous page after login', () => {
+		cy.visit('/app/todo');
+		cy.findByTitle('To Do').should('be.visible');
+		cy.request('/api/method/logout');
+		cy.reload();
+		cy.get('.btn-primary').contains('Login').click();
+		cy.location('pathname').should('eq', '/login');
+		cy.login();
+		cy.visit('/app');
+		cy.location('pathname').should('eq', '/app/todo');
+	});
 });

cypress/integration/sidebar.js

@@ -6,12 +6,12 @@ context('Sidebar', () => {
 	});
 
 	it('Test for checking "Assigned To" counter value, adding filter and adding & removing an assignment', () => {
-		cy.click_sidebar_button(0);
+		cy.click_sidebar_button("Assigned To");
 
 		//To check if no filter is available in "Assigned To" dropdown
 		cy.get('.empty-state').should('contain', 'No filters found');
 
-		cy.click_sidebar_button(1);
+		cy.click_sidebar_button("Created By");
 
 		//To check if "Created By" dropdown contains filter
 		cy.get('.group-by-item > .dropdown-item').should('contain', 'Me');
@@ -22,7 +22,7 @@ context('Sidebar', () => {
 		cy.get_field('assign_to_me', 'Check').click();
 		cy.get('.modal-footer > .standard-actions > .btn-primary').click();
 		cy.visit('/app/doctype');
-		cy.click_sidebar_button(0);
+		cy.click_sidebar_button("Assigned To");
 
 		//To check if filter is added in "Assigned To" dropdown after assignment
 		cy.get('.group-by-field.show > .dropdown-menu > .group-by-item > .dropdown-item').should('contain', '1');
@@ -38,20 +38,19 @@ context('Sidebar', () => {
 		cy.get('.fieldname-select-area > .awesomplete > .form-control').should('have.value', 'Assigned To');
 		cy.get('.condition').should('have.value', 'like');
 		cy.get('.filter-field > .form-group > .input-with-feedback').should('have.value', '%Administrator%');
+		cy.click_filter_button();
 
 		//To remove the applied filter
-		cy.get('.filter-action-buttons > div > .btn-secondary').contains('Clear Filters').click();
-		cy.click_filter_button();
-		cy.get('.filter-selector > .btn').should('contain', 'Filter');
+		cy.clear_filters();
 
 		//To remove the assignment
 		cy.visit('/app/doctype');
 		cy.click_listview_row_item(0);
 		cy.get('.assignments > .avatar-group > .avatar > .avatar-frame').click();
 		cy.get('.remove-btn').click({force: true});
-		cy.get('.modal.show > .modal-dialog > .modal-content > .modal-header > .modal-actions > .btn-modal-close').click();
+		cy.hide_dialog();
 		cy.visit('/app/doctype');
-		cy.click_sidebar_button(0);
+		cy.click_sidebar_button("Assigned To");
 		cy.get('.empty-state').should('contain', 'No filters found');
 	});
 });

cypress/integration/timeline.js

@@ -4,13 +4,14 @@ context('Timeline', () => {
 	before(() => {
 		cy.visit('/login');
 		cy.login();
-		cy.visit('/app/todo');
 	});
 
 	it('Adding new ToDo, adding new comment, verifying comment addition & deletion and deleting ToDo', () => {
 		//Adding new ToDo
+		cy.visit('/app/todo');
 		cy.click_listview_primary_button('Add ToDo');
 		cy.findByRole('button', {name: 'Edit in full page'}).click();
+		cy.findByTitle('New ToDo').should('be.visible');
 		cy.get('[data-fieldname="description"] .ql-editor').eq(0).type('Test ToDo', {force: true});
 		cy.wait(200);
 		cy.findByRole('button', {name: 'Save'}).click();
@@ -28,15 +29,15 @@ context('Timeline', () => {
 		cy.get('.timeline-content').should('contain', 'Testing Timeline');
 
 		//Editing comment
-		cy.click_timeline_action_btn(0);
+		cy.click_timeline_action_btn("Edit");
 		cy.get('.timeline-content [data-fieldname="comment"] .ql-editor').first().type(' 123');
-		cy.click_timeline_action_btn(0);
+		cy.click_timeline_action_btn("Save");
 
 		//To check if the edited comment text is visible in timeline content
 		cy.get('.timeline-content').should('contain', 'Testing Timeline 123');
 
 		//Discarding comment
-		cy.click_timeline_action_btn(0);
+		cy.click_timeline_action_btn("Edit");
 		cy.findByRole('button', {name: 'Dismiss'}).click();
 
 		//To check if after discarding the timeline content is same as previous
@@ -81,7 +82,7 @@ context('Timeline', () => {
 		cy.visit('/app/custom-submittable-doctype');
 		cy.get('.list-subject > .select-like > .list-row-checkbox').eq(0).click();
 		cy.findByRole('button', {name: 'Actions'}).click();
-		cy.get('.actions-btn-group > .dropdown-menu > li > .grey-link').eq(7).click();
+		cy.get('.actions-btn-group > .dropdown-menu > li > .dropdown-item').contains("Delete").click();
 		cy.click_modal_primary_button('Yes', {force: true, delay: 700});
 
 		//Deleting the custom doctype

cypress/integration/timeline_email.js

@@ -5,14 +5,16 @@ context('Timeline Email', () => {
 		cy.visit('/app/todo');
 	});
 
-	it('Adding new ToDo, adding email and verifying timeline content for email attachment, deleting attachment and ToDo', () => {
-		//Adding new ToDo
+	it('Adding new ToDo', () => {
 		cy.click_listview_primary_button('Add ToDo');
 		cy.get('.custom-actions:visible > .btn').contains("Edit in full page").click({delay: 500});
 		cy.fill_field("description", "Test ToDo",  "Text Editor");
 		cy.wait(500);
 		cy.get('.primary-action').contains('Save').click({force: true});
 		cy.wait(700);
+	});
+
+	it('Adding email and verifying timeline content for email attachment, deleting attachment and ToDo', () => {
 		cy.visit('/app/todo');
 		cy.get('.list-row > .level-left > .list-subject').eq(0).click();
 
@@ -41,11 +43,13 @@ context('Timeline Email', () => {
 		cy.get('#page-Communication > .page-head > .container > .row > .col > .standard-actions > .menu-btn-group > .btn').click();
 		cy.get('#page-Communication > .page-head > .container > .row > .col > .standard-actions > .menu-btn-group > .dropdown-menu > li > .grey-link').eq(9).click();
 		cy.get('.modal.show > .modal-dialog > .modal-content > .modal-footer > .standard-actions > .btn-primary').click();
+
 		cy.visit('/app/todo');
 		cy.get('.list-row > .level-left > .list-subject > .level-item.ellipsis > .ellipsis').eq(0).click();
 
 		//Removing the added attachment
 		cy.get('.attachment-row > .data-pill > .remove-btn > .icon').click();
+		cy.wait(500);
 		cy.get('.modal-footer:visible > .standard-actions > .btn-primary').contains('Yes').click();
 
 		//To check if the removed attachment is shown in the timeline content

cypress/support/commands.js

@@ -187,7 +187,7 @@ Cypress.Commands.add('fill_field', (fieldname, value, fieldtype = 'Data') => {
 	if (fieldtype === 'Select') {
 		cy.get('@input').select(value);
 	} else {
-		cy.get('@input').type(value, {waitForAnimations: false, force: true});
+		cy.get('@input').type(value, {waitForAnimations: false, force: true, delay: 100});
 	}
 	return cy.get('@input');
 });
@@ -252,7 +252,8 @@ Cypress.Commands.add('new_form', doctype => {
 });
 
 Cypress.Commands.add('go_to_list', doctype => {
-	cy.visit(`/app/list/${doctype}/list`);
+	let dt_in_route = doctype.toLowerCase().replace(/ /g, '-');
+	cy.visit(`/app/${dt_in_route}`);
 });
 
 Cypress.Commands.add('clear_cache', () => {
@@ -316,7 +317,11 @@ Cypress.Commands.add('add_filter', () => {
 });
 
 Cypress.Commands.add('clear_filters', () => {
-	cy.get('.filter-section .filter-button').click();
+	cy.intercept({
+		method: 'POST',
+		url: 'api/method/frappe.model.utils.user_settings.save'
+	}).as('filter-saved');
+	cy.get('.filter-section .filter-button').click({force: true});
 	cy.wait(300);
 	cy.get('.filter-popover').should('exist');
 	cy.get('.filter-popover').find('.clear-filters').click();
@@ -324,16 +329,15 @@ Cypress.Commands.add('clear_filters', () => {
 	cy.window().its('cur_list').then(cur_list => {
 		cur_list && cur_list.filter_area && cur_list.filter_area.clear();
 	});
-
-	
+	cy.wait('@filter-saved');
 });
 
 Cypress.Commands.add('click_modal_primary_button', (btn_name) => {
 	cy.get('.modal-footer > .standard-actions > .btn-primary').contains(btn_name).trigger('click', {force: true});
 });
 
-Cypress.Commands.add('click_sidebar_button', (btn_no) => {
-	cy.get('.list-group-by-fields > .group-by-field > .btn').eq(btn_no).click();
+Cypress.Commands.add('click_sidebar_button', (btn_name) => {
+	cy.get('.list-group-by-fields .list-link > a').contains(btn_name).click({force: true});
 });
 
 Cypress.Commands.add('click_listview_row_item', (row_no) => {
@@ -348,6 +352,6 @@ Cypress.Commands.add('click_listview_primary_button', (btn_name) => {
 	cy.get('.primary-action').contains(btn_name).click({force: true});
 });
 
-Cypress.Commands.add('click_timeline_action_btn', (btn_no) => {
-	cy.get('.timeline-content > .timeline-message-box > .justify-between > .actions > .btn').eq(btn_no).first().click();
+Cypress.Commands.add('click_timeline_action_btn', (btn_name) => {
+	cy.get('.timeline-content > .timeline-message-box > .justify-between > .actions > .btn').contains(btn_name).click();
 });

frappe/__init__.py

@@ -235,12 +235,13 @@ def connect_replica():
 	from frappe.database import get_db
 	user = local.conf.db_name
 	password = local.conf.db_password
+	port = local.conf.replica_db_port
 
 	if local.conf.different_credentials_for_replica:
 		user = local.conf.replica_db_name
 		password = local.conf.replica_db_password
 
-	local.replica_db = get_db(host=local.conf.replica_host, user=user, password=password)
+	local.replica_db = get_db(host=local.conf.replica_host, user=user, password=password, port=port)
 
 	# swap db connections
 	local.primary_db = local.db
@@ -618,8 +619,6 @@ def read_only():
 
 			try:
 				retval = fn(*args, **get_newargs(fn, kwargs))
-			except:
-				raise
 			finally:
 				if local and hasattr(local, 'primary_db'):
 					local.db.close()
@@ -629,6 +628,29 @@ def read_only():
 		return wrapper_fn
 	return innfn
 
+def write_only():
+	# if replica connection exists, we have to replace it momentarily with the primary connection
+	def innfn(fn):
+		def wrapper_fn(*args, **kwargs):
+			primary_db = getattr(local, "primary_db", None)
+			replica_db = getattr(local, "replica_db", None)
+			in_read_only = getattr(local, "db", None) != primary_db
+
+			# switch to primary connection
+			if in_read_only and primary_db:
+				local.db = local.primary_db
+
+			try:
+				retval = fn(*args, **get_newargs(fn, kwargs))
+			finally:
+				# switch back to replica connection
+				if in_read_only and replica_db:
+					local.db = replica_db
+
+			return retval
+		return wrapper_fn
+	return innfn
+
 def only_for(roles, message=False):
 	"""Raise `frappe.PermissionError` if the user does not have any of the given **Roles**.
 

frappe/build.py

@@ -1,10 +1,11 @@
-# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
+# Copyright (c) 2021, Frappe Technologies Pvt. Ltd. and Contributors
 # License: MIT. See LICENSE
 import os
 import re
 import json
 import shutil
 import subprocess
+from subprocess import getoutput
 from io import StringIO
 from tempfile import mkdtemp, mktemp
 from distutils.spawn import find_executable
@@ -17,6 +18,8 @@ import psutil
 from urllib.parse import urlparse
 from simple_chalk import green
 from semantic_version import Version
+from requests import head
+from requests.exceptions import HTTPError
 
 
 timestamps = {}
@@ -24,6 +27,12 @@ app_paths = None
 sites_path = os.path.abspath(os.getcwd())
 
 
+class AssetsNotDownloadedError(Exception):
+	pass
+
+class AssetsDontExistError(HTTPError):
+	pass
+
 def download_file(url, prefix):
 	from requests import get
 
@@ -70,81 +79,94 @@ def build_missing_files():
 		bundle(build_mode, apps="frappe")
 
 
-def get_assets_link(frappe_head):
-	from subprocess import getoutput
-	from requests import head
-
+def get_assets_link(frappe_head) -> str:
 	tag = getoutput(
-			r"cd ../apps/frappe && git show-ref --tags -d | grep %s | sed -e 's,.*"
-			r" refs/tags/,,' -e 's/\^{}//'"
-			% frappe_head
-		)
+		r"cd ../apps/frappe && git show-ref --tags -d | grep %s | sed -e 's,.*"
+		r" refs/tags/,,' -e 's/\^{}//'"
+		% frappe_head
+	)
 
 	if tag:
 		# if tag exists, download assets from github release
-		url = "https://github.com/frappe/frappe/releases/download/{0}/assets.tar.gz".format(tag)
+		url = f"https://github.com/frappe/frappe/releases/download/{tag}/assets.tar.gz"
 	else:
-		url = "http://assets.frappeframework.com/{0}.tar.gz".format(frappe_head)
+		url = f"http://assets.frappeframework.com/{frappe_head}.tar.gz"
 
 	if not head(url):
-		raise ValueError("URL {0} doesn't exist".format(url))
+		reference = f"Release {tag}" if tag else f"Commit {frappe_head}"
+		raise AssetsDontExistError(f"Assets for {reference} don't exist")
 
 	return url
 
 
+def fetch_assets(url, frappe_head):
+	click.secho("Retrieving assets...", fg="yellow")
+
+	prefix = mkdtemp(prefix="frappe-assets-", suffix=frappe_head)
+	assets_archive = download_file(url, prefix)
+
+	if not assets_archive:
+		raise AssetsNotDownloadedError(f"Assets could not be retrived from {url}")
+
+	print(f"\n{green('✔')} Downloaded Frappe assets from {url}")
+
+	return assets_archive
+
+
+def setup_assets(assets_archive):
+	import tarfile
+	directories_created = set()
+
+	click.secho("\nExtracting assets...\n", fg="yellow")
+	with tarfile.open(assets_archive) as tar:
+		for file in tar:
+			if not file.isdir():
+				dest = "." + file.name.replace("./frappe-bench/sites", "")
+				asset_directory = os.path.dirname(dest)
+				show = dest.replace("./assets/", "")
+
+				if asset_directory not in directories_created:
+					if not os.path.exists(asset_directory):
+						os.makedirs(asset_directory, exist_ok=True)
+					directories_created.add(asset_directory)
+
+				tar.makefile(file, dest)
+				print("{0} Restored {1}".format(green('✔'), show))
+
+	return directories_created
+
+
 def download_frappe_assets(verbose=True):
 	"""Downloads and sets up Frappe assets if they exist based on the current
 	commit HEAD.
 	Returns True if correctly setup else returns False.
 	"""
-	from subprocess import getoutput
-
-	assets_setup = False
 	frappe_head = getoutput("cd ../apps/frappe && git rev-parse HEAD")
 
-	if frappe_head:
+	if not frappe_head:
+		return False
+
+	try:
+		url = get_assets_link(frappe_head)
+		assets_archive = fetch_assets(url, frappe_head)
+		setup_assets(assets_archive)
+		build_missing_files()
+		return True
+
+	except AssetsDontExistError as e:
+		click.secho(str(e), fg="yellow")
+
+	except Exception as e:
+		# TODO: log traceback in bench.log
+		click.secho(str(e), fg="red")
+
+	finally:
 		try:
-			url = get_assets_link(frappe_head)
-			click.secho("Retrieving assets...", fg="yellow")
-			prefix = mkdtemp(prefix="frappe-assets-", suffix=frappe_head)
-			assets_archive = download_file(url, prefix)
-			print("\n{0} Downloaded Frappe assets from {1}".format(green('✔'), url))
-
-			if assets_archive:
-				import tarfile
-				directories_created = set()
-
-				click.secho("\nExtracting assets...\n", fg="yellow")
-				with tarfile.open(assets_archive) as tar:
-					for file in tar:
-						if not file.isdir():
-							dest = "." + file.name.replace("./frappe-bench/sites", "")
-							asset_directory = os.path.dirname(dest)
-							show = dest.replace("./assets/", "")
-
-							if asset_directory not in directories_created:
-								if not os.path.exists(asset_directory):
-									os.makedirs(asset_directory, exist_ok=True)
-								directories_created.add(asset_directory)
-
-							tar.makefile(file, dest)
-							print("{0} Restored {1}".format(green('✔'), show))
-
-				build_missing_files()
-				return True
-			else:
-				raise
+			shutil.rmtree(os.path.dirname(assets_archive))
 		except Exception:
-			# TODO: log traceback in bench.log
-			click.secho("An Error occurred while downloading assets...", fg="red")
-			assets_setup = False
-		finally:
-			try:
-				shutil.rmtree(os.path.dirname(assets_archive))
-			except Exception:
-				pass
+			pass
 
-	return assets_setup
+	return False
 
 
 def symlink(target, link_name, overwrite=False):

frappe/commands/__init__.py

@@ -102,9 +102,24 @@ def get_commands():
 	from .site import commands as site_commands
 	from .translate import commands as translate_commands
 	from .utils import commands as utils_commands
-	from .redis import commands as redis_commands
+	from .redis_utils import commands as redis_commands
+
+	clickable_link = (
+		"\x1b]8;;https://frappeframework.com/docs\afrappeframework.com\x1b]8;;\a"
+	)
+	all_commands = (
+		scheduler_commands
+		+ site_commands
+		+ translate_commands
+		+ utils_commands
+		+ redis_commands
+	)
+
+	for command in all_commands:
+		if not command.help:
+			command.help = f"Refer to {clickable_link}"
+
+	return all_commands
 
-	all_commands = scheduler_commands + site_commands + translate_commands + utils_commands + redis_commands
-	return list(set(all_commands))
 
 commands = get_commands()

frappe/commands/redis_utils.py

@@ -3,7 +3,7 @@ import os
 import click
 
 import frappe
-from frappe.utils.rq import RedisQueue
+from frappe.utils.redis_queue import RedisQueue
 from frappe.installer import update_site_config
 
 @click.command('create-rq-users')

frappe/commands/site.py

@@ -67,6 +67,9 @@ def restore(context, sql_file_path, mariadb_root_username=None, mariadb_root_pas
 		validate_database_sql
 	)
 
+	site = get_site(context)
+	frappe.init(site=site)
+
 	force = context.force or force
 	decompressed_file_name = extract_sql_from_archive(sql_file_path)
 
@@ -85,9 +88,6 @@ def restore(context, sql_file_path, mariadb_root_username=None, mariadb_root_pas
 	# check if valid SQL file
 	validate_database_sql(decompressed_file_name, _raise=not force)
 
-	site = get_site(context)
-	frappe.init(site=site)
-
 	# dont allow downgrading to older versions of frappe without force
 	if not force and is_downgrade(decompressed_file_name, verbose=True):
 		warn_message = (
@@ -474,7 +474,7 @@ def remove_from_installed_apps(context, app):
 
 @click.command('uninstall-app')
 @click.argument('app')
-@click.option('--yes', '-y', help='To bypass confirmation prompt for uninstalling the app', is_flag=True, default=False, multiple=True)
+@click.option('--yes', '-y', help='To bypass confirmation prompt for uninstalling the app', is_flag=True, default=False)
 @click.option('--dry-run', help='List all doctypes that will be deleted', is_flag=True, default=False)
 @click.option('--no-backup', help='Do not backup the site', is_flag=True, default=False)
 @click.option('--force', help='Force remove app from site', is_flag=True, default=False)
@@ -738,6 +738,131 @@ def build_search_index(context):
 	finally:
 		frappe.destroy()
 
+@click.command('trim-database')
+@click.option('--dry-run', is_flag=True, default=False, help='Show what would be deleted')
+@click.option('--format', '-f', default='text', type=click.Choice(['json', 'text']), help='Output format')
+@click.option('--no-backup', is_flag=True, default=False, help='Do not backup the site')
+@pass_context
+def trim_database(context, dry_run, format, no_backup):
+	if not context.sites:
+		raise SiteNotSpecifiedError
+
+	from frappe.utils.backups import scheduled_backup
+
+	ALL_DATA = {}
+
+	for site in context.sites:
+		frappe.init(site=site)
+		frappe.connect()
+
+		TABLES_TO_DROP = []
+		STANDARD_TABLES = get_standard_tables()
+		information_schema = frappe.qb.Schema("information_schema")
+		table_name = frappe.qb.Field("table_name").as_("name")
+
+		queried_result = frappe.qb.from_(
+			information_schema.tables
+		).select(table_name).where(
+			information_schema.tables.table_schema == frappe.conf.db_name
+		).run()
+
+		database_tables = [x[0] for x in queried_result]
+		doctype_tables = frappe.get_all("DocType", pluck="name")
+
+		for x in database_tables:
+			doctype = x.lstrip("tab")
+			if not (doctype in doctype_tables or x.startswith("__") or x in STANDARD_TABLES):
+				TABLES_TO_DROP.append(x)
+
+		if not TABLES_TO_DROP:
+			if format == "text":
+				click.secho(f"No ghost tables found in {frappe.local.site}...Great!", fg="green")
+		else:
+			if not (no_backup or dry_run):
+				if format == "text":
+					print(f"Backing Up Tables: {', '.join(TABLES_TO_DROP)}")
+
+				odb = scheduled_backup(
+					ignore_conf=False,
+					include_doctypes=",".join(x.lstrip("tab") for x in TABLES_TO_DROP),
+					ignore_files=True,
+					force=True,
+				)
+				if format == "text":
+					odb.print_summary()
+					print("\nTrimming Database")
+
+			for table in TABLES_TO_DROP:
+				if format == "text":
+					print(f"* Dropping Table '{table}'...")
+				if not dry_run:
+					frappe.db.sql_ddl(f"drop table `{table}`")
+
+			ALL_DATA[frappe.local.site] = TABLES_TO_DROP
+		frappe.destroy()
+
+	if format == "json":
+		import json
+		print(json.dumps(ALL_DATA, indent=1))
+
+
+def get_standard_tables():
+	import re
+
+	tables = []
+	sql_file = os.path.join(
+		"..", "apps", "frappe", "frappe", "database", frappe.conf.db_type, f'framework_{frappe.conf.db_type}.sql'
+	)
+	content = open(sql_file).read().splitlines()
+
+	for line in content:
+		table_found = re.search(r"""CREATE TABLE ("|`)(.*)?("|`) \(""", line)
+		if table_found:
+			tables.append(table_found.group(2))
+
+	return tables
+
+@click.command('trim-tables')
+@click.option('--dry-run', is_flag=True, default=False, help='Show what would be deleted')
+@click.option('--format', '-f', default='table', type=click.Choice(['json', 'table']), help='Output format')
+@click.option('--no-backup', is_flag=True, default=False, help='Do not backup the site')
+@pass_context
+def trim_tables(context, dry_run, format, no_backup):
+	if not context.sites:
+		raise SiteNotSpecifiedError
+
+	from frappe.model.meta import trim_tables
+	from frappe.utils.backups import scheduled_backup
+
+	for site in context.sites:
+		frappe.init(site=site)
+		frappe.connect()
+
+		if not (no_backup or dry_run):
+			click.secho(f"Taking backup for {frappe.local.site}", fg="green")
+			odb = scheduled_backup(ignore_files=False, force=True)
+			odb.print_summary()
+
+		try:
+			trimmed_data = trim_tables(dry_run=dry_run, quiet=format == 'json')
+
+			if format == 'table' and not dry_run:
+				click.secho(f"The following data have been removed from {frappe.local.site}", fg='green')
+
+			handle_data(trimmed_data, format=format)
+		finally:
+			frappe.destroy()
+
+def handle_data(data: dict, format='json'):
+	if format == 'json':
+		import json
+		print(json.dumps({frappe.local.site: data}, indent=1, sort_keys=True))
+	else:
+		from frappe.utils.commands import render_table
+		data = [["DocType", "Fields"]] + [[table, ", ".join(columns)] for table, columns in data.items()]
+		render_table(data)
+
+
 commands = [
 	add_system_manager,
 	backup,
@@ -766,5 +891,7 @@ commands = [
 	add_to_hosts,
 	start_ngrok,
 	build_search_index,
-	partial_restore
+	partial_restore,
+	trim_tables,
+	trim_database,
 ]

frappe/commands/utils.py

@@ -408,20 +408,47 @@ def bulk_rename(context, doctype, path):
 	frappe.destroy()
 
 
+@click.command('db-console')
+@pass_context
+def database(context):
+	"""
+		Enter into the Database console for given site.
+	"""
+	site = get_site(context)
+	if not site:
+		raise SiteNotSpecifiedError
+	frappe.init(site=site)
+	if not frappe.conf.db_type or frappe.conf.db_type == "mariadb":
+		_mariadb()
+	elif frappe.conf.db_type == "postgres":
+		_psql()
+
+
 @click.command('mariadb')
 @pass_context
 def mariadb(context):
 	"""
 		Enter into mariadb console for a given site.
 	"""
-	import os
-
 	site  = get_site(context)
 	if not site:
 		raise SiteNotSpecifiedError
 	frappe.init(site=site)
+	_mariadb()
 
-	# This is assuming you're within the bench instance.
+
+@click.command('postgres')
+@pass_context
+def postgres(context):
+	"""
+		Enter into postgres console for a given site.
+	"""
+	site  = get_site(context)
+	frappe.init(site=site)
+	_psql()
+
+
+def _mariadb():
 	mysql = find_executable('mysql')
 	os.execv(mysql, [
 		mysql,
@@ -434,15 +461,7 @@ def mariadb(context):
 		"-A"])
 
 
-@click.command('postgres')
-@pass_context
-def postgres(context):
-	"""
-		Enter into postgres console for a given site.
-	"""
-	site  = get_site(context)
-	frappe.init(site=site)
-	# This is assuming you're within the bench instance.
+def _psql():
 	psql = find_executable('psql')
 	subprocess.run([ psql, '-d', frappe.conf.db_name])
 
@@ -525,6 +544,74 @@ def console(context, autoreload=False):
 	terminal()
 
 
+@click.command('transform-database', help="Change tables' internal settings changing engine and row formats")
+@click.option('--table', required=True, help="Comma separated name of tables to convert. To convert all tables, pass 'all'")
+@click.option('--engine', default=None, type=click.Choice(["InnoDB", "MyISAM"]), help="Choice of storage engine for said table(s)")
+@click.option('--row_format', default=None, type=click.Choice(["DYNAMIC", "COMPACT", "REDUNDANT", "COMPRESSED"]), help="Set ROW_FORMAT parameter for said table(s)")
+@click.option('--failfast', is_flag=True, default=False, help="Exit on first failure occurred")
+@pass_context
+def transform_database(context, table, engine, row_format, failfast):
+	"Transform site database through given parameters"
+	site = get_site(context)
+	check_table = []
+	add_line = False
+	skipped = 0
+	frappe.init(site=site)
+
+	if frappe.conf.db_type and frappe.conf.db_type != "mariadb":
+		click.secho("This command only has support for MariaDB databases at this point", fg="yellow")
+		sys.exit(1)
+
+	if not (engine or row_format):
+		click.secho("Values for `--engine` or `--row_format` must be set")
+		sys.exit(1)
+
+	frappe.connect()
+
+	if table == "all":
+		information_schema = frappe.qb.Schema("information_schema")
+		queried_tables = frappe.qb.from_(
+			information_schema.tables
+		).select("table_name").where(
+			(information_schema.tables.row_format != row_format)
+			& (information_schema.tables.table_schema == frappe.conf.db_name)
+		).run()
+		tables = [x[0] for x in queried_tables]
+	else:
+		tables = [x.strip() for x in table.split(",")]
+
+	total = len(tables)
+
+	for current, table in enumerate(tables):
+		values_to_set = ""
+		if engine:
+			values_to_set += f" ENGINE={engine}"
+		if row_format:
+			values_to_set += f" ROW_FORMAT={row_format}"
+
+		try:
+			frappe.db.sql(f"ALTER TABLE `{table}`{values_to_set}")
+			update_progress_bar("Updating table schema", current - skipped, total)
+			add_line = True
+
+		except Exception as e:
+			check_table.append([table, e.args])
+			skipped += 1
+
+			if failfast:
+				break
+
+	if add_line:
+		print()
+
+	for errored_table in check_table:
+		table, err = errored_table
+		err_msg = f"{table}: ERROR {err[0]}: {err[1]}"
+		click.secho(err_msg, fg="yellow")
+
+	frappe.destroy()
+
+
 @click.command('run-tests')
 @click.option('--app', help="For App")
 @click.option('--doctype', help="For DocType")
@@ -811,6 +898,8 @@ commands = [
 	build,
 	clear_cache,
 	clear_website_cache,
+	database,
+	transform_database,
 	jupyter,
 	console,
 	destroy_all_sessions,

frappe/contacts/address_and_contact.py

@@ -178,4 +178,4 @@ def set_link_title(doc):
 	for link in doc.links:
 		if not link.link_title:
 			linked_doc = frappe.get_doc(link.link_doctype, link.link_name)
-			link.link_title = linked_doc.get("title_field") or linked_doc.get("name")
+			link.link_title = linked_doc.get_title() or link.link_name

frappe/contacts/doctype/address/address.py

@@ -65,7 +65,7 @@ class Address(Document):
 
 	def has_link(self, doctype, name):
 		for link in self.links:
-			if link.link_doctype==doctype and link.link_name== name:
+			if link.link_doctype == doctype and link.link_name == name:
 				return True
 
 	def has_common_link(self, doc):

frappe/contacts/doctype/contact/contact.py

@@ -47,14 +47,14 @@ class Contact(Document):
 	def get_link_for(self, link_doctype):
 		'''Return the link name, if exists for the given link DocType'''
 		for link in self.links:
-			if link.link_doctype==link_doctype:
+			if link.link_doctype == link_doctype:
 				return link.link_name
 
 		return None
 
 	def has_link(self, doctype, name):
 		for link in self.links:
-			if link.link_doctype==doctype and link.link_name== name:
+			if link.link_doctype == doctype and link.link_name == name:
 				return True
 
 	def has_common_link(self, doc):

frappe/core/doctype/access_log/access_log.py

@@ -1,6 +1,7 @@
-# Copyright (c) 2019, Frappe Technologies and contributors
+# Copyright (c) 2021, Frappe Technologies and contributors
 # License: MIT. See LICENSE
 import frappe
+from tenacity import retry, retry_if_exception_type, stop_after_attempt
 from frappe.model.document import Document
 
 
@@ -9,25 +10,41 @@ class AccessLog(Document):
 
 
 @frappe.whitelist()
-def make_access_log(doctype=None, document=None, method=None, file_type=None,
-		report_name=None, filters=None, page=None, columns=None):
+@frappe.write_only()
+@retry(
+	stop=stop_after_attempt(3), retry=retry_if_exception_type(frappe.DuplicateEntryError)
+)
+def make_access_log(
+	doctype=None,
+	document=None,
+	method=None,
+	file_type=None,
+	report_name=None,
+	filters=None,
+	page=None,
+	columns=None,
+):
 
 	user = frappe.session.user
+	in_request = frappe.request and frappe.request.method == "GET"
 
-	doc = frappe.get_doc({
-		'doctype': 'Access Log',
-		'user': user,
-		'export_from': doctype,
-		'reference_document': document,
-		'file_type': file_type,
-		'report_name': report_name,
-		'page': page,
-		'method': method,
-		'filters': frappe.utils.cstr(filters) if filters else None,
-		'columns': columns
-	})
+	doc = frappe.get_doc(
+		{
+			"doctype": "Access Log",
+			"user": user,
+			"export_from": doctype,
+			"reference_document": document,
+			"file_type": file_type,
+			"report_name": report_name,
+			"page": page,
+			"method": method,
+			"filters": frappe.utils.cstr(filters) if filters else None,
+			"columns": columns,
+		}
+	)
 	doc.insert(ignore_permissions=True)
 
 	# `frappe.db.commit` added because insert doesnt `commit` when called in GET requests like `printview`
-	if frappe.request and frappe.request.method == 'GET':
+	# dont commit in test mode
+	if not frappe.flags.in_test or in_request:
 		frappe.db.commit()

frappe/core/doctype/doctype/doctype.py

@@ -274,6 +274,8 @@ class DocType(Document):
 							d.fieldname = d.fieldname + '_section'
 						elif d.fieldtype=='Column Break':
 							d.fieldname = d.fieldname + '_column'
+						elif d.fieldtype=='Tab Break':
+							d.fieldname = d.fieldname + '_tab'
 					else:
 						d.fieldname = d.fieldtype.lower().replace(" ","_") + "_" + str(d.idx)
 				else:

frappe/core/doctype/document_naming_rule/document_naming_rule.json

@@ -41,6 +41,7 @@
    "fieldname": "counter",
    "fieldtype": "Int",
    "label": "Counter",
+   "no_copy": 1,
    "read_only": 1
   },
   {
@@ -79,7 +80,7 @@
  ],
  "index_web_pages_for_search": 1,
  "links": [],
- "modified": "2020-11-04 14:38:14.836056",
+ "modified": "2021-09-13 20:07:47.617615",
  "modified_by": "Administrator",
  "module": "Core",
  "name": "Document Naming Rule",

frappe/core/doctype/sms_settings/sms_settings.json

@@ -1,238 +1,80 @@
 {
- "allow_copy": 1, 
- "allow_guest_to_view": 0, 
- "allow_import": 0, 
- "allow_rename": 0, 
- "beta": 0, 
- "creation": "2013-01-10 16:34:24", 
- "custom": 0, 
- "docstatus": 0, 
- "doctype": "DocType", 
- "editable_grid": 0, 
+ "actions": [],
+ "allow_copy": 1,
+ "creation": "2013-01-10 16:34:24",
+ "doctype": "DocType",
+ "engine": "InnoDB",
+ "field_order": [
+  "sms_gateway_url",
+  "message_parameter",
+  "receiver_parameter",
+  "static_parameters_section",
+  "parameters",
+  "use_post"
+ ],
  "fields": [
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "description": "Eg. smsgateway.com/api/send_sms.cgi", 
-   "fieldname": "sms_gateway_url", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "SMS Gateway URL", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
+   "description": "Eg. smsgateway.com/api/send_sms.cgi",
+   "fieldname": "sms_gateway_url",
+   "fieldtype": "Small Text",
+   "in_list_view": 1,
+   "label": "SMS Gateway URL",
+   "reqd": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "description": "Enter url parameter for message", 
-   "fieldname": "message_parameter", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Message Parameter", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
+   "description": "Enter url parameter for message",
+   "fieldname": "message_parameter",
+   "fieldtype": "Data",
+   "in_list_view": 1,
+   "label": "Message Parameter",
+   "reqd": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "description": "Enter url parameter for receiver nos", 
-   "fieldname": "receiver_parameter", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Receiver Parameter", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
+   "description": "Enter url parameter for receiver nos",
+   "fieldname": "receiver_parameter",
+   "fieldtype": "Data",
+   "in_list_view": 1,
+   "label": "Receiver Parameter",
+   "reqd": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "static_parameters_section", 
-   "fieldtype": "Column Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "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, 
-   "unique": 0, 
+   "fieldname": "static_parameters_section",
+   "fieldtype": "Column Break",
    "width": "50%"
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "description": "Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)", 
-   "fieldname": "parameters", 
-   "fieldtype": "Table", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Static Parameters", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "SMS Parameter", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
+   "description": "Enter static url parameters here (Eg. sender=ERPNext, username=ERPNext, password=1234 etc.)",
+   "fieldname": "parameters",
+   "fieldtype": "Table",
+   "label": "Static Parameters",
+   "options": "SMS Parameter"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "use_post", 
-   "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": "Use POST", 
-   "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, 
-   "unique": 0
+   "default": "0",
+   "fieldname": "use_post",
+   "fieldtype": "Check",
+   "label": "Use POST"
   }
- ], 
- "has_web_view": 0, 
- "hide_heading": 0, 
- "hide_toolbar": 0, 
- "icon": "fa fa-cog", 
- "idx": 1, 
- "image_view": 0, 
- "in_create": 0, 
- "is_submittable": 0, 
- "issingle": 1, 
- "istable": 0, 
- "max_attachments": 0, 
- "modified": "2021-03-02 18:06:00.868688", 
- "modified_by": "Administrator", 
- "module": "Core", 
- "name": "SMS Settings", 
- "owner": "Administrator", 
+ ],
+ "icon": "fa fa-cog",
+ "idx": 1,
+ "issingle": 1,
+ "links": [],
+ "modified": "2021-09-21 19:45:26.809793",
+ "modified_by": "Administrator",
+ "module": "Core",
+ "name": "SMS Settings",
+ "owner": "Administrator",
  "permissions": [
   {
-   "amend": 0, 
-   "apply_user_permissions": 0, 
-   "cancel": 0, 
-   "create": 1, 
-   "delete": 0, 
-   "email": 0, 
-   "export": 0, 
-   "if_owner": 0, 
-   "import": 0, 
-   "permlevel": 0, 
-   "print": 0, 
-   "read": 1, 
-   "report": 0, 
-   "role": "System Manager", 
-   "set_user_permissions": 0, 
-   "share": 1, 
-   "submit": 0, 
+   "create": 1,
+   "read": 1,
+   "role": "System Manager",
+   "share": 1,
    "write": 1
   }
- ], 
- "quick_entry": 0, 
- "read_only": 0, 
- "read_only_onload": 0, 
- "show_name_in_global_search": 0, 
- "track_changes": 1, 
- "track_seen": 0
-}
+ ],
+ "sort_field": "modified",
+ "sort_order": "DESC",
+ "track_changes": 1
+}

frappe/core/doctype/user/user.py

@@ -788,7 +788,7 @@ def sign_up(email, full_name, redirect_to):
 			return 2, _("Please ask your administrator to verify your sign-up")
 
 @frappe.whitelist(allow_guest=True)
-@rate_limit(key='user', limit=get_password_reset_limit, seconds = 24*60*60, methods=['POST'])
+@rate_limit(limit=get_password_reset_limit, seconds = 24*60*60, methods=['POST'])
 def reset_password(user):
 	if user=="Administrator":
 		return 'not allowed'

frappe/core/doctype/version/version.css

@@ -1,21 +0,0 @@
-.version-info {
-	overflow: auto;
-}
-
-.version-info pre {
-	border: 0px;
-	margin: 0px;
-	background-color: inherit;
-}
-
-.version-info .table {
-	background-color: inherit;
-}
-
-.version-info .success {
-	background-color: #dff0d8 !important;
-}
-
-.version-info .danger {
-	background-color: #f2dede !important;
-}

frappe/core/doctype/version/version.py

@@ -1,8 +1,6 @@
 # Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
 # License: MIT. See LICENSE
 
-# License: MIT. See LICENSE
-
 import frappe, json
 
 from frappe.model.document import Document

frappe/core/page/background_jobs/background_jobs.py

@@ -67,7 +67,8 @@ def get_info(show_failed=False) -> List[Dict]:
 			fail_registry = queue.failed_job_registry
 			for job_id in fail_registry.get_job_ids():
 				job = queue.fetch_job(job_id)
-				add_job(job, queue.name)
+				if job:
+					add_job(job, queue.name)
 
 	return jobs
 

frappe/custom/doctype/custom_field/custom_field.json

@@ -1,460 +1,458 @@
 {
- "actions": [],
- "allow_import": 1,
- "creation": "2013-01-10 16:34:01",
- "description": "Adds a custom field to a DocType",
- "doctype": "DocType",
- "document_type": "Setup",
- "engine": "InnoDB",
- "field_order": [
-  "dt",
-  "module",
-  "label",
-  "label_help",
-  "fieldname",
-  "insert_after",
-  "length",
-  "column_break_6",
-  "fieldtype",
-  "precision",
-  "hide_seconds",
-  "hide_days",
-  "options",
-  "fetch_from",
-  "fetch_if_empty",
-  "options_help",
-  "section_break_11",
-  "collapsible",
-  "collapsible_depends_on",
-  "default",
-  "depends_on",
-  "mandatory_depends_on",
-  "read_only_depends_on",
-  "properties",
-  "non_negative",
-  "reqd",
-  "unique",
-  "read_only",
-  "ignore_user_permissions",
-  "hidden",
-  "print_hide",
-  "print_hide_if_no_value",
-  "print_width",
-  "no_copy",
-  "allow_on_submit",
-  "in_list_view",
-  "in_standard_filter",
-  "in_global_search",
-  "in_preview",
-  "bold",
-  "report_hide",
-  "search_index",
-  "allow_in_quick_entry",
-  "ignore_xss_filter",
-  "translatable",
-  "hide_border",
-  "description",
-  "permlevel",
-  "width",
-  "columns"
- ],
- "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": "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": "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"
-  },
-  {
-   "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\nDuration\nDynamic Link\nFloat\nFold\nGeolocation\nHeading\nHTML\nHTML Editor\nIcon\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
-  },
-  {
-   "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": "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"
-  },
-  {
-   "fieldname": "options_help",
-   "fieldtype": "HTML",
-   "label": "Options Help",
-   "oldfieldtype": "HTML"
-  },
-  {
-   "fieldname": "section_break_11",
-   "fieldtype": "Section Break"
-  },
-  {
-   "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"
-  },
-  {
-   "fieldname": "default",
-   "fieldtype": "Text",
-   "label": "Default Value",
-   "oldfieldname": "default",
-   "oldfieldtype": "Text"
-  },
-  {
-   "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"
-  },
-  {
-   "default": "0",
-   "fieldname": "permlevel",
-   "fieldtype": "Int",
-   "label": "Permission Level",
-   "oldfieldname": "permlevel",
-   "oldfieldtype": "Int"
-  },
-  {
-   "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"
-  },
-  {
-   "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": "unique",
-   "fieldtype": "Check",
-   "label": "Unique"
-  },
-  {
-   "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",
-   "fieldname": "hidden",
-   "fieldtype": "Check",
-   "label": "Hidden"
-  },
-  {
-   "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"
-  },
-  {
-   "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": "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_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",
-   "fieldname": "bold",
-   "fieldtype": "Check",
-   "label": "Bold"
-  },
-  {
-   "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",
-   "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"
-  },
-  {
-   "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": "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",
-   "depends_on": "eval:!in_list(['Table', 'Table MultiSelect'], doc.fieldtype);",
-   "fieldname": "in_preview",
-   "fieldtype": "Check",
-   "label": "In Preview"
-  },
-  {
-   "default": "0",
-   "depends_on": "eval:doc.fieldtype=='Duration'",
-   "fieldname": "hide_seconds",
-   "fieldtype": "Check",
-   "label": "Hide Seconds"
-  },
-  {
-   "default": "0",
-   "depends_on": "eval:doc.fieldtype=='Duration'",
-   "fieldname": "hide_days",
-   "fieldtype": "Check",
-   "label": "Hide Days"
-  },
-  {
-   "default": "0",
-   "depends_on": "eval:doc.fieldtype=='Section Break'",
-   "fieldname": "hide_border",
-   "fieldtype": "Check",
-   "label": "Hide Border"
-  },
-  {
-   "default": "0",
-   "depends_on": "eval:in_list([\"Int\", \"Float\", \"Currency\"], doc.fieldtype)",
-   "fieldname": "non_negative",
-   "fieldtype": "Check",
-   "label": "Non Negative"
-  },
-  {
-   "fieldname": "module",
-   "fieldtype": "Link",
-   "label": "Module (for export)",
-   "options": "Module Def"
-  }
- ],
- "icon": "fa fa-glass",
- "idx": 1,
- "index_web_pages_for_search": 1,
- "links": [],
- "modified": "2021-09-04 12:45:22.810120",
- "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": "System Manager",
-   "share": 1,
-   "write": 1
-  }
- ],
- "search_fields": "dt,label,fieldtype,options",
- "sort_field": "modified",
- "sort_order": "ASC",
- "track_changes": 1
+    "actions": [],
+    "allow_import": 1,
+    "creation": "2013-01-10 16:34:01",
+    "description": "Adds a custom field to a DocType",
+    "doctype": "DocType",
+    "document_type": "Setup",
+    "engine": "InnoDB",
+    "field_order": [
+        "dt",
+        "module",
+        "label",
+        "label_help",
+        "fieldname",
+        "insert_after",
+        "length",
+        "column_break_6",
+        "fieldtype",
+        "precision",
+        "hide_seconds",
+        "hide_days",
+        "options",
+        "fetch_from",
+        "fetch_if_empty",
+        "options_help",
+        "section_break_11",
+        "collapsible",
+        "collapsible_depends_on",
+        "default",
+        "depends_on",
+        "mandatory_depends_on",
+        "read_only_depends_on",
+        "properties",
+        "non_negative",
+        "reqd",
+        "unique",
+        "read_only",
+        "ignore_user_permissions",
+        "hidden",
+        "print_hide",
+        "print_hide_if_no_value",
+        "print_width",
+        "no_copy",
+        "allow_on_submit",
+        "in_list_view",
+        "in_standard_filter",
+        "in_global_search",
+        "in_preview",
+        "bold",
+        "report_hide",
+        "search_index",
+        "allow_in_quick_entry",
+        "ignore_xss_filter",
+        "translatable",
+        "hide_border",
+        "description",
+        "permlevel",
+        "width",
+        "columns"
+    ],
+    "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": "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": "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"
+        },
+        {
+            "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\nDuration\nDynamic Link\nFloat\nFold\nGeolocation\nHeading\nHTML\nHTML Editor\nIcon\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\nTab Break",
+            "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"
+        },
+        {
+            "fieldname": "options",
+            "fieldtype": "Small Text",
+            "in_list_view": 1,
+            "label": "Options",
+            "oldfieldname": "options",
+            "oldfieldtype": "Text"
+        },
+        {
+            "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"
+        },
+        {
+            "fieldname": "options_help",
+            "fieldtype": "HTML",
+            "label": "Options Help",
+            "oldfieldtype": "HTML"
+        },
+        {
+            "fieldname": "section_break_11",
+            "fieldtype": "Section Break"
+        },
+        {
+            "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"
+        },
+        {
+            "fieldname": "default",
+            "fieldtype": "Text",
+            "label": "Default Value",
+            "oldfieldname": "default",
+            "oldfieldtype": "Text"
+        },
+        {
+            "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"
+        },
+        {
+            "default": "0",
+            "fieldname": "permlevel",
+            "fieldtype": "Int",
+            "label": "Permission Level",
+            "oldfieldname": "permlevel",
+            "oldfieldtype": "Int"
+        },
+        {
+            "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"
+        },
+        {
+            "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": "unique",
+            "fieldtype": "Check",
+            "label": "Unique"
+        },
+        {
+            "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",
+            "fieldname": "hidden",
+            "fieldtype": "Check",
+            "label": "Hidden"
+        },
+        {
+            "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"
+        },
+        {
+            "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": "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_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",
+            "fieldname": "bold",
+            "fieldtype": "Check",
+            "label": "Bold"
+        },
+        {
+            "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",
+            "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"
+        },
+        {
+            "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": "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",
+            "depends_on": "eval:!in_list(['Table', 'Table MultiSelect'], doc.fieldtype);",
+            "fieldname": "in_preview",
+            "fieldtype": "Check",
+            "label": "In Preview"
+        },
+        {
+            "default": "0",
+            "depends_on": "eval:doc.fieldtype=='Duration'",
+            "fieldname": "hide_seconds",
+            "fieldtype": "Check",
+            "label": "Hide Seconds"
+        },
+        {
+            "default": "0",
+            "depends_on": "eval:doc.fieldtype=='Duration'",
+            "fieldname": "hide_days",
+            "fieldtype": "Check",
+            "label": "Hide Days"
+        },
+        {
+            "default": "0",
+            "depends_on": "eval:doc.fieldtype=='Section Break'",
+            "fieldname": "hide_border",
+            "fieldtype": "Check",
+            "label": "Hide Border"
+        },
+        {
+            "default": "0",
+            "depends_on": "eval:in_list([\"Int\", \"Float\", \"Currency\"], doc.fieldtype)",
+            "fieldname": "non_negative",
+            "fieldtype": "Check",
+            "label": "Non Negative"
+        },
+        {
+            "fieldname": "module",
+            "fieldtype": "Link",
+            "label": "Module (for export)",
+            "options": "Module Def"
+        }
+    ],
+    "icon": "fa fa-glass",
+    "idx": 1,
+    "index_web_pages_for_search": 1,
+    "links": [],
+    "modified": "2021-09-04 12:45:23.810120",
+    "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": "System Manager",
+            "share": 1,
+            "write": 1
+        }
+    ],
+    "search_fields": "dt,label,fieldtype,options",
+    "sort_field": "modified",
+    "sort_order": "ASC",
+    "track_changes": 1
 }

frappe/custom/doctype/custom_field/custom_field.py

@@ -18,7 +18,7 @@ class CustomField(Document):
 		if not self.fieldname:
 			label = self.label
 			if not label:
-				if self.fieldtype in ["Section Break", "Column Break"]:
+				if self.fieldtype in ["Section Break", "Column Break", "Tab Break"]:
 					label = self.fieldtype + "_" + str(self.idx)
 				else:
 					frappe.throw(_("Label is mandatory"))

frappe/custom/doctype/customize_form_field/customize_form_field.json

@@ -82,7 +82,7 @@
    "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\nIcon\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",
+   "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\nIcon\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\nTab Break",
    "reqd": 1,
    "search_index": 1
   },
@@ -428,7 +428,7 @@
  "index_web_pages_for_search": 1,
  "istable": 1,
  "links": [],
- "modified": "2021-07-10 21:57:24.479749",
+ "modified": "2021-07-11 21:57:24.479749",
  "modified_by": "Administrator",
  "module": "Custom",
  "name": "Customize Form Field",

frappe/custom/doctype/property_setter/property_setter.py

@@ -34,7 +34,7 @@ class PropertySetter(Document):
 			fields=['fieldname', 'label', 'fieldtype'],
 			filters={
 				'parent': dt,
-				'fieldtype': ['not in', ('Section Break', 'Column Break', 'HTML', 'Read Only', 'Fold') + frappe.model.table_fields],
+				'fieldtype': ['not in', ('Section Break', 'Column Break', 'Tab Break', 'HTML', 'Read Only', 'Fold') + frappe.model.table_fields],
 				'fieldname': ['!=', '']
 			},
 			order_by='label asc',

frappe/data/sample_site_config.json

@@ -1,45 +0,0 @@
-{
- "db_name": "testdb",
- "db_password": "password",
- "mute_emails": true,
- 
-  "limits": {
-  	"emails": 1500,
-	"space": 0.157,
-  	"expiry": "2016-07-25",
-  	"users": 1
-  },
-
- "developer_mode": 1,
- "auto_cache_clear": true,
- "disable_website_cache": true,
- "max_file_size": 1000000,
-
- "mail_server": "localhost",
- "mail_login": null,
- "mail_password": null,
- "mail_port": 25,
- "use_ssl": 0,
- "auto_email_id": "hello@example.com",
-
- "google_analytics_id": "google_analytics_id",
- "google_analytics_anonymize_ip": 1,
-
- "google_login": {
-	 "client_id": "google_client_id",
-	 "client_secret": "google_client_secret"
- },
- "github_login": {
-	 "client_id": "github_client_id",
-	 "client_secret": "github_client_secret"
- },
- "facebook_login": {
-	 "client_id": "facebook_client_id",
-	 "client_secret": "facebook_client_secret"
- },
-
- "celery_broker": "redis://localhost",
- "celery_result_backend": null,
- "scheduler_interval": 300,
- "celery_queue_per_site": true
-}

frappe/database/database.py

@@ -332,7 +332,7 @@ class Database(object):
 			values[key] = value
 			if isinstance(value, (list, tuple)):
 				# value is a tuple like ("!=", 0)
-				_operator = value[0]
+				_operator = value[0].lower()
 				values[key] = value[1]
 				if isinstance(value[1], (tuple, list)):
 					# value is a list in tuple ("in", ("A", "B"))
@@ -919,13 +919,13 @@ class Database(object):
 			WHERE table_name = 'tab{0}' AND column_name = '{1}' '''.format(doctype, column))[0][0]
 
 	def has_index(self, table_name, index_name):
-		pass
+		raise NotImplementedError
 
 	def add_index(self, doctype, fields, index_name=None):
-		pass
+		raise NotImplementedError
 
 	def add_unique(self, doctype, fields, constraint_name=None):
-		pass
+		raise NotImplementedError
 
 	@staticmethod
 	def get_index_name(fields):
@@ -951,7 +951,7 @@ class Database(object):
 	def escape(s, percent=True):
 		"""Excape quotes and percent in given string."""
 		# implemented in specific class
-		pass
+		raise NotImplementedError
 
 	@staticmethod
 	def is_column_missing(e):

frappe/database/mariadb/database.py

@@ -22,11 +22,11 @@ class MariaDBDatabase(Database):
 	def setup_type_map(self):
 		self.db_type = 'mariadb'
 		self.type_map = {
-			'Currency':		('decimal', '18,6'),
+			'Currency':		('decimal', '21,9'),
 			'Int':			('int', '11'),
 			'Long Int':		('bigint', '20'),
-			'Float':		('decimal', '18,6'),
-			'Percent':		('decimal', '18,6'),
+			'Float':		('decimal', '21,9'),
+			'Percent':		('decimal', '21,9'),
 			'Check':		('int', '1'),
 			'Small Text':	('text', ''),
 			'Long Text':	('longtext', ''),
@@ -51,7 +51,7 @@ class MariaDBDatabase(Database):
 			'Color':		('varchar', self.VARCHAR_LEN),
 			'Barcode':		('longtext', ''),
 			'Geolocation':	('longtext', ''),
-			'Duration':		('decimal', '18,6'),
+			'Duration':		('decimal', '21,9'),
 			'Icon':			('varchar', self.VARCHAR_LEN)
 		}
 
@@ -135,8 +135,8 @@ class MariaDBDatabase(Database):
 		table_name = get_table_name(doctype)
 		return self.sql(f"DESC `{table_name}`")
 
-	def change_column_type(self, table: str, column: str, type: str) -> Union[List, Tuple]:
-		table_name = get_table_name(table)
+	def change_column_type(self, doctype: str, column: str, type: str) -> Union[List, Tuple]:
+		table_name = get_table_name(doctype)
 		return self.sql(f"ALTER TABLE `{table_name}` MODIFY `{column}` {type} NOT NULL")
 
 	# exception types
@@ -195,7 +195,7 @@ class MariaDBDatabase(Database):
 				`password` TEXT NOT NULL,
 				`encrypted` INT(1) NOT NULL DEFAULT 0,
 				PRIMARY KEY (`doctype`, `name`, `fieldname`)
-			) ENGINE=InnoDB ROW_FORMAT=COMPRESSED CHARACTER SET=utf8mb4 COLLATE=utf8mb4_unicode_ci""")
+			) ENGINE=InnoDB ROW_FORMAT=DYNAMIC CHARACTER SET=utf8mb4 COLLATE=utf8mb4_unicode_ci""")
 
 	def create_global_search_table(self):
 		if not '__global_search' in self.get_tables():

frappe/database/mariadb/framework_mariadb.sql

@@ -72,7 +72,7 @@ CREATE TABLE `tabDocField` (
   KEY `label` (`label`),
   KEY `fieldtype` (`fieldtype`),
   KEY `fieldname` (`fieldname`)
-) ENGINE=InnoDB ROW_FORMAT=COMPRESSED CHARACTER SET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
+) ENGINE=InnoDB ROW_FORMAT=DYNAMIC CHARACTER SET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
 
 
 --
@@ -109,7 +109,7 @@ CREATE TABLE `tabDocPerm` (
   `email` int(1) NOT NULL DEFAULT 1,
   PRIMARY KEY (`name`),
   KEY `parent` (`parent`)
-) ENGINE=InnoDB ROW_FORMAT=COMPRESSED CHARACTER SET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
+) ENGINE=InnoDB ROW_FORMAT=DYNAMIC CHARACTER SET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
 
 --
 -- Table structure for table `tabDocType Action`
@@ -133,7 +133,7 @@ CREATE TABLE `tabDocType Action` (
   PRIMARY KEY (`name`),
   KEY `parent` (`parent`),
   KEY `modified` (`modified`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=COMPRESSED;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
 
 --
 -- Table structure for table `tabDocType Action`
@@ -156,7 +156,7 @@ CREATE TABLE `tabDocType Link` (
   PRIMARY KEY (`name`),
   KEY `parent` (`parent`),
   KEY `modified` (`modified`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=COMPRESSED;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
 
 --
 -- Table structure for table `tabDocType`
@@ -228,7 +228,7 @@ CREATE TABLE `tabDocType` (
   `sender_field` varchar(255) DEFAULT NULL,
   PRIMARY KEY (`name`),
   KEY `parent` (`parent`)
-) ENGINE=InnoDB ROW_FORMAT=COMPRESSED CHARACTER SET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
+) ENGINE=InnoDB ROW_FORMAT=DYNAMIC CHARACTER SET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
 
 --
 -- Table structure for table `tabSeries`
@@ -239,7 +239,7 @@ CREATE TABLE `tabSeries` (
   `name` varchar(100),
   `current` int(10) NOT NULL DEFAULT 0,
   PRIMARY KEY(`name`)
-) ENGINE=InnoDB ROW_FORMAT=COMPRESSED CHARACTER SET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
+) ENGINE=InnoDB ROW_FORMAT=DYNAMIC CHARACTER SET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
 
 
 --
@@ -256,7 +256,7 @@ CREATE TABLE `tabSessions` (
   `device` varchar(255) DEFAULT 'desktop',
   `status` varchar(20) DEFAULT NULL,
   KEY `sid` (`sid`)
-) ENGINE=InnoDB ROW_FORMAT=COMPRESSED CHARACTER SET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
+) ENGINE=InnoDB ROW_FORMAT=DYNAMIC CHARACTER SET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
 
 
 --
@@ -269,7 +269,7 @@ CREATE TABLE `tabSingles` (
   `field` varchar(255) DEFAULT NULL,
   `value` text,
   KEY `singles_doctype_field_index` (`doctype`, `field`)
-) ENGINE=InnoDB ROW_FORMAT=COMPRESSED CHARACTER SET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
+) ENGINE=InnoDB ROW_FORMAT=DYNAMIC CHARACTER SET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
 
 --
 -- Table structure for table `__Auth`
@@ -283,7 +283,7 @@ CREATE TABLE `__Auth` (
 	`password` TEXT NOT NULL,
 	`encrypted` INT(1) NOT NULL DEFAULT 0,
 	PRIMARY KEY (`doctype`, `name`, `fieldname`)
-) ENGINE=InnoDB ROW_FORMAT=COMPRESSED CHARACTER SET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
+) ENGINE=InnoDB ROW_FORMAT=DYNAMIC CHARACTER SET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
 
 --
 -- Table structure for table `tabFile`
@@ -311,7 +311,7 @@ CREATE TABLE `tabFile` (
   KEY `parent` (`parent`),
   KEY `attached_to_name` (`attached_to_name`),
   KEY `attached_to_doctype` (`attached_to_doctype`)
-) ENGINE=InnoDB ROW_FORMAT=COMPRESSED CHARACTER SET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
+) ENGINE=InnoDB ROW_FORMAT=DYNAMIC CHARACTER SET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
 
 --
 -- Table structure for table `tabDefaultValue`
@@ -334,4 +334,4 @@ CREATE TABLE `tabDefaultValue` (
   PRIMARY KEY (`name`),
   KEY `parent` (`parent`),
   KEY `defaultvalue_parent_defkey_index` (`parent`,`defkey`)
-) ENGINE=InnoDB ROW_FORMAT=COMPRESSED CHARACTER SET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
+) ENGINE=InnoDB ROW_FORMAT=DYNAMIC CHARACTER SET=utf8mb4 COLLATE=utf8mb4_unicode_ci;

frappe/database/mariadb/schema.py

@@ -4,18 +4,22 @@ from frappe.database.schema import DBTable
 
 class MariaDBTable(DBTable):
 	def create(self):
-		add_text = ''
+		additional_definitions = ""
+		engine = self.meta.get("engine") or "InnoDB"
+		varchar_len = frappe.db.VARCHAR_LEN
 
 		# columns
 		column_defs = self.get_column_definitions()
-		if column_defs: add_text += ',\n'.join(column_defs) + ',\n'
+		if column_defs:
+			additional_definitions += ',\n'.join(column_defs) + ',\n'
 
 		# index
 		index_defs = self.get_index_definitions()
-		if index_defs: add_text += ',\n'.join(index_defs) + ',\n'
+		if index_defs:
+			additional_definitions += ',\n'.join(index_defs) + ',\n'
 
 		# create table
-		frappe.db.sql("""create table `%s` (
+		query = f"""create table `{self.table_name}` (
 			name varchar({varchar_len}) not null primary key,
 			creation datetime(6),
 			modified datetime(6),
@@ -26,13 +30,15 @@ class MariaDBTable(DBTable):
 			parentfield varchar({varchar_len}),
 			parenttype varchar({varchar_len}),
 			idx int(8) not null default '0',
-			%sindex parent(parent),
+			{additional_definitions}
+			index parent(parent),
 			index modified(modified))
 			ENGINE={engine}
-			ROW_FORMAT=COMPRESSED
+			ROW_FORMAT=DYNAMIC
 			CHARACTER SET=utf8mb4
-			COLLATE=utf8mb4_unicode_ci""".format(varchar_len=frappe.db.VARCHAR_LEN,
-				engine=self.meta.get("engine") or 'InnoDB') % (self.table_name, add_text))
+			COLLATE=utf8mb4_unicode_ci"""
+
+		frappe.db.sql(query)
 
 	def alter(self):
 		for col in self.columns.values():

frappe/database/mariadb/setup_db.py

@@ -34,25 +34,23 @@ def setup_database(force, source_sql, verbose, no_mariadb_socket=False):
 	db_name = frappe.local.conf.db_name
 	root_conn = get_root_connection(frappe.flags.root_login, frappe.flags.root_password)
 	dbman = DbManager(root_conn)
+	dbman_kwargs = {}
+	if no_mariadb_socket:
+		dbman_kwargs["host"] = "%"
+
 	if force or (db_name not in dbman.get_database_list()):
-		dbman.delete_user(db_name)
-		if no_mariadb_socket:
-			dbman.delete_user(db_name, host="%")
+		dbman.delete_user(db_name, **dbman_kwargs)
 		dbman.drop_database(db_name)
 	else:
 		raise Exception("Database %s already exists" % (db_name,))
 
-	dbman.create_user(db_name, frappe.conf.db_password)
-	if no_mariadb_socket:
-		dbman.create_user(db_name, frappe.conf.db_password, host="%")
+	dbman.create_user(db_name, frappe.conf.db_password, **dbman_kwargs)
 	if verbose: print("Created user %s" % db_name)
 
 	dbman.create_database(db_name)
 	if verbose: print("Created database %s" % db_name)
 
-	dbman.grant_all_privileges(db_name, db_name)
-	if no_mariadb_socket:
-		dbman.grant_all_privileges(db_name, db_name, host="%")
+	dbman.grant_all_privileges(db_name, db_name, **dbman_kwargs)
 	dbman.flush_privileges()
 	if verbose: print("Granted privileges to user %s and database %s" % (db_name, db_name))
 

frappe/database/postgres/database.py

@@ -4,6 +4,7 @@ from typing import List, Tuple, Union
 import psycopg2
 import psycopg2.extensions
 from psycopg2.extensions import ISOLATION_LEVEL_AUTOCOMMIT
+from psycopg2.errorcodes import STRING_DATA_RIGHT_TRUNCATION
 
 import frappe
 from frappe.database.database import Database
@@ -31,11 +32,11 @@ class PostgresDatabase(Database):
 	def setup_type_map(self):
 		self.db_type = 'postgres'
 		self.type_map = {
-			'Currency':		('decimal', '18,6'),
+			'Currency':		('decimal', '21,9'),
 			'Int':			('bigint', None),
 			'Long Int':		('bigint', None),
-			'Float':		('decimal', '18,6'),
-			'Percent':		('decimal', '18,6'),
+			'Float':		('decimal', '21,9'),
+			'Percent':		('decimal', '21,9'),
 			'Check':		('smallint', None),
 			'Small Text':	('text', ''),
 			'Long Text':	('text', ''),
@@ -60,7 +61,7 @@ class PostgresDatabase(Database):
 			'Color':		('varchar', self.VARCHAR_LEN),
 			'Barcode':		('text', ''),
 			'Geolocation':	('text', ''),
-			'Duration':		('decimal', '18,6'),
+			'Duration':		('decimal', '21,9'),
 			'Icon':			('varchar', self.VARCHAR_LEN)
 		}
 
@@ -171,7 +172,7 @@ class PostgresDatabase(Database):
 
 	@staticmethod
 	def is_data_too_long(e):
-		return e.pgcode == '22001'
+		return e.pgcode == STRING_DATA_RIGHT_TRUNCATION
 
 	def rename_table(self, old_name: str, new_name: str) -> Union[List, Tuple]:
 		old_name = get_table_name(old_name)
@@ -182,8 +183,8 @@ class PostgresDatabase(Database):
 		table_name = get_table_name(doctype)
 		return self.sql(f"SELECT COLUMN_NAME FROM information_schema.COLUMNS WHERE TABLE_NAME = '{table_name}'")
 
-	def change_column_type(self, table: str, column: str, type: str) -> Union[List, Tuple]:
-		table_name = get_table_name(table)
+	def change_column_type(self, doctype: str, column: str, type: str) -> Union[List, Tuple]:
+		table_name = get_table_name(doctype)
 		return self.sql(f'ALTER TABLE "{table_name}" ALTER COLUMN "{column}" TYPE {type}')
 
 	def create_auth_table(self):

frappe/database/schema.py

@@ -303,6 +303,8 @@ def get_definition(fieldtype, precision=None, length=None):
 	size = d[1] if d[1] else None
 
 	if size:
+		# This check needs to exist for backward compatibility.
+		# Till V13, default size used for float, currency and percent are (18, 6).
 		if fieldtype in ["Float", "Currency", "Percent"] and cint(precision) > 6:
 			size = '21,9'
 

frappe/desk/doctype/note/note.json

@@ -1,322 +1,106 @@
 {
-    "allow_copy": 0, 
-    "allow_guest_to_view": 0, 
-    "allow_import": 0, 
-    "allow_rename": 1, 
-    "beta": 0, 
-    "creation": "2013-05-24 13:41:00", 
-    "custom": 0, 
-    "description": "", 
-    "docstatus": 0, 
-    "doctype": "DocType", 
-    "document_type": "Document", 
-    "editable_grid": 0, 
-    "fields": [
-     {
-      "allow_bulk_edit": 0, 
-      "allow_in_quick_entry": 0, 
-      "allow_on_submit": 0, 
-      "bold": 0, 
-      "collapsible": 0, 
-      "columns": 0, 
-      "fieldname": "title", 
-      "fieldtype": "Data", 
-      "hidden": 0, 
-      "ignore_user_permissions": 0, 
-      "ignore_xss_filter": 0, 
-      "in_filter": 0, 
-      "in_global_search": 1, 
-      "in_list_view": 1, 
-      "in_standard_filter": 0, 
-      "label": "Title", 
-      "length": 0, 
-      "no_copy": 1, 
-      "permlevel": 0, 
-      "print_hide": 1, 
-      "print_hide_if_no_value": 0, 
-      "read_only": 0, 
-      "remember_last_selected_value": 0, 
-      "report_hide": 0, 
-      "reqd": 1, 
-      "search_index": 0, 
-      "set_only_once": 0, 
-      "translatable": 0, 
-      "unique": 0
-     }, 
-     {
-      "allow_bulk_edit": 0, 
-      "allow_in_quick_entry": 0, 
-      "allow_on_submit": 0, 
-      "bold": 1, 
-      "collapsible": 0, 
-      "columns": 0, 
-      "description": "", 
-      "fieldname": "public", 
-      "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": "Public", 
-      "length": 0, 
-      "no_copy": 0, 
-      "permlevel": 0, 
-      "print_hide": 1, 
-      "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": 1, 
-      "collapsible": 0, 
-      "columns": 0, 
-      "depends_on": "public", 
-      "fieldname": "notify_on_login", 
-      "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": "Notify users with a popup when they log in", 
-      "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": 1, 
-      "collapsible": 0, 
-      "columns": 0, 
-      "default": "0", 
-      "depends_on": "notify_on_login", 
-      "description": "If enabled, users will be notified every time they login. If not enabled, users will only be notified once.", 
-      "fieldname": "notify_on_every_login", 
-      "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": "Notify Users On Every Login", 
-      "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, 
-      "depends_on": "eval:doc.notify_on_login && doc.public", 
-      "fieldname": "expire_notification_on", 
-      "fieldtype": "Date", 
-      "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": "Expire Notification On", 
-      "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": 1, 
-      "set_only_once": 0, 
-      "translatable": 0, 
-      "unique": 0
-     }, 
-     {
-      "allow_bulk_edit": 0, 
-      "allow_in_quick_entry": 0, 
-      "allow_on_submit": 0, 
-      "bold": 1, 
-      "collapsible": 0, 
-      "columns": 0, 
-      "description": "Help: To link to another record in the system, use \"#Form/Note/[Note Name]\" as the Link URL. (don't use \"http://\")", 
-      "fieldname": "content", 
-      "fieldtype": "Text Editor", 
-      "hidden": 0, 
-      "ignore_user_permissions": 0, 
-      "ignore_xss_filter": 0, 
-      "in_filter": 0, 
-      "in_global_search": 1, 
-      "in_list_view": 0, 
-      "in_standard_filter": 0, 
-      "label": "Content", 
-      "length": 0, 
-      "no_copy": 0, 
-      "permlevel": 0, 
-      "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": 1, 
-      "columns": 0, 
-      "fieldname": "seen_by_section", 
-      "fieldtype": "Section Break", 
-      "hidden": 0, 
-      "ignore_user_permissions": 0, 
-      "ignore_xss_filter": 0, 
-      "in_filter": 0, 
-      "in_global_search": 0, 
-      "in_list_view": 0, 
-      "in_standard_filter": 0, 
-      "label": "Seen By", 
-      "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": "seen_by", 
-      "fieldtype": "Table", 
-      "hidden": 0, 
-      "ignore_user_permissions": 0, 
-      "ignore_xss_filter": 0, 
-      "in_filter": 0, 
-      "in_global_search": 0, 
-      "in_list_view": 0, 
-      "in_standard_filter": 0, 
-      "label": "Seen By Table", 
-      "length": 0, 
-      "no_copy": 0, 
-      "options": "Note Seen By", 
-      "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, 
-    "icon": "fa fa-file-text", 
-    "idx": 1, 
-    "image_view": 0, 
-    "in_create": 0, 
-    "is_submittable": 0, 
-    "issingle": 0, 
-    "istable": 0, 
-    "max_attachments": 0, 
-    "modified": "2018-09-21 15:15:44.909636", 
-    "modified_by": "Administrator", 
-    "module": "Desk", 
-    "name": "Note", 
-    "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": "All", 
-      "set_user_permissions": 0, 
-      "share": 1, 
-      "submit": 0, 
-      "write": 1
-     }
-    ], 
-    "quick_entry": 1, 
-    "read_only": 0, 
-    "read_only_onload": 1, 
-    "show_name_in_global_search": 0, 
-    "sort_order": "ASC", 
-    "track_changes": 1, 
-    "track_seen": 0, 
-    "track_views": 0
-   }
+ "actions": [],
+ "allow_rename": 1,
+ "creation": "2013-05-24 13:41:00",
+ "doctype": "DocType",
+ "document_type": "Document",
+ "engine": "InnoDB",
+ "field_order": [
+  "title",
+  "public",
+  "notify_on_login",
+  "notify_on_every_login",
+  "expire_notification_on",
+  "content",
+  "seen_by_section",
+  "seen_by"
+ ],
+ "fields": [
+  {
+   "fieldname": "title",
+   "fieldtype": "Data",
+   "in_global_search": 1,
+   "in_list_view": 1,
+   "label": "Title",
+   "no_copy": 1,
+   "print_hide": 1,
+   "reqd": 1
+  },
+  {
+   "bold": 1,
+   "default": "0",
+   "fieldname": "public",
+   "fieldtype": "Check",
+   "label": "Public",
+   "print_hide": 1
+  },
+  {
+   "bold": 1,
+   "default": "0",
+   "depends_on": "public",
+   "fieldname": "notify_on_login",
+   "fieldtype": "Check",
+   "label": "Notify users with a popup when they log in"
+  },
+  {
+   "bold": 1,
+   "default": "0",
+   "depends_on": "notify_on_login",
+   "description": "If enabled, users will be notified every time they login. If not enabled, users will only be notified once.",
+   "fieldname": "notify_on_every_login",
+   "fieldtype": "Check",
+   "label": "Notify Users On Every Login"
+  },
+  {
+   "depends_on": "eval:doc.notify_on_login && doc.public",
+   "fieldname": "expire_notification_on",
+   "fieldtype": "Date",
+   "label": "Expire Notification On",
+   "search_index": 1
+  },
+  {
+   "bold": 1,
+   "description": "Help: To link to another record in the system, use \"/app/note/[Note Name]\" as the Link URL. (don't use \"http://\")",
+   "fieldname": "content",
+   "fieldtype": "Text Editor",
+   "in_global_search": 1,
+   "label": "Content"
+  },
+  {
+   "collapsible": 1,
+   "fieldname": "seen_by_section",
+   "fieldtype": "Section Break",
+   "label": "Seen By"
+  },
+  {
+   "fieldname": "seen_by",
+   "fieldtype": "Table",
+   "label": "Seen By Table",
+   "options": "Note Seen By"
+  }
+ ],
+ "icon": "fa fa-file-text",
+ "idx": 1,
+ "links": [],
+ "modified": "2021-09-18 10:57:51.352643",
+ "modified_by": "Administrator",
+ "module": "Desk",
+ "name": "Note",
+ "owner": "Administrator",
+ "permissions": [
+  {
+   "create": 1,
+   "delete": 1,
+   "email": 1,
+   "print": 1,
+   "read": 1,
+   "role": "All",
+   "share": 1,
+   "write": 1
+  }
+ ],
+ "quick_entry": 1,
+ "sort_field": "modified",
+ "sort_order": "ASC",
+ "track_changes": 1
+}

frappe/desk/doctype/system_console/system_console.js

@@ -10,15 +10,95 @@ frappe.ui.form.on('System Console', {
 			description: __('Execute Console script'),
 			ignore_inputs: true,
 		});
+		frm.set_value("type", "Python");
 	},
 
 	refresh: function(frm) {
 		frm.disable_save();
 		frm.page.set_primary_action(__("Execute"), $btn => {
-			$btn.text(__('Executing...'));
-			return frm.execute_action("Execute").then(() => {
-				$btn.text(__('Execute'));
-			});
+			$btn.text(__("Executing..."));
+			return frm
+				.execute_action("Execute")
+				.then(() => frm.trigger("render_sql_output"))
+				.finally(() => $btn.text(__("Execute")));
+		});
+	},
+
+	type: function(frm) {
+		if (frm.doc.type == "Python") {
+			frm.set_value("output", "");
+			if (frm.sql_output) {
+				frm.sql_output.destroy();
+				frm.get_field("sql_output").html("");
+			}
+		}
+	},
+
+	render_sql_output: function(frm) {
+		if (frm.doc.type !== "SQL") return;
+		if (frm.sql_output) {
+			frm.sql_output.destroy();
+			frm.get_field("sql_output").html("");
+		}
+
+		if (frm.doc.output.startsWith("Traceback")) {
+			return;
+		}
+
+		let result = JSON.parse(frm.doc.output);
+		frm.set_value("output", `${result.length} ${result.length == 1 ? 'row' : 'rows'}`);
+
+		if (result.length) {
+			let columns = Object.keys(result[0]);
+			frm.sql_output = new DataTable(
+				frm.get_field("sql_output").$wrapper.get(0),
+				{
+					columns,
+					data: result
+				}
+			);
+		}
+	},
+
+	show_processlist: function(frm) {
+		if (frm.doc.show_processlist) {
+			// keep refreshing every 5 seconds
+			frm.events.refresh_processlist(frm);
+			frm.processlist_interval = setInterval(() => frm.events.refresh_processlist(frm), 5000);
+		} else {
+			if (frm.processlist_interval) {
+
+				// end it
+				clearInterval(frm.processlist_interval);
+				frm.get_field("processlist").html('');
+			}
+		}
+	},
+
+	refresh_processlist: function(frm) {
+		let timestamp = new Date();
+		frappe.call('frappe.desk.doctype.system_console.system_console.show_processlist').then(r => {
+			let rows = '';
+			for (let row of r.message) {
+				rows += `<tr>
+					<td>${row.Id}</td>
+					<td>${row.Time}</td>
+					<td>${row.State}</td>
+					<td>${row.Info}</td>
+					<td>${row.Progress}</td>
+				</tr>`
+			}
+			frm.get_field('processlist').html(`
+				<p class='text-muted'>Requested on: ${timestamp}</p>
+				<table class='table-bordered' style='width: 100%'>
+				<thead><tr>
+					<th width='10%'>Id</ht>
+					<th width='10%'>Time</ht>
+					<th width='10%'>State</ht>
+					<th width='60%'>Info</ht>
+					<th width='10%'>Progress</ht>
+				</tr></thead>
+				<tbody>${rows}</thead>`);
 		});
 	}
 });

frappe/desk/doctype/system_console/system_console.json

@@ -17,9 +17,15 @@
  "editable_grid": 1,
  "engine": "InnoDB",
  "field_order": [
+  "execute_section",
+  "type",
   "console",
   "commit",
-  "output"
+  "output",
+  "sql_output",
+  "database_processes_section",
+  "show_processlist",
+  "processlist"
  ],
  "fields": [
   {
@@ -40,13 +46,47 @@
    "fieldname": "commit",
    "fieldtype": "Check",
    "label": "Commit"
+  },
+  {
+   "fieldname": "execute_section",
+   "fieldtype": "Section Break",
+   "label": "Execute"
+  },
+  {
+   "fieldname": "database_processes_section",
+   "fieldtype": "Section Break",
+   "label": "Database Processes"
+  },
+  {
+   "default": "0",
+   "fieldname": "show_processlist",
+   "fieldtype": "Check",
+   "label": "Show Processlist"
+  },
+  {
+   "fieldname": "processlist",
+   "fieldtype": "HTML",
+   "label": "processlist"
+  },
+  {
+   "default": "Python",
+   "fieldname": "type",
+   "fieldtype": "Select",
+   "label": "Type",
+   "options": "Python\nSQL"
+  },
+  {
+   "depends_on": "eval:doc.type == 'SQL'",
+   "fieldname": "sql_output",
+   "fieldtype": "HTML",
+   "label": "SQL Output"
   }
  ],
  "hide_toolbar": 1,
  "index_web_pages_for_search": 1,
  "issingle": 1,
  "links": [],
- "modified": "2020-08-21 14:44:35.296877",
+ "modified": "2021-09-15 17:17:44.844767",
  "modified_by": "Administrator",
  "module": "Desk",
  "name": "System Console",
@@ -65,4 +105,4 @@
  "sort_field": "modified",
  "sort_order": "DESC",
  "track_changes": 1
-}
+}

frappe/desk/doctype/system_console/system_console.py

@@ -5,7 +5,7 @@
 import json
 
 import frappe
-from frappe.utils.safe_exec import safe_exec
+from frappe.utils.safe_exec import safe_exec, read_sql
 from frappe.model.document import Document
 
 class SystemConsole(Document):
@@ -13,8 +13,11 @@ class SystemConsole(Document):
 		frappe.only_for('System Manager')
 		try:
 			frappe.debug_log = []
-			safe_exec(self.console)
-			self.output = '\n'.join(frappe.debug_log)
+			if self.type == 'Python':
+				safe_exec(self.console)
+				self.output = '\n'.join(frappe.debug_log)
+			elif self.type == 'SQL':
+				self.output = frappe.as_json(read_sql(self.console, as_dict=1))
 		except: # noqa: E722
 			self.output = frappe.get_traceback()
 
@@ -33,4 +36,9 @@ class SystemConsole(Document):
 def execute_code(doc):
 	console = frappe.get_doc(json.loads(doc))
 	console.run()
-	return console.as_dict()
+	return console.as_dict()
+
+@frappe.whitelist()
+def show_processlist():
+	frappe.only_for('System Manager')
+	return frappe.db.sql('show full processlist', as_dict=1)

frappe/desk/doctype/tag/tag.py

@@ -128,46 +128,35 @@ def delete_tags_for_document(doc):
 	})
 
 def update_tags(doc, tags):
-	"""
-		Adds tags for documents
-		:param doc: Document to be added to global tags
-	"""
+	"""Adds tags for documents
 
+	:param doc: Document to be added to global tags
+	"""
 	new_tags = {tag.strip() for tag in tags.split(",") if tag}
-
-	for tag in new_tags:
-		if not frappe.db.exists("Tag Link", {"parenttype": doc.doctype, "parent": doc.name, "tag": tag}):
-			frappe.get_doc({
-				"doctype": "Tag Link",
-				"document_type": doc.doctype,
-				"document_name": doc.name,
-				"parenttype": doc.doctype,
-				"parent": doc.name,
-				"title": doc.get_title() or '',
-				"tag": tag
-			}).insert(ignore_permissions=True)
-
 	existing_tags = [tag.tag for tag in frappe.get_list("Tag Link", filters={
 			"document_type": doc.doctype,
 			"document_name": doc.name
 		}, fields=["tag"])]
 
-	deleted_tags = get_deleted_tags(new_tags, existing_tags)
+	added_tags = set(new_tags) - set(existing_tags)
+	for tag in added_tags:
+		frappe.get_doc({
+			"doctype": "Tag Link",
+			"document_type": doc.doctype,
+			"document_name": doc.name,
+			"parenttype": doc.doctype,
+			"parent": doc.name,
+			"title": doc.get_title() or '',
+			"tag": tag
+		}).insert(ignore_permissions=True)
 
-	if deleted_tags:
-		for tag in deleted_tags:
-			delete_tag_for_document(doc.doctype, doc.name, tag)
-
-def get_deleted_tags(new_tags, existing_tags):
-
-	return list(set(existing_tags) - set(new_tags))
-
-def delete_tag_for_document(dt, dn, tag):
-	frappe.db.delete("Tag Link", {
-		"document_type": dt,
-		"document_name": dn,
-		"tag": tag
-	})
+	deleted_tags = list(set(existing_tags) - set(new_tags))
+	for tag in deleted_tags:
+		frappe.db.delete("Tag Link", {
+			"document_type": doc.doctype,
+			"document_name": doc.name,
+			"tag": tag
+		})
 
 @frappe.whitelist()
 def get_documents_for_tag(tag):

frappe/desk/doctype/tag_link/tag_link.json

@@ -1,4 +1,5 @@
 {
+ "actions": [],
  "creation": "2019-09-24 13:25:36.435685",
  "doctype": "DocType",
  "editable_grid": 1,
@@ -44,7 +45,8 @@
    "read_only": 1
   }
  ],
- "modified": "2019-10-03 16:42:35.932409",
+ "links": [],
+ "modified": "2021-09-20 16:53:37.217998",
  "modified_by": "Administrator",
  "module": "Desk",
  "name": "Tag Link",
@@ -61,6 +63,17 @@
    "role": "System Manager",
    "share": 1,
    "write": 1
+  },
+  {
+   "create": 1,
+   "email": 1,
+   "export": 1,
+   "print": 1,
+   "read": 1,
+   "report": 1,
+   "role": "All",
+   "share": 1,
+   "write": 1
   }
  ],
  "read_only": 1,

frappe/desk/doctype/workspace/workspace.json

@@ -165,8 +165,6 @@
    "default": "0",
    "fieldname": "is_standard",
    "fieldtype": "Check",
-   "in_list_view": 1,
-   "in_standard_filter": 1,
    "label": "Is Standard",
    "search_index": 1
   },
@@ -181,7 +179,6 @@
    "depends_on": "eval:doc.extends_another_page == 1 || doc.for_user",
    "fieldname": "extends",
    "fieldtype": "Link",
-   "in_standard_filter": 1,
    "label": "Extends",
    "options": "Workspace",
    "search_index": 1
@@ -228,6 +225,8 @@
    "default": "0",
    "fieldname": "public",
    "fieldtype": "Check",
+   "in_list_view": 1,
+   "in_standard_filter": 1,
    "label": "Public"
   },
   {
@@ -265,11 +264,13 @@
    "label": "Roles"
   }
  ],
+ "in_create": 1,
  "links": [],
- "modified": "2021-08-30 18:47:18.227154",
+ "modified": "2021-09-16 12:01:06.450621",
  "modified_by": "Administrator",
  "module": "Desk",
  "name": "Workspace",
+ "naming_rule": "By fieldname",
  "owner": "Administrator",
  "permissions": [
   {

frappe/desk/doctype/workspace/workspace.py

@@ -208,17 +208,17 @@ def save_page(title, icon, parent, public, sb_public_items, sb_private_items, de
 	if loads(deleted_pages):
 		return delete_pages(loads(deleted_pages))
 
-	return {"name": title, "public": public}
+	return {"name": title, "public": public, "label": doc.label}
 
 def delete_pages(deleted_pages):
 	for page in deleted_pages:
 		if page.get("public") and "Workspace Manager" not in frappe.get_roles():
-			return {"name": page.get("title"), "public": 1}
+			return {"name": page.get("title"), "public": 1, "label": page.get("label")}
 
 		if frappe.db.exists("Workspace", page.get("name")):
 			frappe.get_doc("Workspace", page.get("name")).delete(ignore_permissions=True)
 
-	return {"name": "Home", "public": 1}
+	return {"name": "Home", "public": 1, "label": "Home"}
 
 def sort_pages(sb_public_items, sb_private_items):
 	wspace_public_pages = get_page_list(['name', 'title'], {'public': 1})

frappe/desk/page/leaderboard/leaderboard.js

@@ -141,7 +141,7 @@ class Leaderboard {
 	}
 
 	create_date_range_field() {
-		let timespan_field = $(this.parent).find(`.frappe-control[data-original-title=${__('Timespan')}]`);
+		let timespan_field = $(this.parent).find(`.frappe-control[data-original-title="${__('Timespan')}"]`);
 		this.date_range_field = $(`<div class="from-date-field"></div>`).insertAfter(timespan_field).hide();
 
 		let date_field = frappe.ui.form.make_control({

frappe/desk/reportview.py

@@ -121,7 +121,7 @@ def validate_filters(data, filters):
 
 def setup_group_by(data):
 	'''Add columns for aggregated values e.g. count(name)'''
-	if data.group_by:
+	if data.group_by and data.aggregate_function:
 		if data.aggregate_function.lower() not in ('count', 'sum', 'avg'):
 			frappe.throw(_('Invalid aggregate function'))
 

frappe/email/doctype/email_account/email_account.json

@@ -226,7 +226,7 @@
   },
   {
    "default": "UNSEEN",
-   "depends_on": "eval: doc.enable_incoming",
+   "depends_on": "eval: doc.enable_incoming && doc.use_imap",
    "fieldname": "email_sync_option",
    "fieldtype": "Select",
    "hide_days": 1,
@@ -236,7 +236,7 @@
   },
   {
    "default": "250",
-   "depends_on": "eval: doc.enable_incoming",
+   "depends_on": "eval: doc.enable_incoming && doc.use_imap",
    "description": "Total number of emails to sync in initial sync process ",
    "fieldname": "initial_sync_count",
    "fieldtype": "Select",
@@ -567,7 +567,7 @@
  "icon": "fa fa-inbox",
  "index_web_pages_for_search": 1,
  "links": [],
- "modified": "2021-08-31 15:23:25.714366",
+ "modified": "2021-09-21 16:44:25.728637",
  "modified_by": "Administrator",
  "module": "Email",
  "name": "Email Account",
@@ -589,4 +589,4 @@
  "sort_field": "modified",
  "sort_order": "DESC",
  "track_changes": 1
-}
+}

frappe/email/doctype/notification/notification.py

@@ -146,6 +146,7 @@ def get_context(context):
 					if doc.meta.get_field(fieldname).fieldtype in frappe.model.numeric_fieldtypes:
 						value = frappe.utils.cint(value)
 
+					doc.reload()
 					doc.set(fieldname, value)
 					doc.flags.updater_reference = {
 						'doctype': self.doctype,

frappe/email/doctype/notification/test_notification.py

@@ -20,6 +20,8 @@ class TestNotification(unittest.TestCase):
 			notification.event = 'Value Change'
 			notification.value_changed = 'status'
 			notification.send_to_all_assignees = 1
+			notification.set_property_after_alert = 'description'
+			notification.property_value = 'Changed by Notification'
 			notification.save()
 
 		if not frappe.db.exists('Notification', {'name': 'Contact Status Update'}, 'name'):
@@ -237,6 +239,9 @@ class TestNotification(unittest.TestCase):
 
 		self.assertTrue(email_queue)
 
+		# check if description is changed after alert since set_property_after_alert is set
+		self.assertEquals(todo.description, 'Changed by Notification')
+
 		recipients = [d.recipient for d in email_queue.recipients]
 		self.assertTrue('test2@example.com' in recipients)
 		self.assertTrue('test1@example.com' in recipients)

frappe/event_streaming/doctype/event_producer/event_producer.py

@@ -408,8 +408,9 @@ def sync_dependencies(document, producer_site):
 			child_table = doc.get(df.fieldname)
 			for entry in child_table:
 				child_doc = producer_site.get_doc(entry.doctype, entry.name)
-				child_doc = frappe._dict(child_doc)
-				set_dependencies(child_doc, frappe.get_meta(entry.doctype).get_link_fields(), producer_site)
+				if child_doc:
+					child_doc = frappe._dict(child_doc)
+					set_dependencies(child_doc, frappe.get_meta(entry.doctype).get_link_fields(), producer_site)
 
 	def sync_link_dependencies(doc, link_fields, producer_site):
 		set_dependencies(doc, link_fields, producer_site)

frappe/handler.py

@@ -223,7 +223,10 @@ def run_doc_method(method, docs=None, dt=None, dn=None, arg=None, args=None):
 		doc = frappe.get_doc(dt, dn)
 
 	else:
-		doc = frappe.get_doc(json.loads(docs))
+		if isinstance(docs, str):
+			docs = json.loads(docs)
+
+		doc = frappe.get_doc(docs)
 		doc._original_modified = doc.modified
 		doc.check_if_latest()
 

frappe/hooks.py

@@ -12,11 +12,11 @@ source_link = "https://github.com/frappe/frappe"
 app_license = "MIT"
 app_logo_url = '/assets/frappe/images/frappe-framework-logo.svg'
 
-develop_version = '13.x.x-develop'
+develop_version = '14.x.x-develop'
 
-app_email = "info@frappe.io"
+app_email = "developers@frappe.io"
 
-docs_app = "frappe_io"
+docs_app = "frappe_docs"
 
 translator_url = "https://translate.erpnext.com"
 
@@ -164,7 +164,8 @@ doc_events = {
 		"after_rename": "frappe.desk.notifications.clear_doctype_notifications",
 		"on_cancel": [
 			"frappe.desk.notifications.clear_doctype_notifications",
-			"frappe.workflow.doctype.workflow_action.workflow_action.process_workflow_actions"
+			"frappe.workflow.doctype.workflow_action.workflow_action.process_workflow_actions",
+			"frappe.event_streaming.doctype.event_update_log.event_update_log.notify_consumers"
 		],
 		"on_trash": [
 			"frappe.desk.notifications.clear_doctype_notifications",

frappe/installer.py

@@ -445,9 +445,21 @@ def extract_sql_from_archive(sql_file_path):
 	else:
 		decompressed_file_name = sql_file_path
 
+	# convert archive sql to latest compatible
+	convert_archive_content(decompressed_file_name)
+
 	return decompressed_file_name
 
 
+def convert_archive_content(sql_file_path):
+	if frappe.conf.db_type == "mariadb":
+		# ever since mariaDB 10.6, row_format COMPRESSED has been deprecated and removed
+		# this step is added to ease restoring sites depending on older mariaDB servers
+		contents = open(sql_file_path).read()
+		with open(sql_file_path, "w") as f:
+			f.write(contents.replace("ROW_FORMAT=COMPRESSED", "ROW_FORMAT=DYNAMIC"))
+
+
 def extract_sql_gzip(sql_gz_path):
 	import subprocess
 
@@ -457,7 +469,7 @@ def extract_sql_gzip(sql_gz_path):
 		decompressed_file = original_file.rstrip(".gz")
 		cmd = 'gzip -dvf < {0} > {1}'.format(original_file, decompressed_file)
 		subprocess.check_call(cmd, shell=True)
-	except:
+	except Exception:
 		raise
 
 	return decompressed_file

frappe/integrations/doctype/razorpay_settings/razorpay_settings.py

@@ -371,6 +371,7 @@ def capture_payment(is_sandbox=False, sanbox_response=None):
 			doc = frappe.get_doc("Integration Request", doc.name)
 			doc.status = "Failed"
 			doc.error = frappe.get_traceback()
+			doc.save()
 			frappe.log_error(doc.error, '{0} Failed'.format(doc.name))
 
 

frappe/model/__init__.py

@@ -41,6 +41,7 @@ data_fieldtypes = (
 no_value_fields = (
 	'Section Break',
 	'Column Break',
+	'Tab Break',
 	'HTML',
 	'Table',
 	'Table MultiSelect',
@@ -53,6 +54,7 @@ no_value_fields = (
 display_fieldtypes = (
 	'Section Break',
 	'Column Break',
+	'Tab Break',
 	'HTML',
 	'Button',
 	'Image',

frappe/model/base_document.py

@@ -307,7 +307,7 @@ class BaseDocument(object):
 		doc["doctype"] = self.doctype
 		for df in self.meta.get_table_fields():
 			children = self.get(df.fieldname) or []
-			doc[df.fieldname] = [d.as_dict(convert_dates_to_str=convert_dates_to_str, no_nulls=no_nulls) for d in children]
+			doc[df.fieldname] = [d.as_dict(convert_dates_to_str=convert_dates_to_str, no_nulls=no_nulls, no_default_fields=no_default_fields) for d in children]
 
 		if no_nulls:
 			for k in list(doc):

frappe/model/db_query.py

@@ -4,6 +4,7 @@
 
 from typing import List
 import frappe.defaults
+from frappe.query_builder.utils import Column
 import frappe.share
 from frappe import _
 import frappe.permissions
@@ -491,7 +492,7 @@ class DatabaseQuery(object):
 				f.value = date_range
 				fallback = "'0001-01-01 00:00:00'"
 
-			if f.operator in ('>', '<') and (f.fieldname in ('creation', 'modified')):
+			if (f.fieldname in ('creation', 'modified')):
 				value = cstr(f.value)
 				fallback = "NULL"
 
@@ -547,8 +548,12 @@ class DatabaseQuery(object):
 				value = flt(f.value)
 				fallback = 0
 
+			if isinstance(f.value, Column):
+				quote = '"' if frappe.conf.db_type == 'postgres' else "`"
+				value = f"{tname}.{quote}{f.value.name}{quote}"
+
 			# escape value
-			if isinstance(value, str) and not f.operator.lower() == 'between':
+			elif isinstance(value, str) and not f.operator.lower() == 'between':
 				value = f"{frappe.db.escape(value, percent=False)}"
 
 		if (

frappe/model/meta.py

@@ -15,6 +15,7 @@ Example:
 
 '''
 from datetime import datetime
+import click
 import frappe, json, os
 from frappe.utils import cstr, cint, cast
 from frappe.model import default_fields, no_value_fields, optional_fields, data_fieldtypes, table_fields
@@ -658,27 +659,48 @@ def get_default_df(fieldname):
 				fieldtype = "Data"
 			)
 
-def trim_tables(doctype=None):
+def trim_tables(doctype=None, dry_run=False, quiet=False):
 	"""
 	Removes database fields that don't exist in the doctype (json or custom field). This may be needed
 	as maintenance since removing a field in a DocType doesn't automatically
 	delete the db field.
 	"""
-	ignore_fields = default_fields + optional_fields
-
-	filters={ "issingle": 0 }
+	UPDATED_TABLES = {}
+	filters = {"issingle": 0}
 	if doctype:
 		filters["name"] = doctype
 
-	for doctype in frappe.db.get_all("DocType", filters=filters):
-		doctype = doctype.name
-		columns = frappe.db.get_table_columns(doctype)
-		fields = frappe.get_meta(doctype).get_fieldnames_with_value()
-		columns_to_remove = [f for f in list(set(columns) - set(fields)) if f not in ignore_fields
-			and not f.startswith("_")]
-		if columns_to_remove:
-			print(doctype, "columns removed:", columns_to_remove)
-			columns_to_remove = ", ".join("drop `{0}`".format(c) for c in columns_to_remove)
-			query = """alter table `tab{doctype}` {columns}""".format(
-				doctype=doctype, columns=columns_to_remove)
-			frappe.db.sql_ddl(query)
+	for doctype in frappe.db.get_all("DocType", filters=filters, pluck="name"):
+		try:
+			dropped_columns = trim_table(doctype, dry_run=dry_run)
+			if dropped_columns:
+				UPDATED_TABLES[doctype] = dropped_columns
+		except frappe.db.TableMissingError:
+			if quiet:
+				continue
+			click.secho(f"Ignoring missing table for DocType: {doctype}", fg="yellow", err=True)
+			click.secho(f"Consider removing record in the DocType table for {doctype}", fg="yellow", err=True)
+		except Exception as e:
+			if quiet:
+				continue
+			click.echo(e, err=True)
+
+	return UPDATED_TABLES
+
+
+def trim_table(doctype, dry_run=True):
+	frappe.cache().hdel('table_columns', f"tab{doctype}")
+	ignore_fields = default_fields + optional_fields
+	columns = frappe.db.get_table_columns(doctype)
+	fields = frappe.get_meta(doctype, cached=False).get_fieldnames_with_value()
+	is_internal = lambda f: f not in ignore_fields and not f.startswith("_")
+	columns_to_remove = [
+		f for f in list(set(columns) - set(fields)) if is_internal(f)
+	]
+	DROPPED_COLUMNS = columns_to_remove[:]
+
+	if columns_to_remove and not dry_run:
+		columns_to_remove = ", ".join(f"DROP `{c}`" for c in columns_to_remove)
+		frappe.db.sql_ddl(f"ALTER TABLE `tab{doctype}` {columns_to_remove}")
+
+	return DROPPED_COLUMNS

frappe/patches/v13_0/increase_password_length.py

@@ -1,4 +1,4 @@
 import frappe
 
 def execute():
-	frappe.db.change_column_type(table="__Auth", column="password", type="TEXT")
+	frappe.db.change_column_type("__Auth", column="password", type="TEXT")

frappe/printing/doctype/network_printer_settings/network_printer_settings.js

@@ -0,0 +1,29 @@
+// Copyright (c) 2021, Frappe Technologies and contributors
+// For license information, please see license.txt
+
+frappe.ui.form.on('Network Printer Settings', {
+	onload (frm) {
+		frm.trigger("connect_print_server");
+	},
+	server_ip (frm) {
+		frm.trigger("connect_print_server");
+	},
+	port (frm) {
+		frm.trigger("connect_print_server");
+	},
+	connect_print_server (frm) {
+		if (frm.doc.server_ip && frm.doc.port) {
+			frappe.call({
+				"doc": frm.doc,
+				"method": "get_printers_list",
+				"args": {
+					ip: frm.doc.server_ip,
+					port: frm.doc.port
+				},
+				callback: function(data) {
+					frm.set_df_property('printer_name', 'options', [""].concat(data.message));
+				}
+			});
+		}
+	}
+});

frappe/printing/doctype/network_printer_settings/network_printer_settings.json

@@ -0,0 +1,66 @@
+{
+ "actions": [],
+ "autoname": "Prompt",
+ "creation": "2021-09-17 11:26:06.943999",
+ "doctype": "DocType",
+ "editable_grid": 1,
+ "engine": "InnoDB",
+ "field_order": [
+  "server_ip",
+  "port",
+  "column_break_4",
+  "printer_name"
+ ],
+ "fields": [
+  {
+   "default": "localhost",
+   "fieldname": "server_ip",
+   "fieldtype": "Data",
+   "in_list_view": 1,
+   "label": "Server IP",
+   "reqd": 1
+  },
+  {
+   "default": "631",
+   "fieldname": "port",
+   "fieldtype": "Int",
+   "in_list_view": 1,
+   "label": "Port",
+   "reqd": 1
+  },
+  {
+   "fieldname": "column_break_4",
+   "fieldtype": "Column Break"
+  },
+  {
+   "fieldname": "printer_name",
+   "fieldtype": "Select",
+   "label": "Printer Name",
+   "reqd": 1
+  }
+ ],
+ "index_web_pages_for_search": 1,
+ "links": [],
+ "modified": "2021-09-17 11:30:16.781655",
+ "modified_by": "Administrator",
+ "module": "Printing",
+ "name": "Network Printer Settings",
+ "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/printing/doctype/network_printer_settings/network_printer_settings.py

@@ -0,0 +1,37 @@
+# Copyright (c) 2021, Frappe Technologies and contributors
+# For license information, please see license.txt
+
+import frappe
+from frappe.model.document import Document
+from frappe import _
+
+class NetworkPrinterSettings(Document):
+	@frappe.whitelist()
+	def get_printers_list(self,ip="localhost",port=631):
+		printer_list = []
+		try:
+			import cups
+		except ImportError:
+			frappe.throw(_('''This feature can not be used as dependencies are missing.
+				Please contact your system manager to enable this by installing pycups!'''))
+			return
+		try:
+			cups.setServer(self.server_ip)
+			cups.setPort(self.port)
+			conn = cups.Connection()
+			printers = conn.getPrinters()
+			for printer_id,printer in printers.items():
+				printer_list.append({
+					'value': printer_id,
+					'label': printer['printer-make-and-model']
+				})
+
+		except RuntimeError:
+			frappe.throw(_("Failed to connect to server"))
+		except frappe.ValidationError:
+			frappe.throw(_("Failed to connect to server"))
+		return printer_list
+
+@frappe.whitelist()
+def get_network_printer_settings():
+	return frappe.db.get_list('Network Printer Settings', pluck='name')

frappe/printing/doctype/network_printer_settings/test_network_printer_settings.py

@@ -0,0 +1,8 @@
+# Copyright (c) 2021, Frappe Technologies and Contributors
+# See license.txt
+
+# import frappe
+import unittest
+
+class TestNetworkPrinterSettings(unittest.TestCase):
+	pass

frappe/printing/doctype/print_settings/print_settings.js

@@ -15,27 +15,5 @@ frappe.ui.form.on('Print Settings', {
 	},
 	onload: function(frm) {
 		frm.script_manager.trigger("print_style");
-	},
-	server_ip: function(frm) {
-		frm.trigger("connect_print_server");
-	},
-	port:function(frm) {
-		frm.trigger("connect_print_server");
-	},
-	connect_print_server:function(frm) {
-		if(frm.doc.server_ip && frm.doc.port){
-			frappe.call({
-				"doc": frm.doc,
-				"method": "get_printers",
-				"args": {
-					ip: frm.doc.server_ip,
-					port: frm.doc.port
-				},
-				callback: function(data) {
-					frm.set_df_property('printer_name', 'options', [""].concat(data.message));
-				},
-				error: (data) => frm.set_value("enable_print_server", 0)
-			});
-		}
 	}
 });

frappe/printing/doctype/print_settings/print_settings.json

@@ -19,9 +19,6 @@
   "allow_print_for_cancelled",
   "server_printer",
   "enable_print_server",
-  "server_ip",
-  "printer_name",
-  "port",
   "raw_printing_section",
   "enable_raw_printing",
   "print_style_section",
@@ -107,29 +104,11 @@
   },
   {
    "default": "0",
+   "depends_on": "enable_print_server",
    "fieldname": "enable_print_server",
    "fieldtype": "Check",
-   "label": "Enable Print Server"
-  },
-  {
-   "default": "localhost",
-   "depends_on": "enable_print_server",
-   "fieldname": "server_ip",
-   "fieldtype": "Data",
-   "label": "Server IP"
-  },
-  {
-   "depends_on": "enable_print_server",
-   "fieldname": "printer_name",
-   "fieldtype": "Select",
-   "label": "Printer Name"
-  },
-  {
-   "default": "631",
-   "depends_on": "enable_print_server",
-   "fieldname": "port",
-   "fieldtype": "Int",
-   "label": "Port"
+   "label": "Enable Print Server",
+   "mandatory_depends_on": "enable_print_server"
   },
   {
    "fieldname": "raw_printing_section",
@@ -183,7 +162,7 @@
  "index_web_pages_for_search": 1,
  "issingle": 1,
  "links": [],
- "modified": "2021-02-15 14:16:18.474254",
+ "modified": "2021-09-17 12:59:14.783694",
  "modified_by": "Administrator",
  "module": "Printing",
  "name": "Print Settings",

frappe/printing/doctype/print_settings/print_settings.py

@@ -12,26 +12,6 @@ class PrintSettings(Document):
 	def on_update(self):
 		frappe.clear_cache()
 
-	@frappe.whitelist()
-	def get_printers(self,ip="localhost",port=631):
-		printer_list = []
-		try:
-			import cups
-		except ImportError:
-			frappe.throw(_("You need to install pycups to use this feature!"))
-			return
-		try:
-			cups.setServer(self.server_ip)
-			cups.setPort(self.port)
-			conn = cups.Connection()
-			printers = conn.getPrinters()
-			printer_list = printers.keys()
-		except RuntimeError:
-			frappe.throw(_("Failed to connect to server"))
-		except frappe.ValidationError:
-			frappe.throw(_("Failed to connect to server"))
-		return printer_list
-
 @frappe.whitelist()
 def is_print_server_enabled():
 	if not hasattr(frappe.local, 'enable_print_server'):

frappe/printing/page/print/print.js

@@ -165,10 +165,7 @@ frappe.ui.form.PrintView = class {
 			frappe.set_route('Form', 'Print Settings');
 		});
 
-		if (
-			frappe.model.get_doc(':Print Settings', 'Print Settings')
-				.enable_raw_printing == '1'
-		) {
+		if (this.print_settings.enable_raw_printing == '1') {
 			this.page.add_menu_item(__('Raw Printing Setting'), () => {
 				this.printer_setting_dialog();
 			});
@@ -179,6 +176,12 @@ frappe.ui.form.PrintView = class {
 				this.edit_print_format()
 			);
 		}
+
+		if (this.print_settings.enable_print_server) {
+			this.page.add_menu_item(__('Select Network Printer'), () =>
+				this.network_printer_setting_dialog()
+			);
+		}
 	}
 
 	show(frm) {
@@ -460,72 +463,108 @@ frappe.ui.form.PrintView = class {
 
 	printit() {
 		let me = this;
-		frappe.call({
-			method:
-				'frappe.printing.doctype.print_settings.print_settings.is_print_server_enabled',
-			callback: function(data) {
-				if (data.message) {
-					frappe.call({
-						method: 'frappe.utils.print_format.print_by_server',
-						args: {
-							doctype: me.frm.doc.doctype,
-							name: me.frm.doc.name,
-							print_format: me.selected_format(),
-							no_letterhead: me.with_letterhead(),
-							letterhead: this.get_letterhead(),
-						},
-						callback: function() {},
-					});
-				} else if (me.get_mapped_printer().length === 1) {
-					// printer is already mapped in localstorage (applies for both raw and pdf )
-					if (me.is_raw_printing()) {
-						me.get_raw_commands(function(out) {
-							frappe.ui.form
-								.qz_connect()
-								.then(function() {
-									let printer_map = me.get_mapped_printer()[0];
-									let data = [out.raw_commands];
-									let config = qz.configs.create(printer_map.printer);
-									return qz.print(config, data);
-								})
-								.then(frappe.ui.form.qz_success)
-								.catch((err) => {
-									frappe.ui.form.qz_fail(err);
-								});
+
+		if (me.print_settings.enable_print_server) {
+			if (localStorage.getItem('network_printer')) {
+				me.print_by_server();
+			} else {
+				me.network_printer_setting_dialog(() => me.print_by_server());
+			}
+		} else if (me.get_mapped_printer().length === 1) {
+			// printer is already mapped in localstorage (applies for both raw and pdf )
+			if (me.is_raw_printing()) {
+				me.get_raw_commands(function(out) {
+					frappe.ui.form
+						.qz_connect()
+						.then(function() {
+							let printer_map = me.get_mapped_printer()[0];
+							let data = [out.raw_commands];
+							let config = qz.configs.create(printer_map.printer);
+							return qz.print(config, data);
+						})
+						.then(frappe.ui.form.qz_success)
+						.catch((err) => {
+							frappe.ui.form.qz_fail(err);
 						});
-					} else {
-						frappe.show_alert(
+				});
+			} else {
+				frappe.show_alert(
+					{
+						message: __('PDF printing via "Raw Print" is not supported.'),
+						subtitle: __(
+							'Please remove the printer mapping in Printer Settings and try again.'
+						),
+						indicator: 'info',
+					},
+					14
+				);
+				//Note: need to solve "Error: Cannot parse (FILE)<URL> as a PDF file" to enable qz pdf printing.
+			}
+		} else if (me.is_raw_printing()) {
+			// printer not mapped in localstorage and the current print format is raw printing
+			frappe.show_alert(
+				{
+					message: __('Printer mapping not set.'),
+					subtitle: __(
+						'Please set a printer mapping for this print format in the Printer Settings'
+					),
+					indicator: 'warning',
+				},
+				14
+			);
+			me.printer_setting_dialog();
+		} else {
+			me.render_page('/printview?', true);
+		}
+	}
+
+	print_by_server() {
+		let me = this;
+		if (localStorage.getItem('network_printer')) {
+			frappe.call({
+				method: 'frappe.utils.print_format.print_by_server',
+				args: {
+					doctype: me.frm.doc.doctype,
+					name: me.frm.doc.name,
+					printer_setting: localStorage.getItem('network_printer'),
+					print_format: me.selected_format(),
+					no_letterhead: me.with_letterhead(),
+					letterhead: me.get_letterhead(),
+				},
+				callback: function() {},
+			});
+		}
+	}
+	network_printer_setting_dialog(callback) {
+		frappe.call({
+			method: 'frappe.printing.doctype.network_printer_settings.network_printer_settings.get_network_printer_settings',
+			callback: function(r) {
+				if (r.message) {
+					let d = new frappe.ui.Dialog({
+						title: __('Select Network Printer'),
+						fields: [
 							{
-								message: __('PDF printing via "Raw Print" is not supported.'),
-								subtitle: __(
-									'Please remove the printer mapping in Printer Settings and try again.'
-								),
-								indicator: 'info',
-							},
-							14
-						);
-						//Note: need to solve "Error: Cannot parse (FILE)<URL> as a PDF file" to enable qz pdf printing.
-					}
-				} else if (me.is_raw_printing()) {
-					// printer not mapped in localstorage and the current print format is raw printing
-					frappe.show_alert(
-						{
-							message: __('Printer mapping not set.'),
-							subtitle: __(
-								'Please set a printer mapping for this print format in the Printer Settings'
-							),
-							indicator: 'warning',
+								"label": "Printer",
+								"fieldname": "printer",
+								"fieldtype": "Select",
+								"reqd": 1,
+								"options": r.message
+							}
+						],
+						primary_action: function() {
+							localStorage.setItem('network_printer', d.get_values().printer);
+							if (typeof callback == "function") {
+								callback();
+							}
+							d.hide();
 						},
-						14
-					);
-					me.printer_setting_dialog();
-				} else {
-					me.render_page('/printview?', true);
+						primary_action_label: __('Select')
+					});
+					d.show();
 				}
 			},
 		});
 	}
-
 	render_page(method, printit = false) {
 		let w = window.open(
 			frappe.urllib.get_full_url(

frappe/printing/page/print_format_builder/print_format_builder.js

@@ -261,7 +261,7 @@ frappe.PrintFormatBuilder = class PrintFormatBuilder {
 			} else if(f.fieldtype==="Column Break") {
 				set_column();
 
-			} else if(!in_list(["Section Break", "Column Break", "Fold"], f.fieldtype)
+			} else if (!in_list(["Section Break", "Column Break", "Tab Break", "Fold"], f.fieldtype)
 				&& f.label) {
 				if(!column) set_column();
 
@@ -298,7 +298,7 @@ frappe.PrintFormatBuilder = class PrintFormatBuilder {
 	init_visible_columns(f) {
 		f.visible_columns = []
 		$.each(frappe.get_meta(f.options).fields, function(i, _f) {
-			if(!in_list(["Section Break", "Column Break"], _f.fieldtype) &&
+			if (!in_list(["Section Break", "Column Break", "Tab Break"], _f.fieldtype) &&
 				!_f.print_hide && f.label) {
 
 				// column names set as fieldname|width
@@ -606,7 +606,7 @@ frappe.PrintFormatBuilder = class PrintFormatBuilder {
 			// add remaining fields
 			$.each(doc_fields, function(j, f) {
 				if (f && !in_list(column_names, f.fieldname)
-					&& !in_list(["Section Break", "Column Break"], f.fieldtype) && f.label) {
+					&& !in_list(["Section Break", "Column Break", "Tab Break"], f.fieldtype) && f.label) {
 					fields.push(f);
 				}
 			})

frappe/printing/page/print_format_builder/print_format_builder_sidebar.html

@@ -4,7 +4,7 @@
 </div>
 <div class="print-format-builder-sidebar-fields">
 	{% for (var i=0, l=fields.length; i < l; i++) { var f = fields[i]; %}
-		{% if(!in_list(["Section Break", "Column Break", "Fold"], f.fieldtype)) { %}
+		{% if(!in_list(["Section Break", "Tab Break", "Column Break", "Fold"], f.fieldtype)) { %}
 		<div class="print-format-builder-field-placeholder"
 			data-fieldname="{%= f.fieldname %}">
 			<div title="{{f.label}}" class="field-label btn btn-default btn-sm sidebar-field ellipsis

frappe/public/icons/timeless/message.svg

@@ -0,0 +1,3 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+	<path d="M2.66659 9.77761C2.66659 10.0919 2.79145 10.3934 3.01372 10.6157C3.23598 10.8379 3.53744 10.9628 3.85177 10.9628H10.9629L13.3333 13.3332V3.85169C13.3333 3.53736 13.2084 3.2359 12.9861 3.01364C12.7639 2.79137 12.4624 2.6665 12.1481 2.6665H3.85177C3.53744 2.6665 3.23598 2.79137 3.01372 3.01364C2.79145 3.2359 2.66659 3.53736 2.66659 3.85169V9.77761Z" stroke="#4C5A67" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>

frappe/public/icons/timeless/search.svg

@@ -0,0 +1,3 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <path fill-rule="evenodd" clip-rule="evenodd" d="M3.5 7.44462C3.5 5.26607 5.26607 3.5 7.44462 3.5C9.62318 3.5 11.3892 5.26607 11.3892 7.44462C11.3892 8.50829 10.9683 9.47362 10.2838 10.1831C10.265 10.1972 10.247 10.2128 10.2299 10.2299C10.2128 10.247 10.1972 10.265 10.1831 10.2838C9.47362 10.9683 8.50829 11.3892 7.44462 11.3892C5.26607 11.3892 3.5 9.62318 3.5 7.44462ZM10.5696 11.2767C9.71788 11.9722 8.62996 12.3892 7.44462 12.3892C4.71378 12.3892 2.5 10.1755 2.5 7.44462C2.5 4.71378 4.71378 2.5 7.44462 2.5C10.1755 2.5 12.3892 4.71378 12.3892 7.44462C12.3892 8.62996 11.9722 9.71788 11.2767 10.5696L13.3538 12.6467C13.549 12.8419 13.549 13.1585 13.3538 13.3538C13.1585 13.549 12.8419 13.549 12.6467 13.3538L10.5696 11.2767Z" fill="#4C5A67"/>
+</svg>

frappe/public/js/desk.bundle.js

@@ -30,6 +30,9 @@ import "./frappe/ui/slides.js";
 import "./frappe/ui/find.js";
 import "./frappe/ui/iconbar.js";
 import "./frappe/form/layout.js";
+import "./frappe/form/section.js";
+import "./frappe/form/tab.js";
+import "./frappe/form/column.js";
 import "./frappe/ui/field_group.js";
 import "./frappe/form/link_selector.js";
 import "./frappe/form/multi_select_dialog.js";

frappe/public/js/frappe-web.bundle.js

@@ -10,6 +10,7 @@ import "./frappe/utils/common.js";
 import "./frappe/ui/messages.js";
 import "./frappe/translate.js";
 import "./frappe/utils/pretty_date.js";
+import "./frappe/utils/datetime.js";
 import "./frappe/microtemplate.js";
 import "./frappe/query_string.js";
 

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

@@ -0,0 +1,49 @@
+export default class Column {
+	constructor(section, df) {
+		if (!df) df = {};
+
+		this.df = df;
+		this.section = section;
+		this.make();
+		this.resize_all_columns();
+	}
+
+	make() {
+		this.wrapper = $(`
+			<div class="form-column">
+				<form>
+				</form>
+			</div>
+		`)
+			.appendTo(this.section.body)
+			.find("form")
+			.on("submit", function () {
+				return false;
+			});
+
+		if (this.df.label) {
+			$(`
+				<label class="control-label">
+					${__(this.df.label)}
+				</label>
+			`)
+				.appendTo(this.wrapper);
+		}
+	}
+
+	resize_all_columns() {
+		// distribute all columns equally
+		let colspan = cint(12 / this.section.wrapper.find(".form-column").length);
+
+		this.section.wrapper
+			.find(".form-column")
+			.removeClass()
+			.addClass("form-column")
+			.addClass("col-sm-" + colspan);
+
+	}
+
+	refresh() {
+		this.section.refresh();
+	}
+}

frappe/public/js/frappe/form/controls/float.js

@@ -1,4 +1,17 @@
 frappe.ui.form.ControlFloat = class ControlFloat extends frappe.ui.form.ControlInt {
+
+	make_input() {
+		super.make_input();
+		const change_handler = e => {
+			if (this.change) this.change(e);
+			else {
+				let value = this.get_input_value();
+				this.parse_validate_and_set_in_model(value, e);
+			}
+		};
+		// convert to number format on focusout since focus converts it to flt.
+		this.$input.on("focusout", change_handler);
+	}
 	parse(value) {
 		value = this.eval_expression(value);
 		return isNaN(parseFloat(value)) ? null : flt(value, this.get_precision());

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

@@ -1,61 +1,65 @@
 // Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
 // MIT License. See license.txt
 
+import Section from "./section.js";
+
 frappe.ui.form.Dashboard = class FormDashboard {
-	constructor(opts) {
-		$.extend(this, opts);
+	constructor(parent, frm) {
+		this.parent = parent;
+		this.frm = frm;
 		this.setup_dashboard_sections();
 	}
 
 	setup_dashboard_sections() {
-		this.progress_area = new Section(this.parent, {
+		this.progress_area = this.make_section({
 			css_class: 'progress-area',
 			hidden: 1,
-			collapsible: 1
+			is_dashboard_section: 1,
 		});
 
-		this.heatmap_area = new Section(this.parent, {
-			title: __("Overview"),
+		this.heatmap_area = this.make_section({
+			label: __("Overview"),
 			css_class: 'form-heatmap',
 			hidden: 1,
-			collapsible: 1,
+			is_dashboard_section: 1,
 			body_html: `
 				<div id="heatmap-${frappe.model.scrub(this.frm.doctype)}" class="heatmap"></div>
 				<div class="text-muted small heatmap-message hidden"></div>
 			`
 		});
 
-		this.chart_area = new Section(this.parent, {
-			title: __("Graph"),
+		this.chart_area = this.make_section({
+			label: __("Graph"),
 			css_class: 'form-graph',
 			hidden: 1,
-			collapsible: 1
+			is_dashboard_section: 1
 		});
 
 		this.stats_area_row = $(`<div class="row"></div>`);
-		this.stats_area = new Section(this.parent, {
-			title: __("Stats"),
+		this.stats_area = this.make_section({
+			label: __("Stats"),
 			css_class: 'form-stats',
 			hidden: 1,
-			collapsible: 1,
+			is_dashboard_section: 1,
 			body_html: this.stats_area_row
 		});
 
 		this.transactions_area = $(`<div class="transactions"></div`);
-		this.links_area = new Section(this.parent, {
-			title: __("Connections"),
+
+		this.links_area = this.make_section({
+			label: __("Connections"),
 			css_class: 'form-links',
 			hidden: 1,
-			collapsible: 1,
+			is_dashboard_section: 1,
 			body_html: this.transactions_area
 		});
+	}
 
-
+	make_section(df) {
+		return new Section(this.parent, df);
 	}
 
 	reset() {
-		this.hide();
-
 		// clear progress
 		this.progress_area.body.empty();
 		this.progress_area.hide();
@@ -70,19 +74,19 @@ frappe.ui.form.Dashboard = class FormDashboard {
 
 		// clear custom
 		this.parent.find('.custom').remove();
-		this.hide();
+		// this.hide();
 	}
 
-	add_section(body_html, title=null, css_class="custom", hidden=false) {
+	add_section(body_html, label=null, css_class="custom", hidden=false) {
 		let options = {
-			title,
+			label,
 			css_class,
 			hidden,
 			body_html,
 			make_card: true,
-			collapsible: 1
+			is_dashboard_section: 1
 		};
-		return new Section(this.parent, options).body;
+		return new Section(this.frm.layout.wrapper, options).body;
 	}
 
 	add_progress(title, percent, message) {
@@ -154,7 +158,7 @@ frappe.ui.form.Dashboard = class FormDashboard {
 
 	make_progress_chart(title) {
 		this.progress_area.show();
-		var progress_chart = $('<div class="progress-chart" title="'+(title || '')+'"></div>')
+		let progress_chart = $('<div class="progress-chart" title="'+(title || '')+'"></div>')
 			.appendTo(this.progress_area.body);
 		return progress_chart;
 	}
@@ -169,7 +173,7 @@ frappe.ui.form.Dashboard = class FormDashboard {
 			this.init_data();
 		}
 
-		var show = false;
+		let show = false;
 
 		if (this.data && ((this.data.transactions || []).length
 			|| (this.data.reports || []).length)) {
@@ -197,11 +201,10 @@ frappe.ui.form.Dashboard = class FormDashboard {
 	}
 
 	after_refresh() {
-		var me = this;
 		// show / hide new buttons (if allowed)
-		this.links_area.body.find('.btn-new').each(function() {
-			if (me.frm.can_create($(this).attr('data-doctype'))) {
-				$(this).removeClass('hidden');
+		this.links_area.body.find('.btn-new').each((i, el) => {
+			if (this.frm.can_create($(this).attr('data-doctype'))) {
+				$(el).removeClass('hidden');
 			}
 		});
 		!this.frm.is_new() && this.set_open_count();
@@ -269,7 +272,7 @@ frappe.ui.form.Dashboard = class FormDashboard {
 	}
 
 	render_links() {
-		var me = this;
+		let me = this;
 		this.links_area.show();
 		this.links_area.body.find('.btn-new').addClass('hidden');
 		if (this.data_rendered) {
@@ -329,7 +332,7 @@ frappe.ui.form.Dashboard = class FormDashboard {
 
 	open_document_list($link, show_open) {
 		// show document list with filters
-		var doctype = $link.attr('data-doctype'),
+		let doctype = $link.attr('data-doctype'),
 			names = $link.attr('data-names') || [];
 
 		if (this.data.internal_links[doctype]) {
@@ -351,8 +354,8 @@ frappe.ui.form.Dashboard = class FormDashboard {
 	get_document_filter(doctype) {
 		// return the default filter for the given document
 		// like {"customer": frm.doc.name}
-		var filter = {};
-		var fieldname = this.data.non_standard_fieldnames
+		let filter = {};
+		let fieldname = this.data.non_standard_fieldnames
 			? (this.data.non_standard_fieldnames[doctype] || this.data.fieldname)
 			: this.data.fieldname;
 
@@ -371,7 +374,7 @@ frappe.ui.form.Dashboard = class FormDashboard {
 		}
 
 		// list all items from the transaction list
-		var items = [],
+		let items = [],
 			me = this;
 
 		this.data.transactions.forEach(function(group) {
@@ -380,7 +383,7 @@ frappe.ui.form.Dashboard = class FormDashboard {
 			});
 		});
 
-		var method = this.data.method || 'frappe.desk.notifications.get_open_count';
+		let method = this.data.method || 'frappe.desk.notifications.get_open_count';
 		frappe.call({
 			type: "GET",
 			method: method,
@@ -429,7 +432,7 @@ frappe.ui.form.Dashboard = class FormDashboard {
 	}
 
 	set_badge_count(doctype, open_count, count, names) {
-		var $link = $(this.transactions_area)
+		let $link = $(this.transactions_area)
 			.find('.document-link[data-doctype="'+doctype+'"]');
 
 		if (open_count) {
@@ -476,7 +479,7 @@ frappe.ui.form.Dashboard = class FormDashboard {
 			this.heatmap_area.body.find('svg').css({'margin': 'auto'});
 
 			// message
-			var heatmap_message = this.heatmap_area.body.find('.heatmap-message');
+			let heatmap_message = this.heatmap_area.body.find('.heatmap-message');
 			if (this.data.heatmap_message) {
 				heatmap_message.removeClass('hidden').html(this.data.heatmap_message);
 			} else {
@@ -491,9 +494,9 @@ frappe.ui.form.Dashboard = class FormDashboard {
 
 
 		// set colspan
-		var indicators = this.stats_area_row.find('.indicator-column');
-		var n_indicators = indicators.length + 1;
-		var colspan;
+		let indicators = this.stats_area_row.find('.indicator-column');
+		let n_indicators = indicators.length + 1;
+		let colspan;
 		if (n_indicators > 4) {
 			colspan = 3;
 		} else {
@@ -505,7 +508,7 @@ frappe.ui.form.Dashboard = class FormDashboard {
 			indicators.removeClass().addClass('col-sm-'+colspan).addClass('indicator-column');
 		}
 
-		var indicator = $('<div class="col-sm-'+colspan+' indicator-column"><span class="indicator '+color+'">'
+		let indicator = $('<div class="col-sm-'+colspan+' indicator-column"><span class="indicator '+color+'">'
 			+label+'</span></div>').appendTo(this.stats_area_row);
 
 		return indicator;
@@ -513,9 +516,9 @@ frappe.ui.form.Dashboard = class FormDashboard {
 
 	// graphs
 	setup_graph() {
-		var me = this;
-		var method = this.data.graph_method;
-		var args = {
+		let me = this;
+		let method = this.data.graph_method;
+		let args = {
 			doctype: this.frm.doctype,
 			docname: this.frm.doc.name,
 		};
@@ -579,11 +582,10 @@ frappe.ui.form.Dashboard = class FormDashboard {
 	}
 
 	add_comment(text, alert_class, permanent) {
-		var me = this;
 		this.set_headline_alert(text, alert_class);
 		if (!permanent) {
-			setTimeout(function() {
-				me.clear_headline();
+			setTimeout(() => {
+				this.clear_headline();
 			}, 10000);
 		}
 	}
@@ -600,109 +602,3 @@ frappe.ui.form.Dashboard = class FormDashboard {
 		}
 	}
 };
-
-class Section {
-	constructor(parent, options) {
-		this.parent = parent;
-		this.df = options || {};
-		this.make();
-
-		if (this.df.title && this.df.collapsible && localStorage.getItem(options.css_class + '-closed')) {
-			this.collapse();
-		}
-		this.refresh();
-	}
-
-	make() {
-		this.wrapper = $(`<div class="form-dashboard-section ${ this.df.make_card ? "card-section" : "" }">`)
-			.appendTo(this.parent);
-
-		if (this.df) {
-			if (this.df.title) {
-				this.make_head();
-			}
-			if (this.df.description) {
-				this.description_wrapper = $(
-					`<div class="col-sm-12 form-section-description">
-						${__(this.df.description)}
-					</div>`
-				);
-
-				this.wrapper.append(this.description_wrapper);
-			}
-			if (this.df.css_class) {
-				this.wrapper.addClass(this.df.css_class);
-			}
-			if (this.df.hide_border) {
-				this.wrapper.toggleClass("hide-border", true);
-			}
-		}
-
-		this.body = $('<div class="section-body">').appendTo(this.wrapper);
-
-		if (this.df.body_html) {
-			this.body.append(this.df.body_html);
-		}
-	}
-
-	make_head() {
-		this.head = $(`
-			<div class="section-head">
-				${__(this.df.title)}
-				<span class="ml-2 collapse-indicator mb-1"></span>
-			</div>
-		`);
-
-		this.head.appendTo(this.wrapper);
-		this.indicator = this.head.find('.collapse-indicator');
-		this.indicator.hide();
-
-		if (this.df.collapsible) {
-			// show / hide based on status
-			this.collapse_link = this.head.on("click", () => {
-				this.collapse();
-			});
-			this.set_icon();
-			this.indicator.show();
-		}
-	}
-
-	refresh() {
-		if (!this.df) return;
-
-		// hide if explicitly hidden
-		let hide = this.df.hidden;
-		this.wrapper.toggle(!hide);
-	}
-
-	collapse(hide) {
-		if (hide === undefined) {
-			hide = !this.body.hasClass("hide");
-		}
-
-		this.body.toggleClass("hide", hide);
-		this.head && this.head.toggleClass("collapsed", hide);
-
-		this.set_icon(hide);
-
-		// save state for next reload ('' is falsy)
-		localStorage.setItem(this.df.css_class + '-closed', hide ? '1' : '');
-	}
-
-	set_icon(hide) {
-		let indicator_icon = hide ? 'down' : 'up-line';
-		this.indicator && this.indicator.html(frappe.utils.icon(indicator_icon, 'sm', 'mb-1'));
-	}
-
-	is_collapsed() {
-		return this.body.hasClass('hide');
-	}
-
-	hide() {
-		this.wrapper.hide();
-	}
-
-	show() {
-		this.wrapper.show();
-	}
-}

frappe/public/js/frappe/form/footer/form_timeline.js

@@ -147,7 +147,9 @@ class FormTimeline extends BaseTimeline {
 	}
 
 	get_user_link(user) {
-		const user_display_text = (frappe.user_info(user).fullname || '').bold();
+		const user_display_text = (
+			(frappe.session.user == user ? __("You") : frappe.user_info(user).fullname) || ''
+		).bold();
 		return frappe.utils.get_form_link('User', user, true, user_display_text);
 	}
 
@@ -353,7 +355,7 @@ class FormTimeline extends BaseTimeline {
 				icon: 'branch',
 				icon_size: 'sm',
 				creation: workflow_log.creation,
-				content: __(workflow_log.content),
+				content: `${this.get_user_link(workflow_log.owner)} ${__(workflow_log.content)}`,
 				title: "Workflow",
 			});
 		});

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

@@ -94,6 +94,11 @@ frappe.ui.form.Form = class FrappeForm {
 		this.watch_model_updates();
 
 		if (!this.meta.hide_toolbar && frappe.boot.desk_settings.timeline) {
+			// this.footer_tab = new frappe.ui.form.Tab(this.layout, {
+			// 	label: __("Activity"),
+			// 	fieldname: 'timeline'
+			// });
+
 			this.footer = new frappe.ui.form.Footer({
 				frm: this,
 				parent: $('<div>').appendTo(this.page.main.parent())
@@ -128,8 +133,8 @@ frappe.ui.form.Form = class FrappeForm {
 	}
 
 	setup_std_layout() {
-		this.form_wrapper 	= $('<div></div>').appendTo(this.layout_main);
-		this.body 			= $('<div></div>').appendTo(this.form_wrapper);
+		this.form_wrapper = $('<div></div>').appendTo(this.layout_main);
+		this.body = $('<div></div>').appendTo(this.form_wrapper);
 
 		// only tray
 		this.meta.section_style='Simple'; // always simple!
@@ -141,17 +146,19 @@ frappe.ui.form.Form = class FrappeForm {
 			doctype_layout: this.doctype_layout,
 			frm: this,
 			with_dashboard: true,
-			card_layout: true,
+			card_layout: true
 		});
+
 		this.layout.make();
 
 		this.fields_dict = this.layout.fields_dict;
 		this.fields = this.layout.fields_list;
 
-		this.dashboard = new frappe.ui.form.Dashboard({
-			frm: this,
-			parent: $('<div class="form-dashboard">').insertAfter(this.layout.wrapper.find('.form-message'))
-		});
+		let dashboard_parent = $('<div class="form-dashboard">');
+
+		let main_page = this.layout.tabs.length ? this.layout.tabs[0].wrapper : this.layout.wrapper;
+		main_page.prepend(dashboard_parent);
+		this.dashboard = new frappe.ui.form.Dashboard(dashboard_parent, this);
 
 		this.tour = new frappe.ui.form.FormTour({
 			frm: this
@@ -181,8 +188,7 @@ frappe.ui.form.Form = class FrappeForm {
 
 				me.layout.refresh_dependency();
 				me.layout.refresh_sections();
-				let object = me.script_manager.trigger(fieldname, doc.doctype, doc.name);
-				return object;
+				return me.script_manager.trigger(fieldname, doc.doctype, doc.name);
 			}
 		});
 
@@ -197,7 +203,7 @@ frappe.ui.form.Form = class FrappeForm {
 				if(doc.parent===me.docname && doc.parentfield===df.fieldname) {
 					me.dirty();
 					me.fields_dict[df.fieldname].grid.set_value(fieldname, value, doc);
-					me.script_manager.trigger(fieldname, doc.doctype, doc.name);
+					return me.script_manager.trigger(fieldname, doc.doctype, doc.name);
 				}
 			});
 		});
@@ -459,7 +465,7 @@ frappe.ui.form.Form = class FrappeForm {
 				},
 				() => this.cscript.is_onload && this.is_new() && this.focus_on_first_input(),
 				() => this.run_after_load_hook(),
-				() => this.dashboard.after_refresh()
+				() => this.dashboard.after_refresh(),
 			]);
 
 		} else {
@@ -468,6 +474,8 @@ frappe.ui.form.Form = class FrappeForm {
 
 		this.$wrapper.trigger('render_complete');
 
+		this.cscript.is_onload && this.set_first_tab_as_active();
+
 		if(!this.hidden) {
 			this.layout.show_empty_form_message();
 		}
@@ -475,6 +483,11 @@ frappe.ui.form.Form = class FrappeForm {
 		this.scroll_to_element();
 	}
 
+	set_first_tab_as_active() {
+		this.layout.tabs[0]
+			&& this.layout.tabs[0].set_active();
+	}
+
 	focus_on_first_input() {
 		let first = this.form_wrapper.find('.form-layout :input:visible:first');
 		if (!in_list(["Date", "Datetime"], first.attr("data-fieldtype"))) {
@@ -1605,6 +1618,11 @@ frappe.ui.form.Form = class FrappeForm {
 
 		let $el = field.$wrapper;
 
+		// set tab as active
+		if (field.tab && !field.tab.is_active()) {
+			field.tab.set_active();
+		}
+
 		// uncollapse section
 		if (field.section.is_collapsed()) {
 			field.section.collapse(false);

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

@@ -212,13 +212,12 @@ export default class Grid {
 
 	delete_all_rows() {
 		frappe.confirm(__("Are you sure you want to delete all rows?"), () => {
-			this.grid_rows.forEach(row => {
-				row.remove();
-			});
-			this.frm.script_manager.trigger(this.df.fieldname + "_delete", this.doctype);
-
-			this.wrapper.find('.grid-heading-row .grid-row-check:checked:first').prop('checked', 0);
+			this.frm.doc[this.df.fieldname] = [];
+			$(this.parent).find('.rows').empty();
+			this.grid_rows = [];
 			this.refresh();
+			this.frm && this.frm.script_manager.trigger(this.df.fieldname + "_delete", this.doctype);
+			this.frm && this.frm.dirty();
 			this.scroll_to_top();
 		});
 	}
@@ -244,8 +243,10 @@ export default class Grid {
 
 		this.remove_rows_button.toggleClass('hidden',
 			this.wrapper.find('.grid-body .grid-row-check:checked:first').length ? false : true);
-		this.remove_all_rows_button.toggleClass('hidden',
-			this.wrapper.find('.grid-heading-row .grid-row-check:checked:first').length ? false : true);
+
+		let select_all_checkbox_checked = this.wrapper.find('.grid-heading-row .grid-row-check:checked:first').length;
+		let show_delete_all_btn = select_all_checkbox_checked && this.data.length > this.get_selected_children().length;
+		this.remove_all_rows_button.toggleClass('hidden', !show_delete_all_btn);
 	}
 
 	get_selected() {
@@ -835,10 +836,11 @@ export default class Grid {
 									$.each(row, (ci, value) => {
 										var fieldname = fieldnames[ci];
 										var df = frappe.meta.get_docfield(me.df.options, fieldname);
-
-										d[fieldnames[ci]] = value_formatter_map[df.fieldtype]
-											? value_formatter_map[df.fieldtype](value)
-											: value;
+										if (df) {
+											d[fieldnames[ci]] = value_formatter_map[df.fieldtype]
+												? value_formatter_map[df.fieldtype](value)
+												: value;
+										}
 									});
 								}
 							}