From 220434c0ef1c13741d2f052a238842bae1753cf6 Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Mon, 30 Apr 2012 21:06:54 +0530 Subject: [PATCH] fix in startup.js --- js/all-app.js | 5 ++--- js/all-web.js | 5 ++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/js/all-app.js b/js/all-app.js index 31c1e6db30..e0717431fd 100644 --- a/js/all-app.js +++ b/js/all-app.js @@ -2233,11 +2233,11 @@ if(wn.boot.startup_code){eval(wn.boot.startup_code);}}else{wn.boot.profile.allow if(user_roles.indexOf('Accounts Manager')!=-1){wn.boot.profile.allow_modules.push('Dashboard');} erpnext.toolbar.setup();erpnext.startup.set_periodic_updates();if(in_list(user_roles,'System Manager')&&(wn.boot.setup_complete=='No')){wn.require("erpnext/startup/js/complete_setup.js");erpnext.complete_setup.show();} if(wn.boot.expires_on&&in_list(user_roles,'System Manager')){var today=dateutil.str_to_obj(dateutil.get_today());var expires_on=dateutil.str_to_obj(wn.boot.expires_on);var diff=dateutil.get_diff(expires_on,today);if(0<=diff&&diff<=15){var expiry_string=diff==0?"today":repl("in %(diff)s day(s)",{diff:diff});$('header').append(repl('
\ - Ahem! Your ERPNext subscription will expire %(expiry_string)s. \ + Your ERPNext subscription will expire %(expiry_string)s. \ Please renew your subscription to continue using ERPNext \ (and remove this annoying banner). \
',{expiry_string:expiry_string}));}else if(diff<0){$('header').append(repl('
\ - Ahem! This ERPNext subscription has expired and should be deleted. \ + This ERPNext subscription has expired. \
',{expiry_string:expiry_string}));}}} erpnext.set_about();$('#startup_div').toggle(false);} show_chart_browser=function(nm,chart_type){var call_back=function(){if(nm=='Sales Browser'){var sb_obj=new SalesBrowser();sb_obj.set_val(chart_type);} @@ -2254,7 +2254,6 @@ erpnext.set_user_background=function(src){set_style(repl('#body_div { background $(document).bind('startup',function(){erpnext.startup.start();});erpnext.send_message=function(opts){if(opts.btn){$(opts.btn).start_working();} wn.call({method:'website.send_message',args:opts,callback:function(r){if(opts.btn){$(opts.btn).done_working();} if(opts.callback)opts.callback(r)}});} -erpnext.hide_naming_series=function(){console.log(1);if(cur_frm.fields_dict.naming_series){hide_field('naming_series');if(cur_frm.doc.__islocal){unhide_field('naming_series');}}} /* * erpnext/startup/js/modules.js */ diff --git a/js/all-web.js b/js/all-web.js index ee051811e8..888aca2b6e 100644 --- a/js/all-web.js +++ b/js/all-web.js @@ -844,11 +844,11 @@ if(wn.boot.startup_code){eval(wn.boot.startup_code);}}else{wn.boot.profile.allow if(user_roles.indexOf('Accounts Manager')!=-1){wn.boot.profile.allow_modules.push('Dashboard');} erpnext.toolbar.setup();erpnext.startup.set_periodic_updates();if(in_list(user_roles,'System Manager')&&(wn.boot.setup_complete=='No')){wn.require("erpnext/startup/js/complete_setup.js");erpnext.complete_setup.show();} if(wn.boot.expires_on&&in_list(user_roles,'System Manager')){var today=dateutil.str_to_obj(dateutil.get_today());var expires_on=dateutil.str_to_obj(wn.boot.expires_on);var diff=dateutil.get_diff(expires_on,today);if(0<=diff&&diff<=15){var expiry_string=diff==0?"today":repl("in %(diff)s day(s)",{diff:diff});$('header').append(repl('
\ - Ahem! Your ERPNext subscription will expire %(expiry_string)s. \ + Your ERPNext subscription will expire %(expiry_string)s. \ Please renew your subscription to continue using ERPNext \ (and remove this annoying banner). \
',{expiry_string:expiry_string}));}else if(diff<0){$('header').append(repl('
\ - Ahem! This ERPNext subscription has expired and should be deleted. \ + This ERPNext subscription has expired. \
',{expiry_string:expiry_string}));}}} erpnext.set_about();$('#startup_div').toggle(false);} show_chart_browser=function(nm,chart_type){var call_back=function(){if(nm=='Sales Browser'){var sb_obj=new SalesBrowser();sb_obj.set_val(chart_type);} @@ -865,7 +865,6 @@ erpnext.set_user_background=function(src){set_style(repl('#body_div { background $(document).bind('startup',function(){erpnext.startup.start();});erpnext.send_message=function(opts){if(opts.btn){$(opts.btn).start_working();} wn.call({method:'website.send_message',args:opts,callback:function(r){if(opts.btn){$(opts.btn).done_working();} if(opts.callback)opts.callback(r)}});} -erpnext.hide_naming_series=function(){console.log(1);if(cur_frm.fields_dict.naming_series){hide_field('naming_series');if(cur_frm.doc.__islocal){unhide_field('naming_series');}}} /* * erpnext/website/js/topbar.js */