Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'latest' of github.com:webnotes/erpnext into latest

Browse Source
This commit is contained in:
Rushabh Mehta 2012-02-06 15:33:37 +05:30
commit a7e68f7cd7
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/patches/jan_mar_2012/latest/cleanups.py
View File

@ -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,6 +19,7 @@ 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()

8
index.cgi
View File

@ -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