Merge branch 'master' of github.com:webnotes/erpnext
This commit is contained in:
commit
a6405da823
@ -65,9 +65,9 @@ class DocType(TransactionBase):
|
|||||||
# validate
|
# validate
|
||||||
# ---------
|
# ---------
|
||||||
def validate(self):
|
def validate(self):
|
||||||
import utilities
|
# import utilities
|
||||||
utilities.validate_status(self.doc.status, ["In Store", "Delivered",
|
# utilities.validate_status(self.doc.status, ["In Store", "Delivered",
|
||||||
"Not in Use", "Purchase Returned"])
|
# "Not in Use", "Purchase Returned"])
|
||||||
|
|
||||||
self.validate_warranty_status()
|
self.validate_warranty_status()
|
||||||
self.validate_amc_status()
|
self.validate_amc_status()
|
||||||
|
|||||||
@ -102,4 +102,5 @@ def get_parent_item_groups(item_group_name):
|
|||||||
|
|
||||||
def invalidate_cache_for(item_group):
|
def invalidate_cache_for(item_group):
|
||||||
for i in get_parent_item_groups(item_group):
|
for i in get_parent_item_groups(item_group):
|
||||||
delete_page_cache(i.page_name)
|
if i.page_name:
|
||||||
|
delete_page_cache(i.page_name)
|
||||||
@ -263,7 +263,8 @@ def clear_cache(page_name=None):
|
|||||||
webnotes.cache().delete_keys("page:")
|
webnotes.cache().delete_keys("page:")
|
||||||
|
|
||||||
def delete_page_cache(page_name):
|
def delete_page_cache(page_name):
|
||||||
webnotes.cache().delete_value("page:" + page_name)
|
if page_name:
|
||||||
|
webnotes.cache().delete_value("page:" + page_name)
|
||||||
|
|
||||||
def url_for_website(url):
|
def url_for_website(url):
|
||||||
if url and not url.lower().startswith("http"):
|
if url and not url.lower().startswith("http"):
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user