nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-13 02:01:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
	version.num
This commit is contained in:
Anand Doshi
2012-03-01 14:54:01 +05:30
parent 08c8edb87f b95ad21208
commit 48ca42beb9
4 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
js/all-app.js
View File

@@ -2253,7 +2253,7 @@ $(document).bind('startup',function(){erpnext.startup.start();});
erpnext.startup.set_periodic_updates=function(){wn.updates={};if(wn.updates.id){clearInterval(wn.updates.id);}
wn.updates.id=setInterval(update_messages,60000);}
erpnext.set_user_background=function(src){set_style(repl('body { background: url("files/%(src)s") repeat !important;}',{src:src}))}
$(document).bind('startup',function(){erpnext.startup.start();});
$(document).bind('startup',function(){erpnext.startup.start();});
/*
* erpnext/startup/js/modules.js
*/