nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-25 07:54:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:webnotes/erpnext

Browse Source
This commit is contained in:
Anand Doshi
2012-11-06 12:07:49 +05:30
parent 0c38d19ab8 3073068506
commit d68bddf416
5 changed files with 21 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
home/page/profile_settings/profile_settings.py
View File

@@ -21,7 +21,7 @@ from webnotes.utils import load_json, cint, nowdate
def check_demo(): def check_demo():
demo_user = 'demo@webnotestech.com' demo_user = 'demo@erpnext.com'
if webnotes.session['user']==demo_user: if webnotes.session['user']==demo_user:
webnotes.msgprint("Can't change in demo", raise_exception=1) webnotes.msgprint("Can't change in demo", raise_exception=1)

4
patches/november_2012/reload_stock_ledger_report.py Normal file
View File

@@ -0,0 +1,4 @@
def execute():
import webnotes
from webnotes.modules import reload_doc
reload_doc("stock", "search_criteria", "stock_ledger")

4
patches/patch_list.py
View File

@@ -647,4 +647,8 @@ patch_list = [
'patch_module': 'patches.november_2012', 'patch_module': 'patches.november_2012',
'patch_file': 'custom_field_insert_after', 'patch_file': 'custom_field_insert_after',
}, },
{
'patch_module': 'patches.november_2012',
'patch_file': 'reload_stock_ledger_report',
},
] ]

4
startup/event_handlers.py
View File

@@ -26,7 +26,7 @@ def on_login_post_session(login_manager):
update login_from and delete parallel sessions update login_from and delete parallel sessions
""" """
# Clear previous sessions i.e. logout previous log-in attempts # 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: if webnotes.session['user'] not in exception_list:
sid_list = webnotes.conn.sql(""" sid_list = webnotes.conn.sql("""
DELETE FROM `tabSessions` DELETE FROM `tabSessions`
@@ -38,7 +38,7 @@ def on_login_post_session(login_manager):
# check if account is expired # check if account is expired
check_if_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 # create feed
from webnotes.utils import nowtime from webnotes.utils import nowtime
from webnotes.profile import get_user_fullname from webnotes.profile import get_user_fullname

20
stock/search_criteria/stock_ledger/stock_ledger.txt
View File

@@ -3,11 +3,11 @@
# These values are common in all dictionaries # These values are common in all dictionaries
{ {
'creation': '2012-09-13 15:18:44', u'creation': '2012-09-14 11:30:39',
'docstatus': 0, u'docstatus': 0,
'modified': '2012-09-13 15:38:45', u'modified': '2012-11-06 10:27:11',
'modified_by': u'Administrator', u'modified_by': u'Administrator',
'owner': u'Administrator' u'owner': u'Administrator'
}, },
# These values are common for all Search Criteria # 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', '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', 'criteria_name': u'Stock Ledger',
'doc_type': u'Stock Ledger Entry', 'doc_type': u'Stock Ledger Entry',
'doctype': 'Search Criteria', u'doctype': u'Search Criteria',
'filters': u'{"Stock Ledger Entry\\u0001Warehouse Type":[""],"Stock Ledger Entry\\u0001Company":[""],"Stock Ledger Entry\\u0001Is Cancelled":[""],"Stock Ledger Entry\\u0001Is Stock Entry":[""]}', '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', 'module': u'Stock',
'name': '__common__', u'name': u'__common__',
'page_len': 50, 'page_len': 50,
'sort_by': u'`tabStock Ledger Entry`.`posting_date`, `tabStock Ledger Entry`.`posting_time`, `tabStock Ledger Entry`.`name`', 'sort_by': u'`tabStock Ledger Entry`.`posting_date`, `tabStock Ledger Entry`.`posting_time`, `tabStock Ledger Entry`.`name`',
'sort_order': u'ASC', 'sort_order': u'ASC',
@@ -30,7 +30,7 @@
# Search Criteria, stock_ledger # Search Criteria, stock_ledger
{ {
'doctype': 'Search Criteria', u'doctype': u'Search Criteria',
'name': u'stock_ledger' u'name': u'stock_ledger'
} }
] ]