Merge branch 'develop'
diff --git a/erpnext/__version__.py b/erpnext/__version__.py
index faa628e..d298d3c 100644
--- a/erpnext/__version__.py
+++ b/erpnext/__version__.py
@@ -1,2 +1,2 @@
from __future__ import unicode_literals
-__version__ = '6.7.0'
+__version__ = '6.7.1'
diff --git a/erpnext/hooks.py b/erpnext/hooks.py
index 3bd2ad9..2552d19 100644
--- a/erpnext/hooks.py
+++ b/erpnext/hooks.py
@@ -29,7 +29,7 @@
"""
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"
diff --git a/erpnext/stock/doctype/item/item.py b/erpnext/stock/doctype/item/item.py
index 1d81845..168d999 100644
--- a/erpnext/stock/doctype/item/item.py
+++ b/erpnext/stock/doctype/item/item.py
@@ -85,6 +85,8 @@
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 @@
# 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",
diff --git a/setup.py b/setup.py
index a262ef6..f795a66 100644
--- a/setup.py
+++ b/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()