mirror of
https://github.com/frappe/erpnext.git
synced 2026-05-05 22:48:27 +00:00
Merge branch 'latest' of github.com:webnotes/erpnext into latest
This commit is contained in:
@@ -2,6 +2,7 @@ import webnotes
|
|||||||
|
|
||||||
def execute():
|
def execute():
|
||||||
from webnotes.model import delete_doc
|
from webnotes.model import delete_doc
|
||||||
|
from webnotes.modules import reload_doc
|
||||||
delete_doc("DocType", "SSO Control")
|
delete_doc("DocType", "SSO Control")
|
||||||
delete_doc("DocType", "WN ERP Client Control")
|
delete_doc("DocType", "WN ERP Client Control")
|
||||||
delete_doc("DocType", "Production Tips Common")
|
delete_doc("DocType", "Production Tips Common")
|
||||||
@@ -18,7 +19,8 @@ def execute():
|
|||||||
|
|
||||||
webnotes.conn.sql("""delete from tabSingles
|
webnotes.conn.sql("""delete from tabSingles
|
||||||
where field like 'startup_%' and doctype='Control Panel'""")
|
where field like 'startup_%' and doctype='Control Panel'""")
|
||||||
|
webnotes.conn.sql("""delete from __SessionCache""")
|
||||||
|
|
||||||
webnotes.conn.commit()
|
webnotes.conn.commit()
|
||||||
|
|
||||||
# DDLs
|
# DDLs
|
||||||
@@ -30,4 +32,4 @@ def execute():
|
|||||||
except: pass
|
except: pass
|
||||||
|
|
||||||
webnotes.conn.sql("""alter table __PatchLog engine=InnoDB""")
|
webnotes.conn.sql("""alter table __PatchLog engine=InnoDB""")
|
||||||
|
|
||||||
|
|||||||
10
index.cgi
10
index.cgi
@@ -19,7 +19,13 @@ def init():
|
|||||||
webnotes.form_dict[key] = webnotes.form.getvalue(key)
|
webnotes.form_dict[key] = webnotes.form.getvalue(key)
|
||||||
|
|
||||||
# init request
|
# init request
|
||||||
webnotes.http_request = webnotes.auth.HTTPRequest()
|
try:
|
||||||
|
webnotes.http_request = webnotes.auth.HTTPRequest()
|
||||||
|
except Exception, e:
|
||||||
|
if webnotes.response['message']=='Authentication Failed':
|
||||||
|
pass
|
||||||
|
else:
|
||||||
|
raise e
|
||||||
|
|
||||||
def respond():
|
def respond():
|
||||||
import webnotes
|
import webnotes
|
||||||
@@ -34,4 +40,4 @@ def respond():
|
|||||||
|
|
||||||
if __name__=="__main__":
|
if __name__=="__main__":
|
||||||
init()
|
init()
|
||||||
respond()
|
respond()
|
||||||
|
|||||||
Reference in New Issue
Block a user