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

[minor] fixes #3127

Browse Source
This commit is contained in:
Rushabh Mehta 2015-04-21 10:36:39 +05:30
parent 7f9c4d8677
commit dfa93305ab
1 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
erpnext/accounts/page/accounts_browser/accounts_browser.js
View File

@ -49,8 +49,8 @@ frappe.pages["Accounts Browser"].on_page_load = function(wrapper){
}); });
wrapper.page.set_primary_action(__('New'), function() { wrapper.page.set_primary_action(__('New'), function() {
erpnext.account_chart && erpnext.account_chart.new_account(); erpnext.account_chart && erpnext.account_chart.make_new();
}); });
// company-select // company-select
wrapper.$company_select = wrapper.page.add_select("Company", []) wrapper.$company_select = wrapper.page.add_select("Company", [])
@ -118,11 +118,7 @@ erpnext.AccountsChart = Class.extend({
condition: function(node) { return !node.root && node.expandable; }, condition: function(node) { return !node.root && node.expandable; },
label: __("Add Child"), label: __("Add Child"),
click: function() { click: function() {
if(me.ctype=='Account') { me.make_new()
me.new_account();
} else {
me.new_cost_center();
}
} }
}, },
{ {
@ -180,6 +176,15 @@ erpnext.AccountsChart = Class.extend({
wrapper.page.set_title(chart_str); wrapper.page.set_title(chart_str);
} }
}, },
make_new: function() {
if(this.ctype=='Account') {
this.new_account();
} else {
this.new_cost_center();
}
},
new_account: function() { new_account: function() {
var me = this; var me = this;
@ -197,7 +202,8 @@ erpnext.AccountsChart = Class.extend({
{fieldtype:'Data', fieldname:'account_name', label:__('New Account Name'), reqd:true, {fieldtype:'Data', fieldname:'account_name', label:__('New Account Name'), reqd:true,
description: __("Name of new Account. Note: Please don't create accounts for Customers and Suppliers, they are created automatically from the Customer and Supplier master")}, description: __("Name of new Account. Note: Please don't create accounts for Customers and Suppliers, they are created automatically from the Customer and Supplier master")},
{fieldtype:'Select', fieldname:'group_or_ledger', label:__('Group or Ledger'), {fieldtype:'Select', fieldname:'group_or_ledger', label:__('Group or Ledger'),
options:'Group\nLedger', description: __('Further accounts can be made under Groups, but entries can be made against Ledger')}, options:'Group\nLedger', "default": "Ledger",
description: __('Further accounts can be made under Groups, but entries can be made against Ledger')},
{fieldtype:'Select', fieldname:'account_type', label:__('Account Type'), {fieldtype:'Select', fieldname:'account_type', label:__('Account Type'),
options: ['', 'Bank', 'Cash', 'Warehouse', 'Receivable', 'Payable', options: ['', 'Bank', 'Cash', 'Warehouse', 'Receivable', 'Payable',
'Equity', 'Cost of Goods Sold', 'Fixed Asset', 'Expense Account', 'Equity', 'Cost of Goods Sold', 'Fixed Asset', 'Expense Account',