Merge pull request #4473 from nabinhait/sms_logs
[fix] Ignore permissions while creating sms logs
diff --git a/erpnext/projects/doctype/task/task.js b/erpnext/projects/doctype/task/task.js
index 755147c..871d14d 100644
--- a/erpnext/projects/doctype/task/task.js
+++ b/erpnext/projects/doctype/task/task.js
@@ -30,7 +30,7 @@
}
if(frm.perm[0].write) {
- if(frm.doc.status==="Open") {
+ if(frm.doc.status!=="Closed" && frm.doc.status!=="Cancelled") {
frm.add_custom_button("Close", function() {
frm.set_value("status", "Closed");
frm.save();
diff --git a/erpnext/stock/doctype/item/item.py b/erpnext/stock/doctype/item/item.py
index 6bdafcf..489b1bd 100644
--- a/erpnext/stock/doctype/item/item.py
+++ b/erpnext/stock/doctype/item/item.py
@@ -89,21 +89,23 @@
auto_set_website_image = True
self.website_image = self.image
- file = frappe.db.get_value("File", filters={
- "file_url": self.website_image,
- "attached_to_doctype": self.doctype,
- "attached_to_name": self.name
- }, fieldname=["name", "is_private"], as_dict=True)
+ if self.website_image:
+ file = frappe.db.get_value("File", filters={
+ "file_url": self.website_image,
+ "attached_to_doctype": self.doctype,
+ "attached_to_name": self.name
+ }, fieldname=["name", "is_private"], as_dict=True)
- if not file:
- self.website_image = None
- if not auto_set_website_image:
- frappe.msgprint(_("Website Image {0} attached to Item {1} cannot be found").format(self.website_image, self.name))
+ if not file:
+ if not auto_set_website_image:
+ frappe.msgprint(_("Website Image {0} attached to Item {1} cannot be found")
+ .format(self.website_image, self.name))
+ self.website_image = None
- elif file.is_private:
- self.website_image = None
- if not auto_set_website_image:
- frappe.msgprint(_("Website Image should be a public file or website URL"))
+ elif file.is_private:
+ self.website_image = None
+ if not auto_set_website_image:
+ frappe.msgprint(_("Website Image should be a public file or website URL"))
def make_thumbnail(self):
"""Make a thumbnail of `website_image`"""