Merge branch 'master' of github.com:webnotes/erpnext
diff --git a/home/page/profile_settings/profile_settings.py b/home/page/profile_settings/profile_settings.py
index 4aed1ce..8893ff6 100644
--- a/home/page/profile_settings/profile_settings.py
+++ b/home/page/profile_settings/profile_settings.py
@@ -21,7 +21,7 @@
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)
diff --git a/patches/november_2012/reload_stock_ledger_report.py b/patches/november_2012/reload_stock_ledger_report.py
new file mode 100644
index 0000000..aa58f11
--- /dev/null
+++ b/patches/november_2012/reload_stock_ledger_report.py
@@ -0,0 +1,4 @@
+def execute():
+ import webnotes
+ from webnotes.modules import reload_doc
+ reload_doc("stock", "search_criteria", "stock_ledger")
\ No newline at end of file
diff --git a/patches/patch_list.py b/patches/patch_list.py
index 8701915..bf1dc1d 100644
--- a/patches/patch_list.py
+++ b/patches/patch_list.py
@@ -647,4 +647,8 @@
'patch_module': 'patches.november_2012',
'patch_file': 'custom_field_insert_after',
},
+ {
+ 'patch_module': 'patches.november_2012',
+ 'patch_file': 'reload_stock_ledger_report',
+ },
]
diff --git a/startup/event_handlers.py b/startup/event_handlers.py
index 573bcc6..4c4e55b 100644
--- a/startup/event_handlers.py
+++ b/startup/event_handlers.py
@@ -26,7 +26,7 @@
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 @@
# 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
diff --git a/stock/search_criteria/stock_ledger/stock_ledger.txt b/stock/search_criteria/stock_ledger/stock_ledger.txt
index b80578e..46759fd 100644
--- a/stock/search_criteria/stock_ledger/stock_ledger.txt
+++ b/stock/search_criteria/stock_ledger/stock_ledger.txt
@@ -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'
}
]
\ No newline at end of file