diff --git a/css/all-app.css b/css/all-app.css index b2fd2e5732..b49caedee9 100644 --- a/css/all-app.css +++ b/css/all-app.css @@ -1043,7 +1043,7 @@ div.dialog_head { } div.dialog_body { - padding: 8px 4px 16px 4px; + padding: 8px 8px 16px; border-radius: 5px; -moz-border-radius: 5px; -webkit-border-radius: 5px; diff --git a/css/all-web.css b/css/all-web.css index 9359de898e..bebfe9a334 100644 --- a/css/all-web.css +++ b/css/all-web.css @@ -362,7 +362,7 @@ div.dialog_head { } div.dialog_body { - padding: 8px 4px 16px 4px; + padding: 8px 8px 16px; border-radius: 5px; -moz-border-radius: 5px; -webkit-border-radius: 5px; diff --git a/erpnext/home/page/activity/activity.js b/erpnext/home/page/activity/activity.js index 7dbf476acf..d8e22ce809 100644 --- a/erpnext/home/page/activity/activity.js +++ b/erpnext/home/page/activity/activity.js @@ -14,12 +14,15 @@ erpnext.ActivityFeed = Class.extend({ init: function(row, data) { this.scrub_data(data); this.add_date_separator(row, data); - $(row).append(sprintf('%(feed_type)s\ - %(link)s %(subject)s %(by)s', data)); + $(row).append(sprintf('
\ + \ + %(feed_type)s\ + %(link)s %(subject)s %(by)s
', data)); }, scrub_data: function(data) { data.by = wn.user_info(data.owner).fullname; + data.imgsrc = wn.user_info(data.owner).image; // feedtype if(!data.feed_type) { diff --git a/erpnext/home/page/desktop/desktop.css b/erpnext/home/page/desktop/desktop.css index 0aede60c67..836469c14e 100644 --- a/erpnext/home/page/desktop/desktop.css +++ b/erpnext/home/page/desktop/desktop.css @@ -41,10 +41,15 @@ .case-border { border-radius: 10px; + -moz-border-radius: 10px; + -webkit-border-radius: 10px; width: 56px; height: 56px; border: 4px solid white; box-shadow: 0 0 10px 1px black; + -moz-box-shadow: 0 0 10px 1px black; + -webkit-box-shadow: 0 0 10px 1px black; + -o-box-shadow: 0 0 10px 1px black; margin: auto; } @@ -66,6 +71,9 @@ /* Hover and click effects */ .case-border:hover, .circle:hover { box-shadow: 0 0 2px 0px black, 0 0 10px 1px white; + -moz-box-shadow: 0 0 2px 0px black, 0 0 10px 1px white; + -webkit-box-shadow: 0 0 2px 0px black, 0 0 10px 1px white; + -o-box-shadow: 0 0 2px 0px black, 0 0 10px 1px white; } .case-border:active, .case-border:focus, .circle:active, .circle:focus { @@ -78,6 +86,8 @@ .circle { border-radius: 100%; + -moz-border-radius: 100%; + -webkit-border-radius: 100%; height: 15px; min-width: 15px; background: #B00D07; @@ -88,6 +98,9 @@ margin-right: 10px; border: 2px solid white; box-shadow: 0 0 10px 1px black; + -moz-box-shadow: 0 0 10px 1px black; + -webkit-box-shadow: 0 0 10px 1px black; + -o-box-shadow: 0 0 10px 1px black; } .circle-text { diff --git a/erpnext/home/page/desktop/desktop.js b/erpnext/home/page/desktop/desktop.js index 3aa9049e55..dab1e761b0 100644 --- a/erpnext/home/page/desktop/desktop.js +++ b/erpnext/home/page/desktop/desktop.js @@ -3,12 +3,12 @@ wn.provide('erpnext.desktop'); erpnext.desktop.gradient = "" @@ -79,10 +79,13 @@ erpnext.desktop.render = function() { for(var i in wn.boot.modules_list) { var m = wn.boot.modules_list[i]; - if(m!='Setup') + if(m!='Setup' && wn.boot.profile.allow_modules.indexOf(m)!=-1) add_icon(m); } + if(user_roles.indexOf('Accounts Manager')!=-1) + add_icon('Dashboard') + if(user_roles.indexOf('System Manager')!=-1) add_icon('Setup') diff --git a/erpnext/patches/jan_mar_2012/navupdate.py b/erpnext/patches/jan_mar_2012/navupdate.py index 29939e5aa7..8f5250ef9e 100644 --- a/erpnext/patches/jan_mar_2012/navupdate.py +++ b/erpnext/patches/jan_mar_2012/navupdate.py @@ -37,6 +37,12 @@ def execute(): reload_doc('home', 'page', 'activity') reload_doc('core', 'doctype', 'profile') + # update user_image in profile + for p in webnotes.conn.sql("""select name, file_list from tabProfile + where ifnull(file_list,'')!=''"""): + fid = p[1].split('\n')[0].split(',')[1] + webnotes.conn.set_value('Profile', p[0], 'user_image', fid) + webnotes.conn.set_value('Control Panel', 'Control Panel', 'home_page', 'desktop') diff --git a/erpnext/setup/doctype/setup_control/setup_control.py b/erpnext/setup/doctype/setup_control/setup_control.py index 6b8b37c236..50b9bb03cb 100644 --- a/erpnext/setup/doctype/setup_control/setup_control.py +++ b/erpnext/setup/doctype/setup_control/setup_control.py @@ -69,7 +69,7 @@ class DocType: import webnotes, json args = json.loads(args) - curr_fiscal_year, fy_start_date = self.get_fy_details(args.get('fy_start')) + curr_fiscal_year, fy_start_date, fy_abbr = self.get_fy_details(args.get('fy_start')) args['name'] = webnotes.session.get('user') @@ -82,7 +82,12 @@ class DocType: # Fiscal Year - master_dict = {'Fiscal Year':{'year':curr_fiscal_year, 'year_start_date':fy_start_date}} + master_dict = {'Fiscal Year':{ + 'year': curr_fiscal_year, + 'year_start_date': fy_start_date, + 'abbreviation': fy_abbr, + 'company': args.get('company_name'), + 'is_fiscal_year_closed': 'No'}} self.create_records(master_dict) # Company @@ -163,9 +168,11 @@ class DocType: #eddt = sql("select DATE_FORMAT(DATE_SUB(DATE_ADD('%s', INTERVAL 1 YEAR), INTERVAL 1 DAY),'%%d-%%m-%%Y')" % (stdt.split('-')[2]+ '-' + stdt.split('-')[1] + '-' + stdt.split('-')[0])) if(fy_start == '1st Jan'): fy = cstr(getdate(nowdate()).year) + abbr = cstr(fy)[-2:] else: fy = cstr(curr_year) + '-' + cstr(curr_year+1) - return fy,stdt + abbr = cstr(curr_year)[-2:] + '-' + cstr(curr_year+1)[-2:] + return fy, stdt, abbr # Create Company and Fiscal Year diff --git a/erpnext/startup/js/toolbar.js b/erpnext/startup/js/toolbar.js index 1a2bfdfe9a..7bf9c6a04e 100644 --- a/erpnext/startup/js/toolbar.js +++ b/erpnext/startup/js/toolbar.js @@ -87,7 +87,7 @@ erpnext.toolbar.add_modules = function() { for(var i in wn.boot.modules_list) { var m = wn.boot.modules_list[i] - if(m!='Setup') { + if(m!='Setup' && wn.boot.profile.allow_modules.indexOf(m)!=-1) { args = { module: m, module_page: erpnext.modules[m], @@ -98,6 +98,12 @@ erpnext.toolbar.add_modules = function() { data-module="%(module)s">%(module_label)s', args)); } } + + // dasboard for accounts system manager + if(user_roles.indexOf("Accounts Manager")!=-1) { + $('.navbar .modules').append('
  • Dashboard
    • '); + } // setup for system manager if(user_roles.indexOf("System Manager")!=-1) { diff --git a/erpnext/startup/startup.js b/erpnext/startup/startup.js index ad8289e9d5..9a281e25e8 100644 --- a/erpnext/startup/startup.js +++ b/erpnext/startup/startup.js @@ -34,7 +34,8 @@ erpnext.modules = { 'To Do': 'todo', 'Calendar': 'calendar', 'Messages': 'messages', - 'Knowledge Base': 'questions' + 'Knowledge Base': 'questions', + 'Dashboard': 'dashboard' } erpnext.startup.set_globals = function() { @@ -59,6 +60,10 @@ erpnext.startup.start = function() { wn.title_prefix = wn.boot.website_settings.title_prefix; } } else { + // always allow apps + wn.boot.profile.allow_modules = wn.boot.profile.allow_modules.concat( + ['To Do', 'Knowledge Base', 'Calendar', 'Activity']) + // setup toolbar erpnext.toolbar.setup(); diff --git a/erpnext/support/doctype/support_ticket/support_ticket.js b/erpnext/support/doctype/support_ticket/support_ticket.js index 02c9a5d082..86264a6433 100644 --- a/erpnext/support/doctype/support_ticket/support_ticket.js +++ b/erpnext/support/doctype/support_ticket/support_ticket.js @@ -178,7 +178,8 @@ EmailMessage = function(parent, args, list, idx) { // email text this.message = $a(w, 'div', '', // style - {lineHeight:'1.7em', display:'none', padding: '7px'}, + {lineHeight:'1.7em', display:'none', padding: '7px', width: '575px', + wordWrap: 'break-word', textWrap: 'normal', overflowX: 'auto'}, // newlines for text email (this.content_type=='text/plain' ? this.mail diff --git a/erpnext/utilities/page/users/users.js b/erpnext/utilities/page/users/users.js index d1c916c6fd..324a9d7a29 100644 --- a/erpnext/utilities/page/users/users.js +++ b/erpnext/utilities/page/users/users.js @@ -151,22 +151,22 @@ $.extend(wn.pages.users, { this.settings_dialog.fields_dict.update.input.onclick = function() { var btn = this; - this.set_working(); var args = me.settings_dialog.get_values(); args.user = me.uid; if (args.new_password) { me.get_password(btn, args); } else { - btn.set_working(); - me.update_security(args); + me.update_security(btn, args); } }; }, - update_security: function(args) { + update_security: function(btn, args) { var me = wn.pages.users; + $(btn).set_working(); $c_page('utilities', 'users', 'update_security', JSON.stringify(args), function(r,rt) { + $(btn).done_working(); if(r.exc) { msgprint(r.exc); return; diff --git a/erpnext/website/page/website_home/website_home.html b/erpnext/website/page/website_home/website_home.html index 4c3c9c6c7b..f7bb208bea 100644 --- a/erpnext/website/page/website_home/website_home.html +++ b/erpnext/website/page/website_home/website_home.html @@ -1,7 +1,7 @@
    × -

    Support

    +

    Website

    Web Page

    diff --git a/js/all-app.js b/js/all-app.js index 26b1c01f0a..3c65618e1a 100644 --- a/js/all-app.js +++ b/js/all-app.js @@ -2229,12 +2229,13 @@ wn.modules_path='erpnext';wn.settings.no_history=true;$(document).bind('ready',f /* * erpnext/startup/startup.js */ -var current_module;var is_system_manager=0;wn.provide('erpnext.startup');erpnext.modules={'Selling':'selling-home','Accounts':'accounts-home','Stock':'stock-home','Buying':'buying-home','Support':'support-home','Projects':'projects-home','Production':'production-home','Website':'website-home','HR':'hr-home','Setup':'Setup','Activity':'activity','To Do':'todo','Calendar':'calendar','Messages':'messages','Knowledge Base':'questions'} +var current_module;var is_system_manager=0;wn.provide('erpnext.startup');erpnext.modules={'Selling':'selling-home','Accounts':'accounts-home','Stock':'stock-home','Buying':'buying-home','Support':'support-home','Projects':'projects-home','Production':'production-home','Website':'website-home','HR':'hr-home','Setup':'Setup','Activity':'activity','To Do':'todo','Calendar':'calendar','Messages':'messages','Knowledge Base':'questions','Dashboard':'dashboard'} erpnext.startup.set_globals=function(){pscript.is_erpnext_saas=cint(wn.control_panel.sync_with_gateway) if(inList(user_roles,'System Manager'))is_system_manager=1;} erpnext.startup.start=function(){$('#startup_div').html('Starting up...').toggle(true);erpnext.startup.set_globals();if(wn.boot.custom_css){set_style(wn.boot.custom_css);} if(wn.boot.user_background){erpnext.set_user_background(wn.boot.user_background);} -if(user=='Guest'){if(wn.boot.website_settings.title_prefix){wn.title_prefix=wn.boot.website_settings.title_prefix;}}else{erpnext.toolbar.setup();erpnext.startup.set_periodic_updates();$('footer').html('
    \ +if(user=='Guest'){if(wn.boot.website_settings.title_prefix){wn.title_prefix=wn.boot.website_settings.title_prefix;}}else{wn.boot.profile.allow_modules=wn.boot.profile.allow_modules.concat(['To Do','Knowledge Base','Calendar','Activity']) +erpnext.toolbar.setup();erpnext.startup.set_periodic_updates();$('footer').html('
    \ Powered by ERPNext
    ');if(in_list(user_roles,'System Manager')&&(wn.boot.setup_complete=='No')){wn.require("erpnext/startup/js/complete_setup.js");erpnext.complete_setup();}} $('#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);} @@ -2282,9 +2283,11 @@ erpnext.toolbar.add_modules=function(){$('
  • \
    • ').prependTo('.navbar .nav:first');if(wn.boot.modules_list) wn.boot.modules_list=JSON.parse(wn.boot.modules_list);else wn.boot.modules_list=keys(erpnext.modules).sort();for(var i in wn.boot.modules_list){var m=wn.boot.modules_list[i] -if(m!='Setup'){args={module:m,module_page:erpnext.modules[m],module_label:m=='HR'?'Human Resources':m} +if(m!='Setup'&&wn.boot.profile.allow_modules.indexOf(m)!=-1){args={module:m,module_page:erpnext.modules[m],module_label:m=='HR'?'Human Resources':m} $('.navbar .modules').append(repl('
  • %(module_label)s
    • ',args));}} +if(user_roles.indexOf("Accounts Manager")!=-1){$('.navbar .modules').append('
  • Dashboard
    • ');} if(user_roles.indexOf("System Manager")!=-1){$('.navbar .modules').append('
  • \
  • Setup
    • ');}} /* diff --git a/js/all-web.js b/js/all-web.js index cad3c77fd3..e802a17e9d 100644 --- a/js/all-web.js +++ b/js/all-web.js @@ -1077,12 +1077,13 @@ wn.modules_path='erpnext';wn.settings.no_history=true;$(document).bind('ready',f /* * erpnext/startup/startup.js */ -var current_module;var is_system_manager=0;wn.provide('erpnext.startup');erpnext.modules={'Selling':'selling-home','Accounts':'accounts-home','Stock':'stock-home','Buying':'buying-home','Support':'support-home','Projects':'projects-home','Production':'production-home','Website':'website-home','HR':'hr-home','Setup':'Setup','Activity':'activity','To Do':'todo','Calendar':'calendar','Messages':'messages','Knowledge Base':'questions'} +var current_module;var is_system_manager=0;wn.provide('erpnext.startup');erpnext.modules={'Selling':'selling-home','Accounts':'accounts-home','Stock':'stock-home','Buying':'buying-home','Support':'support-home','Projects':'projects-home','Production':'production-home','Website':'website-home','HR':'hr-home','Setup':'Setup','Activity':'activity','To Do':'todo','Calendar':'calendar','Messages':'messages','Knowledge Base':'questions','Dashboard':'dashboard'} erpnext.startup.set_globals=function(){pscript.is_erpnext_saas=cint(wn.control_panel.sync_with_gateway) if(inList(user_roles,'System Manager'))is_system_manager=1;} erpnext.startup.start=function(){$('#startup_div').html('Starting up...').toggle(true);erpnext.startup.set_globals();if(wn.boot.custom_css){set_style(wn.boot.custom_css);} if(wn.boot.user_background){erpnext.set_user_background(wn.boot.user_background);} -if(user=='Guest'){if(wn.boot.website_settings.title_prefix){wn.title_prefix=wn.boot.website_settings.title_prefix;}}else{erpnext.toolbar.setup();erpnext.startup.set_periodic_updates();$('footer').html('
    \ +if(user=='Guest'){if(wn.boot.website_settings.title_prefix){wn.title_prefix=wn.boot.website_settings.title_prefix;}}else{wn.boot.profile.allow_modules=wn.boot.profile.allow_modules.concat(['To Do','Knowledge Base','Calendar','Activity']) +erpnext.toolbar.setup();erpnext.startup.set_periodic_updates();$('footer').html('
    \ Powered by ERPNext
    ');if(in_list(user_roles,'System Manager')&&(wn.boot.setup_complete=='No')){wn.require("erpnext/startup/js/complete_setup.js");erpnext.complete_setup();}} $('#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);} diff --git a/version.num b/version.num index 571c4378f1..699ec1b9ee 100644 --- a/version.num +++ b/version.num @@ -1 +1 @@ -774 +781 \ No newline at end of file