diff --git a/css/all-web.css b/css/all-web.css index 1d8f8d6e302..8f9003c8b15 100644 --- a/css/all-web.css +++ b/css/all-web.css @@ -2553,7 +2553,7 @@ header .container, .content { } div#body_div { - padding-top: 90px; + padding-top: 80px; min-height: 400px; } diff --git a/erpnext/patches/jan_mar_2012/sync_ref_db.py b/erpnext/patches/jan_mar_2012/sync_ref_db.py index 911c6a07ca4..91a53596cb1 100644 --- a/erpnext/patches/jan_mar_2012/sync_ref_db.py +++ b/erpnext/patches/jan_mar_2012/sync_ref_db.py @@ -20,7 +20,7 @@ def execute(): 'Invest 80 Declaration Detail', 'IT Checklist', 'Chapter VI A Detail', 'Declaration Detail', 'Personalize', 'Salary Slip Control Panel', 'Question Control' ], - 'Page' : ['File Browser', 'Bill of Materials'], + 'Page' : ['File Browser', 'Bill of Materials', 'question-view'], 'DocType Mapper': ['Production Forecast-Production Planning Tool', 'Production Forecast-Production Plan', 'Sales Order-Production Plan'], } diff --git a/erpnext/startup/startup.js b/erpnext/startup/startup.js index 455b850ca01..959c8540fe7 100644 --- a/erpnext/startup/startup.js +++ b/erpnext/startup/startup.js @@ -110,8 +110,8 @@ erpnext.startup.start = function() { } erpnext.set_about(); - - $('#startup_div').toggle(false); + if(wn.control_panel.custom_startup_code) + eval(wn.control_panel.custom_startup_code); } // chart of accounts diff --git a/erpnext/website/css/website.css b/erpnext/website/css/website.css index a68209f4395..eb9e6cc8346 100644 --- a/erpnext/website/css/website.css +++ b/erpnext/website/css/website.css @@ -3,7 +3,7 @@ header .container, .content { } div#body_div { - padding-top: 90px; + padding-top: 80px; min-height: 400px; } diff --git a/js/all-app.js b/js/all-app.js index bafe125daaf..74ffb18cb56 100644 --- a/js/all-app.js +++ b/js/all-app.js @@ -2241,7 +2241,8 @@ if(wn.boot.expires_on&&in_list(user_roles,'System Manager')){var today=dateutil. ',{expiry_string:expiry_string}));}else if(diff<0){$('header').append(repl('