From 8bbc5a2b115340df6a65a042b298f42da3f4d012 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Mon, 5 Nov 2012 18:58:15 +0530 Subject: [PATCH 1/3] bypass demo@erpnext.com from session deletion --- home/page/profile_settings/profile_settings.py | 2 +- startup/event_handlers.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/home/page/profile_settings/profile_settings.py b/home/page/profile_settings/profile_settings.py index 4aed1cea55..8893ff6a62 100644 --- a/home/page/profile_settings/profile_settings.py +++ b/home/page/profile_settings/profile_settings.py @@ -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) diff --git a/startup/event_handlers.py b/startup/event_handlers.py index 573bcc6b62..4c4e55bb4c 100644 --- a/startup/event_handlers.py +++ b/startup/event_handlers.py @@ -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 From 25b8ce45a6f7b7c943b3ba5c77b5a8a222b873de Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Tue, 6 Nov 2012 10:39:51 +0530 Subject: [PATCH 2/3] stock ledger report fixed --- .../stock_ledger/stock_ledger.txt | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/stock/search_criteria/stock_ledger/stock_ledger.txt b/stock/search_criteria/stock_ledger/stock_ledger.txt index b80578ef0c..46759fdd0a 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 From 3073068506750260f720563339a4f5f9397f4312 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Tue, 6 Nov 2012 10:42:47 +0530 Subject: [PATCH 3/3] reload stock ledger report --- patches/november_2012/reload_stock_ledger_report.py | 4 ++++ patches/patch_list.py | 4 ++++ 2 files changed, 8 insertions(+) create mode 100644 patches/november_2012/reload_stock_ledger_report.py 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 0000000000..aa58f118d9 --- /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 87019150c6..bf1dc1d3e1 100644 --- a/patches/patch_list.py +++ b/patches/patch_list.py @@ -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', + }, ]