From c541b87bb92c4dae6c3222b551b68d22ff0ac886 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Thu, 5 Nov 2015 10:49:42 +0530 Subject: [PATCH 1/2] [thumbnail] remove attachment if fails --- erpnext/stock/doctype/item/item.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/erpnext/stock/doctype/item/item.py b/erpnext/stock/doctype/item/item.py index 1d8184559f..168d999dcc 100644 --- a/erpnext/stock/doctype/item/item.py +++ b/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", From afd3209017880bdb45f1c4699bf590f7904bb114 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Thu, 5 Nov 2015 11:21:31 +0600 Subject: [PATCH 2/2] bumped to version 6.7.1 --- erpnext/__version__.py | 2 +- erpnext/hooks.py | 2 +- setup.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/erpnext/__version__.py b/erpnext/__version__.py index faa628eb08..d298d3c2c3 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 3bd2ad95f7..2552d1972e 100644 --- a/erpnext/hooks.py +++ b/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" diff --git a/setup.py b/setup.py index a262ef6de5..f795a66eb1 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()