Merge branch 'master' of github.com:webnotes/erpnext
diff --git a/home/doctype/feed/feed.txt b/home/doctype/feed/feed.txt
index 2c33fcf..57471bd 100644
--- a/home/doctype/feed/feed.txt
+++ b/home/doctype/feed/feed.txt
@@ -3,11 +3,11 @@
# These values are common in all dictionaries
{
- 'creation': '2012-03-27 14:35:52',
- 'docstatus': 0,
- 'modified': '2012-03-27 14:35:52',
- 'modified_by': u'Administrator',
- 'owner': u'Administrator'
+ u'creation': '2012-07-03 13:29:42',
+ u'docstatus': 0,
+ u'modified': '2012-10-15 15:23:02',
+ u'modified_by': u'Administrator',
+ u'owner': u'Administrator'
},
# These values are common for all DocType
@@ -15,33 +15,45 @@
'autoname': u'_FEED.#####',
'colour': u'White:FFF',
'default_print_format': u'Standard',
- 'doctype': 'DocType',
+ u'doctype': u'DocType',
'module': u'Home',
- 'name': '__common__',
+ u'name': u'__common__',
'section_style': u'Simple',
'show_in_menu': 0,
- 'version': 3
+ 'version': 1
},
# These values are common for all DocField
{
- 'doctype': u'DocField',
- 'name': '__common__',
+ u'doctype': u'DocField',
+ u'name': u'__common__',
'parent': u'Feed',
'parentfield': u'fields',
'parenttype': u'DocType',
'permlevel': 0
},
+ # These values are common for all DocPerm
+ {
+ u'doctype': u'DocPerm',
+ u'name': u'__common__',
+ 'parent': u'Feed',
+ 'parentfield': u'permissions',
+ 'parenttype': u'DocType',
+ 'permlevel': 0,
+ 'read': 1,
+ 'role': u'System Manager'
+ },
+
# DocType, Feed
{
- 'doctype': 'DocType',
- 'name': u'Feed'
+ u'doctype': u'DocType',
+ u'name': u'Feed'
},
# DocField
{
- 'doctype': u'DocField',
+ u'doctype': u'DocField',
'fieldname': u'feed_type',
'fieldtype': u'Select',
'label': u'Feed Type'
@@ -49,7 +61,7 @@
# DocField
{
- 'doctype': u'DocField',
+ u'doctype': u'DocField',
'fieldname': u'doc_type',
'fieldtype': u'Data',
'label': u'Doc Type'
@@ -57,7 +69,7 @@
# DocField
{
- 'doctype': u'DocField',
+ u'doctype': u'DocField',
'fieldname': u'doc_name',
'fieldtype': u'Data',
'label': u'Doc Name'
@@ -65,7 +77,7 @@
# DocField
{
- 'doctype': u'DocField',
+ u'doctype': u'DocField',
'fieldname': u'subject',
'fieldtype': u'Data',
'label': u'Subject'
@@ -73,7 +85,7 @@
# DocField
{
- 'doctype': u'DocField',
+ u'doctype': u'DocField',
'fieldname': u'color',
'fieldtype': u'Data',
'label': u'Color'
@@ -81,9 +93,14 @@
# DocField
{
- 'doctype': u'DocField',
+ u'doctype': u'DocField',
'fieldname': u'full_name',
'fieldtype': u'Data',
'label': u'Full Name'
+ },
+
+ # DocPerm
+ {
+ u'doctype': u'DocPerm'
}
]
\ No newline at end of file
diff --git a/home/page/activity/activity.js b/home/page/activity/activity.js
index 47900ec..807a5d0 100644
--- a/home/page/activity/activity.js
+++ b/home/page/activity/activity.js
@@ -1,6 +1,7 @@
wn.pages['activity'].onload = function(wrapper) {
wrapper.appframe = new wn.ui.AppFrame($(wrapper).find('.layout-appframe'));
wrapper.appframe.title('Activity');
+
var list = new wn.ui.Listing({
appframe: wrapper.appframe,
method: 'home.page.activity.activity.get_feed',
@@ -10,6 +11,13 @@
}
});
list.run();
+
+ // Build Report Button
+ if(wn.boot.profile.can_get_report.indexOf("Feed")!=-1) {
+ wrapper.appframe.add_button('Build Report', function() {
+ wn.set_route('Report2', "Feed");
+ }, 'icon-th')
+ }
}
erpnext.last_feed_date = false;
diff --git a/startup/event_handlers.py b/startup/event_handlers.py
index 472d5d1..573bcc6 100644
--- a/startup/event_handlers.py
+++ b/startup/event_handlers.py
@@ -43,7 +43,7 @@
from webnotes.utils import nowtime
from webnotes.profile import get_user_fullname
home.make_feed('Login', 'Profile', login_manager.user, login_manager.user,
- '%s logged in at %s' % (get_user_fullname, nowtime()),
+ '%s logged in at %s' % (get_user_fullname(login_manager.user), nowtime()),
login_manager.user=='Administrator' and '#8CA2B3' or '#1B750D')