Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[fix] [ux] allow account to be created via form (#13509)

Browse Source
This commit is contained in:
Rushabh Mehta 2018-04-06 10:28:08 +05:30 committed by GitHub
parent 92109b01fd
commit dccfb54a0f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 671 additions and 659 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
erpnext/accounts/doctype/account/account.js
View File

@ -17,18 +17,13 @@ frappe.ui.form.on('Account', {
}); });
}, },
refresh: function(frm) { refresh: function(frm) {
if (frm.doc.__islocal) { frm.toggle_display('account_name', frm.is_new());
frappe.msgprint(__("Please create new account from Chart of Accounts."));
throw "cannot create";
}
frm.toggle_display('account_name', frm.doc.__islocal);
// hide fields if group // hide fields if group
frm.toggle_display(['account_type', 'tax_rate'], cint(frm.doc.is_group) == 0); frm.toggle_display(['account_type', 'tax_rate'], cint(frm.doc.is_group) == 0);
// disable fields // disable fields
frm.toggle_enable(['account_name', 'is_group', 'company'], false); frm.toggle_enable(['is_group', 'company'], false);
if (cint(frm.doc.is_group) == 0) { if (cint(frm.doc.is_group) == 0) {
frm.toggle_display('freeze_account', frm.doc.__onload frm.toggle_display('freeze_account', frm.doc.__onload
@ -36,19 +31,18 @@ frappe.ui.form.on('Account', {
} }
// read-only for root accounts // read-only for root accounts
if (!frm.doc.parent_account) { if (!frm.is_new()) {
frm.set_read_only(); if (!frm.doc.parent_account) {
frm.set_intro(__("This is a root account and cannot be edited.")); frm.set_read_only();
} else { frm.set_intro(__("This is a root account and cannot be edited."));
// credit days and type if customer or supplier } else {
frm.set_intro(null); // credit days and type if customer or supplier
frm.trigger('account_type'); frm.set_intro(null);
frm.trigger('account_type');
// show / hide convert buttons // show / hide convert buttons
frm.trigger('add_toolbar_buttons'); frm.trigger('add_toolbar_buttons');
} }
if(!frm.doc.__islocal) {
frm.add_custom_button(__('Update Account Number'), function () { frm.add_custom_button(__('Update Account Number'), function () {
frm.trigger("update_account_number"); frm.trigger("update_account_number");
}); });

1298
erpnext/accounts/doctype/account/account.json
View File

File diff suppressed because it is too large Load Diff