nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-02 11:49:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop'

Browse Source
This commit is contained in:
Rushabh Mehta
2015-11-05 10:51:31 +05:30
parent b42f3e34ef afd3209017
commit c825575940
4 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/__version__.py
View File

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

2
erpnext/hooks.py
View File

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

8
erpnext/stock/doctype/item/item.py
View File

@@ -85,6 +85,8 @@ class Item(WebsiteGenerator):
def make_thumbnail(self): def make_thumbnail(self):
"""Make a thumbnail of `website_image`""" """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"): if not self.is_new() and self.website_image != frappe.db.get_value(self.doctype, self.name, "website_image"):
self.thumbnail = None self.thumbnail = None
@@ -102,8 +104,12 @@ class Item(WebsiteGenerator):
# cleanup # cleanup
frappe.local.message_log.pop() 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 # for CSV import
if not file_doc: if self.website_image and not file_doc:
try: try:
file_doc = frappe.get_doc({ file_doc = frappe.get_doc({
"doctype": "File", "doctype": "File",

2
setup.py
View File

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