Merge branch 'latest' of github.com:webnotes/erpnext into latest
This commit is contained in:
commit
a7e68f7cd7
@ -2,6 +2,7 @@ import webnotes
|
||||
|
||||
def execute():
|
||||
from webnotes.model import delete_doc
|
||||
from webnotes.modules import reload_doc
|
||||
delete_doc("DocType", "SSO Control")
|
||||
delete_doc("DocType", "WN ERP Client Control")
|
||||
delete_doc("DocType", "Production Tips Common")
|
||||
@ -18,6 +19,7 @@ def execute():
|
||||
|
||||
webnotes.conn.sql("""delete from tabSingles
|
||||
where field like 'startup_%' and doctype='Control Panel'""")
|
||||
webnotes.conn.sql("""delete from __SessionCache""")
|
||||
|
||||
webnotes.conn.commit()
|
||||
|
||||
|
@ -19,7 +19,13 @@ def init():
|
||||
webnotes.form_dict[key] = webnotes.form.getvalue(key)
|
||||
|
||||
# init request
|
||||
try:
|
||||
webnotes.http_request = webnotes.auth.HTTPRequest()
|
||||
except Exception, e:
|
||||
if webnotes.response['message']=='Authentication Failed':
|
||||
pass
|
||||
else:
|
||||
raise e
|
||||
|
||||
def respond():
|
||||
import webnotes
|
||||
|
Loading…
x
Reference in New Issue
Block a user