merged with master

This commit is contained in:
Nabin Hait
2012-12-14 10:43:56 +05:30
67 changed files with 447 additions and 401 deletions

View File

@@ -36,7 +36,7 @@ erpnext.ActivityFeed = Class.extend({
// feedtype
if(!data.feed_type) {
data.feed_type = get_doctype_label(data.doc_type);
data.feed_type = wn._(data.doc_type);
data.add_class = "label-info";
data.onclick = repl('onclick="window.location.href=\'#!List/%(feed_type)s\';"', data)
}

View File

@@ -1,6 +1,7 @@
erpnext.updates = [
["12th December 2012", [
"Attachments: Attachments can be set as URLs or File Uploads. This will help if people want to share documents from Google Docs, Dropbox and other such services (esp for the Product listings on websites).",
"Global Defaults: Session Expiry can now be set in Global Defaults.",
]],
["6th December 2012", [
"Rename: Cost Center, Item Group, Customer Group, Supplier Type, Territory, Sales Person can now be renamed.",