Merge branch 'master' of github.com:webnotes/erpnext
diff --git a/stock/doctype/item/item.py b/stock/doctype/item/item.py
index c22462b..4af556c 100644
--- a/stock/doctype/item/item.py
+++ b/stock/doctype/item/item.py
@@ -25,7 +25,7 @@
sql = webnotes.conn.sql
-class DocType():
+class DocType:
def __init__(self, doc, doclist=[]):
self.doc = doc
self.doclist = doclist
@@ -38,9 +38,13 @@
return ret
def on_update(self):
- # webpage updates
- from website.utils import update_page_name
- update_page_name(self.doc, self.doc.item_name)
+ if self.doc.show_in_website:
+ # webpage updates
+ from website.utils import update_page_name
+ update_page_name(self.doc, self.doc.item_name)
+ elif self.doc.page_name:
+ from website.web_cache import clear_cache
+ clear_cache(self.doc.page_name)
bin = sql("select stock_uom from `tabBin` where item_code = '%s' " % self.doc.item_code)
if bin and cstr(bin[0][0]) != cstr(self.doc.stock_uom):
@@ -80,8 +84,10 @@
sql("""delete from `tabStock Ledger Entry`
where item_code=%s and is_cancelled='Yes' """, self.doc.item_code)
- self.delete_web_cache(self.doc.page_name)
-
+ if self.doc.page_name:
+ from website.web_cache import clear_cache
+ clear_cache(self.doc.page_name)
+
# Check whether Ref Rate is not entered twice for same Price List and Currency
def check_ref_rate_detail(self):
check_list=[]
@@ -192,6 +198,9 @@
def on_rename(self,newdn,olddn):
sql("update tabItem set item_code = %s where name = %s", (newdn, olddn))
+ if self.doc.page_name:
+ from website.web_cache import clear_cache
+ clear_cache(self.doc.page_name)
def prepare_template_args(self):
self.doc.web_description_html = self.doc.description or ''
diff --git a/website/doctype/blog/blog.py b/website/doctype/blog/blog.py
index 46fa833..cfc0ca6 100644
--- a/website/doctype/blog/blog.py
+++ b/website/doctype/blog/blog.py
@@ -19,7 +19,7 @@
import webnotes
import website.utils
-class DocType():
+class DocType:
def __init__(self, d, dl):
self.doc, self.doclist = d, dl
diff --git a/website/web_cache.py b/website/web_cache.py
index a1ab2b9..9146dd9 100644
--- a/website/web_cache.py
+++ b/website/web_cache.py
@@ -164,7 +164,7 @@
'favicon': webnotes.conn.get_value('Website Settings', None, 'favicon')
}
-def clear_cache(page_name, doc_type=None, doc_name=None):
+def clear_cache(page_name):
if page_name:
delete_page_cache(page_name)
else: