Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename
diff --git a/css/all-web.css b/css/all-web.css
index 1d8f8d6..8f9003c 100644
--- a/css/all-web.css
+++ b/css/all-web.css
@@ -2553,7 +2553,7 @@
}
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 911c6a0..91a5359 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 @@
'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 455b850..959c854 100644
--- a/erpnext/startup/startup.js
+++ b/erpnext/startup/startup.js
@@ -110,8 +110,8 @@
}
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 a68209f..eb9e6cc 100644
--- a/erpnext/website/css/website.css
+++ b/erpnext/website/css/website.css
@@ -3,7 +3,7 @@
}
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 bafe125..74ffb18 100644
--- a/js/all-app.js
+++ b/js/all-app.js
@@ -2241,7 +2241,8 @@
</div>',{expiry_string:expiry_string}));}else if(diff<0){$('header').append(repl('<div class="expiry-info"> \
This ERPNext subscription <b>has expired</b>. \
</div>',{expiry_string:expiry_string}));}}}
-erpnext.set_about();$('#startup_div').toggle(false);}
+erpnext.set_about();if(wn.control_panel.custom_startup_code)
+eval(wn.control_panel.custom_startup_code);}
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);}
else if(nm=='Accounts Browser')
pscript.make_chart(chart_type);}
diff --git a/js/all-web.js b/js/all-web.js
index 8c2e337..6dd52b3 100644
--- a/js/all-web.js
+++ b/js/all-web.js
@@ -852,7 +852,8 @@
</div>',{expiry_string:expiry_string}));}else if(diff<0){$('header').append(repl('<div class="expiry-info"> \
This ERPNext subscription <b>has expired</b>. \
</div>',{expiry_string:expiry_string}));}}}
-erpnext.set_about();$('#startup_div').toggle(false);}
+erpnext.set_about();if(wn.control_panel.custom_startup_code)
+eval(wn.control_panel.custom_startup_code);}
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);}
else if(nm=='Accounts Browser')
pscript.make_chart(chart_type);}