nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-09-01 07:37:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Lint and fix JS files

Browse Source
This commit is contained in:
Faris Ansari
2017-05-30 12:54:42 +05:30
parent dae7721384
commit ab74ca7fff
138 changed files with 1280 additions and 1268 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
erpnext/setup/doctype/company/company.js
View File

@@ -47,31 +47,32 @@ frappe.ui.form.on("Company", {
fieldname: "company_name",
label: __("Please re-type company name to confirm"),
reqd: 1,
description: __("Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.")},
function(data) {
if(data.company_name !== frm.doc.name) {
frappe.msgprint("Company name not same");
return;
}
frappe.call({
method: "erpnext.setup.doctype.company.delete_company_transactions.delete_company_transactions",
args: {
company_name: data.company_name
},
freeze: true,
callback: function(r, rt) {
if(!r.exc)
frappe.msgprint(__("Successfully deleted all transactions related to this company!"));
},
onerror: function() {
frappe.msgprint(__("Wrong Password"));
}
});
}, __("Delete all the Transactions for this Company"), __("Delete")
);
d.get_primary_btn().addClass("btn-danger");
}
);
description: __("Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone.")
},
function(data) {
if(data.company_name !== frm.doc.name) {
frappe.msgprint("Company name not same");
return;
}
frappe.call({
method: "erpnext.setup.doctype.company.delete_company_transactions.delete_company_transactions",
args: {
company_name: data.company_name
},
freeze: true,
callback: function(r, rt) {
if(!r.exc)
frappe.msgprint(__("Successfully deleted all transactions related to this company!"));
},
onerror: function() {
frappe.msgprint(__("Wrong Password"));
}
});
},
__("Delete all the Transactions for this Company"), __("Delete")
);
d.get_primary_btn().addClass("btn-danger");
});
}
});
@@ -106,7 +107,7 @@ cur_frm.cscript.change_abbr = function() {
});
dialog.fields_dict.update.$input.click(function() {
args = dialog.get_values();
var args = dialog.get_values();
if(!args) return;
return frappe.call({
method: "erpnext.setup.doctype.company.company.replace_abbr",
@@ -117,7 +118,7 @@ cur_frm.cscript.change_abbr = function() {
},
callback: function(r) {
if(r.exc) {
msgprint(__("There were errors."));
frappe.msgprint(__("There were errors."));
return;
} else {
cur_frm.set_value("abbr", args.new_abbr);
@@ -154,7 +155,7 @@ erpnext.company.setup_queries = function(frm) {
erpnext.company.set_custom_query(frm, v);
});
if (sys_defaults.auto_accounting_for_stock) {
if (frappe.sys_defaults.auto_accounting_for_stock) {
$.each([
["stock_adjustment_account",
{"root_type": "Expense", "account_type": "Stock Adjustment"}],

10
erpnext/setup/doctype/email_digest/email_digest.js
View File

@@ -23,21 +23,21 @@ cur_frm.cscript.refresh = function(doc, dt, dn) {
});
}, "fa fa-eye-open", "btn-default");
if(user==="Administrator") {
if(frappe.session.user==="Administrator") {
cur_frm.add_custom_button(__('Send Now'), function() {
doc = locals[dt][dn];
if(doc.__unsaved != 1) {
return $c_obj(doc, 'send', '', function(r, rt) {
if(r.exc) {
msgprint(err_msg);
frappe.msgprint(err_msg);
console.log(r.exc);
} else {
//console.log(arguments);
msgprint(__('Message Sent'));
frappe.msgprint(__('Message Sent'));
}
});
} else {
msgprint(save_msg);
frappe.msgprint(save_msg);
}
}, "fa fa-envelope", "btn-default");
}
@@ -47,7 +47,7 @@ cur_frm.cscript.addremove_recipients = function(doc, dt, dn) {
// Get user list
return $c_obj(doc, 'get_users', '', function(r, rt) {
if(r.exc) {
msgprint(r.exc);
frappe.msgprint(r.exc);
} else {
// Open a dialog and display checkboxes against email addresses
doc = locals[dt][dn];

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

@@ -4,7 +4,7 @@
$.extend(cur_frm.cscript, {
validate: function(doc, cdt, cdn) {
return $c_obj(doc, 'get_defaults', '', function(r, rt){
sys_defaults = r.message;
frappe.sys_defaults = r.message;
});
}
});