Merge branch 'develop' into bytes-fix

Author: surajshetty3416

frappe/core/doctype/communication/communication.py

@@ -351,16 +351,26 @@ def get_contacts(email_strings):
 		email = get_email_without_link(email)
 		contact_name = get_contact_name(email)
 
-		if not contact_name:
-			contact = frappe.get_doc({
-				"doctype": "Contact",
-				"first_name": frappe.unscrub(email.split("@")[0]),
-			})
-			contact.add_email(email_id=email, is_primary=True)
-			contact.insert(ignore_permissions=True)
-			contact_name = contact.name
-
-		contacts.append(contact_name)
+		if not contact_name and email:
+			email_parts = email.split("@")
+			first_name = frappe.unscrub(email_parts[0])
+
+			try:
+				contact_name = '{0}-{1}'.format(first_name, email_parts[1]) if first_name == 'Contact' else first_name
+				contact = frappe.get_doc({
+					"doctype": "Contact",
+					"first_name": contact_name,
+					"name": contact_name
+				})
+				contact.add_email(email_id=email, is_primary=True)
+				contact.insert(ignore_permissions=True)
+				contact_name = contact.name
+			except Exception:
+				traceback = frappe.get_traceback()
+				frappe.log_error(traceback)
+
+		if contact_name:
+			contacts.append(contact_name)
 
 	return contacts
 

frappe/email/doctype/email_domain/email_domain.py

@@ -6,7 +6,7 @@
 import frappe
 from frappe import _
 from frappe.model.document import Document
-from frappe.utils import validate_email_address ,cint
+from frappe.utils import validate_email_address ,cint, cstr
 import imaplib,poplib,smtplib
 from frappe.email.utils import get_port
 
@@ -51,7 +51,7 @@ def validate(self):
 			try:
 				if self.use_tls and not self.smtp_port:
 					self.smtp_port = 587
-				sess = smtplib.SMTP((self.smtp_server or "").encode('utf-8'), cint(self.smtp_port) or None)
+				sess = smtplib.SMTP(cstr(self.smtp_server or ""), cint(self.smtp_port) or None)
 				sess.quit()
 			except Exception:
 				frappe.throw(_("Outgoing email account not correct"))

frappe/email/smtp.py

@@ -8,7 +8,7 @@
 import email.utils
 import _socket, sys
 from frappe import _
-from frappe.utils import cint, parse_addr
+from frappe.utils import cint, cstr, parse_addr
 
 def send(email, append_to=None, retry=1):
 	"""Deprecated: Send the message or add it to Outbox Email"""
@@ -202,7 +202,7 @@ def sess(self):
 			if self.use_tls and not self.port:
 				self.port = 587
 
