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

Conflicts:
	erpnext/stock/doctype/item/item.txt
This commit is contained in:
Anand Doshi
2012-08-07 15:07:56 +05:30
24 changed files with 330 additions and 55 deletions

View File

@@ -126,6 +126,7 @@ erpnext.desktop.show_pending_notifications = function() {
add_circle('todo', 'things_todo', 'Things To Do');
add_circle('calendar', 'todays_events', 'Todays Events');
add_circle('project', 'open_tasks', 'Open Tasks');
add_circle('kb', 'unanswered_questions', 'Unanswered Questions');
erpnext.update_messages();