Merge branch 'develop' into wspace-new-design

cypress/integration/control_barcode.js

@@ -21,7 +21,6 @@ context('Control Barcode', () => {
 		get_dialog_with_barcode().as('dialog');
 
 		cy.get('.frappe-control[data-fieldname=barcode]').findByRole('textbox')
-			.focus()
 			.type('123456789')
 			.blur();
 		cy.get('.frappe-control[data-fieldname=barcode] svg[data-barcode-value="123456789"]')
@@ -38,7 +37,6 @@ context('Control Barcode', () => {
 		get_dialog_with_barcode().as('dialog');
 
 		cy.get('.frappe-control[data-fieldname=barcode]').findByRole('textbox')
-			.focus()
 			.type('123456789')
 			.blur();
 		cy.get('.frappe-control[data-fieldname=barcode]').findByRole('textbox')

cypress/integration/datetime.js

@@ -103,6 +103,7 @@ context('Control Date, Time and DateTime', () => {
 				input_value: '12-02-2019 11:00' // admin timezone (Asia/Kolkata)
 			}
 		];
+
 		datetime_formats.forEach(d => {
 			it(`test datetime format ${d.date_format} ${d.time_format}`, () => {
 				cy.set_value('System Settings', 'System Settings', {

cypress/integration/timeline_email.js

@@ -14,7 +14,7 @@ context('Timeline Email', () => {
 		cy.wait(700);
 	});
 
-	it('Adding email and verifying timeline content for email attachment, deleting attachment and ToDo', () => {
+	it('Adding email and verifying timeline content for email attachment', () => {
 		cy.visit('/app/todo');
 		cy.get('.list-row > .level-left > .list-subject').eq(0).click();
 
@@ -43,7 +43,9 @@ 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();
+	});
 
+	it('Deleting attachment and ToDo', () => {
 		cy.visit('/app/todo');
 		cy.get('.list-row > .level-left > .list-subject > .level-item.ellipsis > .ellipsis').eq(0).click();
 

frappe/utils/__init__.py

@@ -901,10 +901,11 @@ def dictify(arg):
 def add_user_info(user, user_info):
 	if user not in user_info:
 		info = frappe.db.get_value("User",
-			user, ["full_name", "user_image", "name", 'email'], as_dict=True) or frappe._dict()
+			user, ["full_name", "user_image", "name", 'email', 'time_zone'], as_dict=True) or frappe._dict()
 		user_info[user] = frappe._dict(
 			fullname = info.full_name or user,
 			image = info.user_image,
 			name = user,
-			email = info.email
+			email = info.email,
+			time_zone = info.time_zone
 		)