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

fix accounts browser and cost center strings (js)

Browse Source
This commit is contained in:
Pratik Vyas 2014-04-15 10:08:53 +05:30
parent ec9c448ccf
commit 13c92e3ad5
2 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
erpnext/accounts/doctype/cost_center/cost_center.js
View File

@ -40,8 +40,7 @@ cur_frm.cscript.refresh = function(doc, cdt, cdn) {
cur_frm.toggle_enable(['group_or_ledger', 'company'], doc.__islocal); cur_frm.toggle_enable(['group_or_ledger', 'company'], doc.__islocal);
if(!doc.__islocal && doc.group_or_ledger=='Group') { if(!doc.__islocal && doc.group_or_ledger=='Group') {
intro_txt += '<p><b>'+__('Note:')+'</b>'+ __('This Cost Center is a')+ '<i>'+__('Group')+'</i>, '+ intro_txt += __('Note: This Cost Center is a Group. Cannot make accounting entries against groups.');
__('Accounting Entries are not allowed against groups.')+'</p>';
} }
cur_frm.cscript.hide_unhide_group_ledger(doc); cur_frm.cscript.hide_unhide_group_ledger(doc);

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

@ -31,13 +31,11 @@ pscript['onload_Accounts Browser'] = function(wrapper){
'<li>'+__('Please do NOT create Account (Ledgers) for Customers and Suppliers. They are created directly from the Customer / Supplier masters.')+'</li>'+ '<li>'+__('Please do NOT create Account (Ledgers) for Customers and Suppliers. They are created directly from the Customer / Supplier masters.')+'</li>'+
'<li>'+ '<li>'+
'<b>'+__('To create a Bank Account:')+'</b>'+ '<b>'+__('To create a Bank Account:')+'</b>'+
__('Go to the appropriate group (usually Application of Funds > Current Assets > Bank Accounts)')+ __('Go to the appropriate group (usually Application of Funds > Current Assets > Bank Accounts and create a new Account Ledger (by clicking on Add Child) of type "Bank"')+
__('and create a new Account Ledger (by clicking on Add Child) of type "Bank"')+
'</li>'+ '</li>'+
'<li>'+ '<li>'+
'<b>'+__('To create a Tax Account:')+'</b>'+ '<b>'+__('To create a Tax Account:')+'</b>'+
__('Go to the appropriate group (usually Source of Funds > Current Liabilities > Taxes and Duties)')+ __('Go to the appropriate group (usually Source of Funds > Current Liabilities > Taxes and Duties and create a new Account Ledger (by clicking on Add Child) of type "Tax" and do mention the Tax rate.')+
__('and create a new Account Ledger (by clicking on Add Child) of type "Tax" and do mention the Tax rate.')+
'</li>'+ '</li>'+
'</ol>'+ '</ol>'+
'<p>'+__('Please setup your chart of accounts before you start Accounting Entries')+'</p></div>').appendTo(main); '<p>'+__('Please setup your chart of accounts before you start Accounting Entries')+'</p></div>').appendTo(main);
@ -187,11 +185,9 @@ erpnext.AccountsChart = Class.extend({
title:__('New Account'), title:__('New Account'),
fields: [ fields: [
{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,")+ 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")},
__("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,')+ options:'Group\nLedger', description: __('Further accounts can be made under Groups, but entries can be made against Ledger')},
__('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',
@ -265,8 +261,7 @@ erpnext.AccountsChart = Class.extend({
fields: [ fields: [
{fieldtype:'Data', fieldname:'cost_center_name', label:__('New Cost Center Name'), reqd:true}, {fieldtype:'Data', fieldname:'cost_center_name', label:__('New Cost Center Name'), reqd:true},
{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,')+ options:'Group\nLedger', description:__('Further accounts can be made under Groups but entries can be made against Ledger')},
__('but entries can be made against Ledger')},
{fieldtype:'Button', fieldname:'create_new', label:__('Create New') } {fieldtype:'Button', fieldname:'create_new', label:__('Create New') }
] ]
}); });
@ -292,4 +287,4 @@ erpnext.AccountsChart = Class.extend({
}); });
d.show(); d.show();
} }
}); });