Merge branch 'master' of github.com:webnotes/erpnext
This commit is contained in:
commit
d68bddf416
@ -21,7 +21,7 @@ from webnotes.utils import load_json, cint, nowdate
|
||||
|
||||
|
||||
def check_demo():
|
||||
demo_user = 'demo@webnotestech.com'
|
||||
demo_user = 'demo@erpnext.com'
|
||||
if webnotes.session['user']==demo_user:
|
||||
webnotes.msgprint("Can't change in demo", raise_exception=1)
|
||||
|
||||
|
4
patches/november_2012/reload_stock_ledger_report.py
Normal file
4
patches/november_2012/reload_stock_ledger_report.py
Normal file
@ -0,0 +1,4 @@
|
||||
def execute():
|
||||
import webnotes
|
||||
from webnotes.modules import reload_doc
|
||||
reload_doc("stock", "search_criteria", "stock_ledger")
|
@ -647,4 +647,8 @@ patch_list = [
|
||||
'patch_module': 'patches.november_2012',
|
||||
'patch_file': 'custom_field_insert_after',
|
||||
},
|
||||
{
|
||||
'patch_module': 'patches.november_2012',
|
||||
'patch_file': 'reload_stock_ledger_report',
|
||||
},
|
||||
]
|
||||
|
@ -26,7 +26,7 @@ def on_login_post_session(login_manager):
|
||||
update login_from and delete parallel sessions
|
||||
"""
|
||||
# Clear previous sessions i.e. logout previous log-in attempts
|
||||
exception_list = ['demo@webnotestech.com', 'Administrator', 'Guest']
|
||||
exception_list = ['demo@erpnext.com', 'Administrator', 'Guest']
|
||||
if webnotes.session['user'] not in exception_list:
|
||||
sid_list = webnotes.conn.sql("""
|
||||
DELETE FROM `tabSessions`
|
||||
@ -38,7 +38,7 @@ def on_login_post_session(login_manager):
|
||||
# check if account is expired
|
||||
check_if_expired()
|
||||
|
||||
if webnotes.session['user'] not in ('Guest', 'demo@webnotestech.com'):
|
||||
if webnotes.session['user'] not in ('Guest', 'demo@erpnext.com'):
|
||||
# create feed
|
||||
from webnotes.utils import nowtime
|
||||
from webnotes.profile import get_user_fullname
|
||||
|
@ -3,11 +3,11 @@
|
||||
|
||||
# These values are common in all dictionaries
|
||||
{
|
||||
'creation': '2012-09-13 15:18:44',
|
||||
'docstatus': 0,
|
||||
'modified': '2012-09-13 15:38:45',
|
||||
'modified_by': u'Administrator',
|
||||
'owner': u'Administrator'
|
||||
u'creation': '2012-09-14 11:30:39',
|
||||
u'docstatus': 0,
|
||||
u'modified': '2012-11-06 10:27:11',
|
||||
u'modified_by': u'Administrator',
|
||||
u'owner': u'Administrator'
|
||||
},
|
||||
|
||||
# These values are common for all Search Criteria
|
||||
@ -18,10 +18,10 @@
|
||||
'columns': u'Stock Ledger Entry\x01Item Code,Stock Ledger Entry\x01Warehouse,Stock Ledger Entry\x01Posting Date,Stock Ledger Entry\x01Posting Time,Stock Ledger Entry\x01Actual Quantity,Stock Ledger Entry\x01Bin Actual Qty After Transaction,Stock Ledger Entry\x01Voucher Type,Stock Ledger Entry\x01Voucher No',
|
||||
'criteria_name': u'Stock Ledger',
|
||||
'doc_type': u'Stock Ledger Entry',
|
||||
'doctype': 'Search Criteria',
|
||||
'filters': u'{"Stock Ledger Entry\\u0001Warehouse Type":[""],"Stock Ledger Entry\\u0001Company":[""],"Stock Ledger Entry\\u0001Is Cancelled":[""],"Stock Ledger Entry\\u0001Is Stock Entry":[""]}',
|
||||
u'doctype': u'Search Criteria',
|
||||
'filters': u'{"Stock Ledger Entry\\u0001Warehouse Type":[],"Stock Ledger Entry\\u0001Company":[],"Stock Ledger Entry\\u0001Is Cancelled":["No"],"Stock Ledger Entry\\u0001Is Stock Entry":[]}',
|
||||
'module': u'Stock',
|
||||
'name': '__common__',
|
||||
u'name': u'__common__',
|
||||
'page_len': 50,
|
||||
'sort_by': u'`tabStock Ledger Entry`.`posting_date`, `tabStock Ledger Entry`.`posting_time`, `tabStock Ledger Entry`.`name`',
|
||||
'sort_order': u'ASC',
|
||||
@ -30,7 +30,7 @@
|
||||
|
||||
# Search Criteria, stock_ledger
|
||||
{
|
||||
'doctype': 'Search Criteria',
|
||||
'name': u'stock_ledger'
|
||||
u'doctype': u'Search Criteria',
|
||||
u'name': u'stock_ledger'
|
||||
}
|
||||
]
|
Loading…
x
Reference in New Issue
Block a user