mirror of
https://github.com/frappe/erpnext.git
synced 2026-05-06 15:00:27 +00:00
Merge branch 'master' of github.com:webnotes/erpnext into edge
Conflicts: hr/doctype/leave_application/locale/_messages_py.json hr/doctype/leave_block_list/locale/_messages_doc.json public/js/locale/_messages_js.json setup/doctype/email_digest/locale/_messages_doc.json setup/doctype/global_defaults/global_defaults.txt
This commit is contained in:
@@ -106,23 +106,3 @@ def check_if_expired():
|
||||
|
||||
webnotes.response['message'] = 'Account Expired'
|
||||
raise webnotes.AuthenticationError
|
||||
|
||||
#### website
|
||||
|
||||
def get_web_script():
|
||||
"""returns web startup script"""
|
||||
return webnotes.conn.get_value('Website Script', None, 'javascript') or ''
|
||||
|
||||
def get_web_style():
|
||||
"""returns web css"""
|
||||
return webnotes.conn.get_value('Style Settings', None, 'custom_css') or ''
|
||||
|
||||
def get_web_header(page_name):
|
||||
"""get website header"""
|
||||
from website.utils import get_header
|
||||
return get_header(page_name)
|
||||
|
||||
def get_web_footer(page_name):
|
||||
"""get website footer"""
|
||||
from website.utils import get_footer
|
||||
return get_footer(page_name)
|
||||
|
||||
Reference in New Issue
Block a user