| commit | a40a381d0801202928e3808259fb601c82000936 | [log] [tgz] |
|---|---|---|
| author | Anand Doshi <anand@erpnext.com> | Wed Jan 02 16:47:00 2013 +0530 |
| committer | Anand Doshi <anand@erpnext.com> | Wed Jan 02 16:47:00 2013 +0530 |
| tree | b35d0323414fe9a2b43d666e421b5b06e0e01025 | |
| parent | e142d9cbbec237161553d66fe1ec540c918681a4 [diff] | |
| parent | 7590650a735c1785953276bce410cb377b81a509 [diff] |
Merge branch 'edge' of github.com:webnotes/erpnext into edge
diff --git a/home/page/activity/activity.py b/home/page/activity/activity.py index cbd28ec..76f2829 100644 --- a/home/page/activity/activity.py +++ b/home/page/activity/activity.py
@@ -10,6 +10,7 @@ from tabFeed t1, tabDocPerm t2 where t1.doc_type = t2.parent and t2.role in ('%s') + and t2.permlevel = 0 and ifnull(t2.`read`,0) = 1 order by t1.modified desc limit %s, %s""" % ("','".join(webnotes.get_roles()),