-			self._sess = smtplib.SMTP((self.server or "").encode('utf-8'),
+			self._sess = smtplib.SMTP(cstr(self.server or ""),
 				cint(self.port) or None)
 
 			if not self._sess:

frappe/model/workflow.py

@@ -105,6 +105,18 @@ def apply_workflow(doc, action):
 
 	return doc
 
+@frappe.whitelist()
+def can_cancel_document(doc):
+	doc = frappe.get_doc(frappe.parse_json(doc))
+	workflow = get_workflow(doc.doctype)
+	for state_doc in workflow.states:
+		if state_doc.doc_status == '2':
+			for transition in workflow.transitions:
+				if transition.next_state == state_doc.state:
+					return False
+			return True
+	return True
+
 def validate_workflow(doc):
 	'''Validate Workflow State and Transition for the current user.
 

frappe/public/js/frappe/form/controls/time.js

@@ -45,7 +45,8 @@ frappe.ui.form.ControlTime = frappe.ui.form.ControlDate.extend({
 			&& ((this.last_value && this.last_value !== this.value)
 				|| (!this.datepicker.selectedDates.length))) {
 
-			var date_obj = frappe.datetime.moment_to_date_obj(moment(value, frappe.sys_defaults['time_format']));
+			let time_format = frappe.sys_defaults.time_format || 'HH:mm:ss';
+			var date_obj = frappe.datetime.moment_to_date_obj(moment(value, time_format));
 			this.datepicker.selectDate(date_obj);
 		}
 	},

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

@@ -105,7 +105,17 @@ frappe.ui.form.States = Class.extend({
 					});
 				}
 			});
-			this.setup_btn(added);
+			if (!added) {
+				//call function and clear cancel button if Cancel doc state is defined in the workfloe
+				frappe.xcall('frappe.model.workflow.can_cancel_document', {doc: this.frm.doc}).then((can_cancel) => {
+					if (!can_cancel) {
+						this.frm.page.clear_secondary_action();
+					}
+				});
+			} else {
+				this.setup_btn(added);
+			}
+			
 		});
 
 	},

frappe/utils/pdf.py

@@ -2,14 +2,24 @@
 # MIT License. See license.txt
 from __future__ import unicode_literals
 
-import pdfkit, os, frappe
+import io
+import os
+import re
 from distutils.version import LooseVersion
-from frappe.utils import scrub_urls, get_wkhtmltopdf_version
-from frappe import _
-import six, re, io
+
+import pdfkit
+import six
 from bs4 import BeautifulSoup
 from PyPDF2 import PdfFileReader, PdfFileWriter
 
+import frappe
+from frappe import _
+from frappe.utils import get_wkhtmltopdf_version, scrub_urls
+
+PDF_CONTENT_ERRORS = ["ContentNotFoundError", "ContentOperationNotPermittedError",
+	"UnknownContentError", "RemoteHostClosedError"]
+
+
 def get_pdf(html, options=None, output=None):
 	html = scrub_urls(html)
 	html, options = prepare_options(html, options)
@@ -30,20 +40,14 @@ def get_pdf(html, options=None, output=None):
 		# https://pythonhosted.org/PyPDF2/PdfFileReader.html
 		# create in-memory binary streams from filedata and create a PdfFileReader object
 		reader = PdfFileReader(io.BytesIO(filedata))
-
-	except IOError as e:
-		if ("ContentNotFoundError" in e.message
-			or "ContentOperationNotPermittedError" in e.message
-			or "UnknownContentError" in e.message
-			or "RemoteHostClosedError" in e.message):
+	except OSError as e:
+		if any([error in str(e) for error in PDF_CONTENT_ERRORS]):
+			if not filedata:
+				frappe.throw(_("PDF generation failed because of broken image links"))
 
 			# allow pdfs with missing images if file got created
-			if filedata:
-				if output: # output is a PdfFileWriter object
-					output.appendPagesFromReader(reader)
-
-			else:
-				frappe.throw(_("PDF generation failed because of broken image links"))
+			if output:  # output is a PdfFileWriter object
+				output.appendPagesFromReader(reader)
 		else:
 			raise
 
@@ -66,6 +70,7 @@ def get_pdf(html, options=None, output=None):
 
 	return filedata
 
+
 def get_file_data_from_writer(writer_obj):
 
 	# https://docs.python.org/3/library/io.html
@@ -112,6 +117,7 @@ def prepare_options(html, options):
 
 	return html, options
 
+
 def read_options_from_html(html):
 	options = {}
 	soup = BeautifulSoup(html, "html5lib")
@@ -132,6 +138,7 @@ def read_options_from_html(html):
 
 	return soup.prettify(), options
 
+
 def prepare_header_footer(soup):
 	options = {}
 
@@ -174,6 +181,7 @@ def prepare_header_footer(soup):
 
 	return options
 
+
 def cleanup(fname, options):
 	if os.path.exists(fname):
 		os.remove(fname)
@@ -182,6 +190,7 @@ def cleanup(fname, options):
 		if options.get(key) and os.path.exists(options[key]):
 			os.remove(options[key])
 
+
 def toggle_visible_pdf(soup):
 	for tag in soup.find_all(attrs={"class": "visible-pdf"}):
 		# remove visible-pdf class to unhide

requirements.txt

@@ -34,8 +34,8 @@ passlib==1.7.1
 pdfkit==0.6.1
 Pillow==6.2.1
 premailer==3.6.1
-psycopg2-binary==2.7.5
-psycopg2==2.7.5
+psycopg2-binary==2.8.4
+psycopg2==2.8.4
 pyasn1==0.4.7
 Pygments==2.2.0
 PyJWT==1.7.1