nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-24 15:39:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2007 from nabinhait/hotfix

Browse Source 
Activity: fix for timeline-wise display
This commit is contained in:
Pratik Vyas
2014-07-31 12:45:43 +05:30
parent c2371af779 8efd74b9b1
commit 1483e9d8d2
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -73,7 +73,7 @@ erpnext.ActivityFeed = Class.extend({
var last = erpnext.last_feed_date; var last = erpnext.last_feed_date;
if((last && dateutil.obj_to_str(last) != dateutil.obj_to_str(date)) || (!last)) { if((last && dateutil.obj_to_str(last) != dateutil.obj_to_str(date)) || (!last)) {
var diff = dateutil.get_day_diff(new Date(), date); var diff = dateutil.get_day_diff(dateutil.get_today(), dateutil.obj_to_str(date));
if(diff < 1) { if(diff < 1) {
pdate = 'Today'; pdate = 'Today';
} else if(diff < 2) { } else if(diff < 2) {