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

Merge branch 'master' of github.com:webnotes/erpnext

Browse Source
This commit is contained in:
Rushabh Mehta
2013-07-30 16:20:19 +05:30
parent ed186b719e 18b1e202d5
commit e3742322fb
76 changed files with 287 additions and 264 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
setup/doctype/backup_manager/backup_manager.js
View File

@@ -43,7 +43,7 @@ $.extend(cur_frm.cscript, {
allow_dropbox_access: function() {
if(cur_frm.cscript.validate_send_notifications_to()) {
wn.call({
return wn.call({
method: "setup.doctype.backup_manager.backup_dropbox.get_dropbox_authorize_url",
callback: function(r) {
if(!r.exc) {
@@ -60,7 +60,7 @@ $.extend(cur_frm.cscript, {
allow_gdrive_access: function() {
if(cur_frm.cscript.validate_send_notifications_to()) {
wn.call({
return wn.call({
method: "setup.doctype.backup_manager.backup_googledrive.get_gdrive_authorize_url",
callback: function(r) {
if(!r.exc) {
@@ -72,7 +72,7 @@ $.extend(cur_frm.cscript, {
},
validate_gdrive: function() {
wn.call({
return wn.call({
method: "setup.doctype.backup_manager.backup_googledrive.gdrive_callback",
args: {
verification_code: cur_frm.doc.verification_code

4
setup/doctype/contact_control/contact_control.js
View File

@@ -5,7 +5,7 @@
// get sates on country trigger
// -----------------------------
cur_frm.cscript.get_states=function(doc,dt,dn){
$c('runserverobj', args={'method':'check_state', 'docs':wn.model.compress(make_doclist(doc.doctype, doc.name))},
return $c('runserverobj', args={'method':'check_state', 'docs':wn.model.compress(make_doclist(doc.doctype, doc.name))},
function(r,rt){
if(r.message) {
set_field_options('state', r.message);
@@ -152,7 +152,7 @@ cur_frm.cscript.delete_doc = function(doctype, name) {
}));
if (!go_ahead) return;
wn.call({
return wn.call({
method: 'webnotes.model.delete_doc',
args: {
dt: doctype,

6
setup/doctype/email_digest/email_digest.js
View File

@@ -22,7 +22,7 @@ cur_frm.cscript.refresh = function(doc, dt, dn) {
cur_frm.add_custom_button('View Now', function() {
doc = locals[dt][dn];
if(doc.__unsaved != 1) {
$c_obj(make_doclist(dt, dn), 'get_digest_msg', '', function(r, rt) {
return $c_obj(make_doclist(dt, dn), 'get_digest_msg', '', function(r, rt) {
if(r.exc) {
msgprint(err_msg);
console.log(r.exc);
@@ -45,7 +45,7 @@ cur_frm.cscript.refresh = function(doc, dt, dn) {
cur_frm.add_custom_button('Send Now', function() {
doc = locals[dt][dn];
if(doc.__unsaved != 1) {
$c_obj(make_doclist(dt, dn), 'send', '', function(r, rt) {
return $c_obj(make_doclist(dt, dn), 'send', '', function(r, rt) {
if(r.exc) {
msgprint(err_msg);
console.log(r.exc);
@@ -62,7 +62,7 @@ cur_frm.cscript.refresh = function(doc, dt, dn) {
cur_frm.cscript.addremove_recipients = function(doc, dt, dn) {
// Get profile list
$c_obj(make_doclist(dt, dn), 'get_profiles', '', function(r, rt) {
return $c_obj(make_doclist(dt, dn), 'get_profiles', '', function(r, rt) {
if(r.exc) {
msgprint(r.exc);
} else {

2
setup/doctype/global_defaults/global_defaults.js
View File

@@ -16,7 +16,7 @@
// Validate
cur_frm.cscript.validate = function(doc, cdt, cdn) {
$c_obj(make_doclist(cdt, cdn), 'get_defaults', '', function(r, rt){
return $c_obj(make_doclist(cdt, cdn), 'get_defaults', '', function(r, rt){
sys_defaults = r.message;
});
}

8
setup/doctype/naming_series/naming_series.js
View File

@@ -16,7 +16,7 @@
// Settings
cur_frm.cscript.onload_post_render = function(doc, cdt, cdn){
cur_frm.call({
return cur_frm.call({
doc: cur_frm.doc,
method: 'get_transactions',
callback: function(r) {
@@ -45,15 +45,15 @@ cur_frm.cscript.select_doc_for_series = function(doc, cdt, cdn) {
}
if(doc.select_doc_for_series)
$c_obj(make_doclist(doc.doctype, doc.name),'get_options','',callback)
return $c_obj(make_doclist(doc.doctype, doc.name),'get_options','',callback)
}
cur_frm.cscript.update = function() {
cur_frm.call_server('update_series', '', cur_frm.cscript.update_selects)
return cur_frm.call_server('update_series', '', cur_frm.cscript.update_selects)
}
cur_frm.cscript.prefix = function(doc, dt, dn) {
cur_frm.call_server('get_current', '', function(r) {
return cur_frm.call_server('get_current', '', function(r) {
refresh_field('current_value');
})
}

2
setup/doctype/notification_control/notification_control.js
View File

@@ -21,6 +21,6 @@ cur_frm.cscript.select_transaction = function(doc, cdt, cdn) {
doc.custom_message = r.message;
refresh_field('custom_message');
}
$c_obj(make_doclist(cdt, cdn),'get_message',doc.select_transaction, callback)
return $c_obj(make_doclist(cdt, cdn),'get_message',doc.select_transaction, callback)
}
}

78
setup/page/setup/setup.js
View File

@@ -21,36 +21,7 @@ wn.pages.Setup.make = function(wrapper) {
completed = 0;
body.html('<div class="progress progress-striped active">\
<div class="progress-bar" style="width: 100%;"></div></div>')
wn.call({
method: "setup.page.setup.setup.get",
callback: function(r) {
if(r.message) {
body.empty();
if(wn.boot.expires_on) {
$(body).prepend("<div class='text-muted' style='text-align:right'>Account expires on "
+ wn.datetime.global_date_format(wn.boot.expires_on) + "</div>");
}
$completed = $('<h4>Setup Completed <span class="completed-percent"></span><h4>\
<div class="progress"><div class="progress-bar"></div></div>')
.appendTo(body);
$.each(r.message, function(i, item) {
render_item(item)
});
var completed_percent = cint(flt(completed) / total * 100) + "%";
$completed
.find(".progress-bar")
.css({"width": completed_percent});
$(body)
.find(".completed-percent")
.html("(" + completed_percent + ")");
}
}
});
<div class="progress-bar" style="width: 100%;"></div></div>');
var render_item = function(item, dependency) {
if(item.type==="Section") {
@@ -68,12 +39,12 @@ wn.pages.Setup.make = function(wrapper) {
.appendTo(body);
$('<div class="col col-lg-1"></div>').appendTo(row);
if(item.type==="Link") {
var col = $('<div class="col col-lg-5"><b><a href="#'
+item.route+'"><i class="'+item.icon+'"></i> '
+item.title+'</a></b></div>').appendTo(row);
} else {
var col = $(repl('<div class="col col-lg-5">\
<span class="badge view-link">%(count)s</span>\
@@ -102,12 +73,12 @@ wn.pages.Setup.make = function(wrapper) {
col.addClass("col-offset-1");
else
$('<div class="col col-lg-1"></div>').appendTo(row);
if(item.doctype) {
var badge = col.find(".badge, .data-link")
.attr("data-doctype", item.doctype)
.css({"cursor": "pointer"})
if(item.single) {
badge.click(function() {
wn.set_route("Form", $(this).attr("data-doctype"))
@@ -118,10 +89,10 @@ wn.pages.Setup.make = function(wrapper) {
})
}
}
// tree
$links = $('<div class="col col-lg-5">').appendTo(row);
if(item.tree) {
$('<a class="view-link"><i class="icon-sitemap"></i> Browse</a>\
<span class="text-muted">|</span> \
@@ -134,7 +105,7 @@ wn.pages.Setup.make = function(wrapper) {
mylink.click(function() {
wn.set_route(item.tree, item.doctype);
})
} else if(item.single) {
$('<a class="view-link"><i class="icon-edit"></i> Edit</a>')
.appendTo($links)
@@ -183,7 +154,7 @@ wn.pages.Setup.make = function(wrapper) {
wn.route_options = {doctype:$(this).attr("data-doctype")}
wn.set_route("data-import-tool");
})
if(item.links) {
$.each(item.links, function(i, link) {
var newlinks = $('<span class="text-muted"> |</span> \
@@ -192,11 +163,40 @@ wn.pages.Setup.make = function(wrapper) {
.appendTo($links)
})
}
if(item.dependencies) {
$.each(item.dependencies, function(i, d) {
render_item(d, true);
})
}
}
return wn.call({
method: "setup.page.setup.setup.get",
callback: function(r) {
if(r.message) {
body.empty();
if(wn.boot.expires_on) {
$(body).prepend("<div class='text-muted' style='text-align:right'>Account expires on "
+ wn.datetime.global_date_format(wn.boot.expires_on) + "</div>");
}
$completed = $('<h4>Setup Completed <span class="completed-percent"></span><h4>\
<div class="progress"><div class="progress-bar"></div></div>')
.appendTo(body);
$.each(r.message, function(i, item) {
render_item(item)
});
var completed_percent = cint(flt(completed) / total * 100) + "%";
$completed
.find(".progress-bar")
.css({"width": completed_percent});
$(body)
.find(".completed-percent")
.html("(" + completed_percent + ")");
}
}
});
}