nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-26 16:34:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'wsgi' of https://github.com/webnotes/erpnext into i18n

Browse Source 
Conflicts:
	accounts/doctype/purchase_taxes_and_charges_master/purchase_taxes_and_charges_master.js
	accounts/doctype/sales_taxes_and_charges_master/sales_taxes_and_charges_master.js
	public/js/complete_setup.js
	selling/doctype/opportunity/opportunity.js
	selling/doctype/quotation/quotation.js
This commit is contained in:
Bárbara Perretti
2013-10-16 15:09:18 -03:00
parent 3da50f0960 f146e8b7f5
commit 4b41e5f7f7
250 changed files with 5061 additions and 2506 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
public/js/startup.js
View File

@@ -9,25 +9,10 @@ erpnext.startup.start = function() {
console.log(wn._('Starting up...'));
$('#startup_div').html('Starting up...').toggle(true);
if(user != 'Guest'){
// setup toolbar
erpnext.toolbar.setup();
// complete registration
if(in_list(user_roles,'System Manager') && (wn.boot.setup_complete==='No')) {
wn.require("app/js/complete_setup.js");
erpnext.complete_setup.show();
} else if(!wn.boot.customer_count) {
if(wn.get_route()[0]!=="Setup") {
msgprint("<a class='btn btn-success' href='#Setup'>"
+ wn._("Proceed to Setup") + "</a>\
<br><br><p class='text-muted'>"+
wn._("This message goes away after you create your first customer.")+
"</p>", wn._("Welcome"));
}
} else if(wn.boot.expires_on && in_list(user_roles, 'System Manager')) {
erpnext.startup.show_expiry_banner();
}
erpnext.toolbar.setup();
if(wn.boot.expires_on && in_list(user_roles, 'System Manager')) {
erpnext.startup.show_expiry_banner();
}
}