nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-02 03:39:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Nabin Hait
2012-12-12 12:58:22 +05:30
parent c52edd1e59 74aebf0965
commit be356b8692
15 changed files with 179 additions and 182 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
home/page/activity/activity.js
View File

@@ -32,7 +32,7 @@ erpnext.ActivityFeed = Class.extend({
},
scrub_data: function(data) {
data.by = wn.user_info(data.owner).fullname;
data.imgsrc = wn.user_info(data.owner).image;
data.imgsrc = wn.utils.get_file_link(wn.user_info(data.owner).image);
// feedtype
if(!data.feed_type) {

3
home/page/latest_updates/latest_updates.js
View File

@@ -1,4 +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).",
]],
["6th December 2012", [
"Rename: Cost Center, Item Group, Customer Group, Supplier Type, Territory, Sales Person can now be renamed.",
"Newsletter: Send newsletter to a list of email addresses.",