Merge branch 'develop'

erpnext/__version__.py

@@ -1,2 +1,2 @@
 from __future__ import unicode_literals
-__version__ = '6.7.0'
+__version__ = '6.7.1'

erpnext/hooks.py

@@ -29,7 +29,7 @@ blogs.
 """
 app_icon = "icon-th"
 app_color = "#e74c3c"
-app_version = "6.7.0"
+app_version = "6.7.1"
 source_link = "https://github.com/frappe/erpnext"
 
 error_report_email = "support@erpnext.com"

erpnext/stock/doctype/item/item.py

@@ -85,6 +85,8 @@ class Item(WebsiteGenerator):
 
 	def make_thumbnail(self):
 		"""Make a thumbnail of `website_image`"""
+		import requests.exceptions
+
 		if not self.is_new() and self.website_image != frappe.db.get_value(self.doctype, self.name, "website_image"):
 			self.thumbnail = None
 
@@ -102,8 +104,12 @@ class Item(WebsiteGenerator):
 				# cleanup
 				frappe.local.message_log.pop()
 
+			except requests.exceptions.HTTPError:
+				frappe.msgprint(_("Warning: Invalid Attachment {0}").format(self.website_image))
+				self.website_image = None
+
 			# for CSV import
-			if not file_doc:
+			if self.website_image and not file_doc:
 				try:
 					file_doc = frappe.get_doc({
 						"doctype": "File",

setup.py

@@ -1,6 +1,6 @@
 from setuptools import setup, find_packages
 
-version = "6.7.0"
+version = "6.7.1"
 
 with open("requirements.txt", "r") as f:
 	install_requires = f.readlines()