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

fixes in fieldnames and hide unnecessary fields in jv

Browse Source
This commit is contained in:
Anand Doshi 2012-04-13 12:36:44 +05:30
parent b641ed2a1e
commit 3abe9bd018
2 changed files with 33 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -33,9 +33,9 @@ cur_frm.cscript.onload = function(doc, cdt, cdn) {
// hide India specific fields // hide India specific fields
var cp = wn.control_panel; var cp = wn.control_panel;
if(cp.country == 'India') if(cp.country == 'India')
unhide_field(['pan_number', 'tds_applicable', 'tds_details', 'TDS']); unhide_field(['pan_number', 'tds_applicable', 'tds_details', 'tds']);
else else
hide_field(['pan_number', 'tds_applicable', 'tds_details', 'TDS']); hide_field(['pan_number', 'tds_applicable', 'tds_details', 'tds']);
} }
// Refresh // Refresh
@ -50,7 +50,7 @@ cur_frm.cscript.refresh = function(doc, cdt, cdn) {
// Hide/unhide group or ledger // Hide/unhide group or ledger
// ----------------------------------------- // -----------------------------------------
cur_frm.cscript.hide_unhide_group_ledger = function(doc) { cur_frm.cscript.hide_unhide_group_ledger = function(doc) {
hide_field(['Convert to Group', 'Convert to Ledger']); hide_field(['convert_to_group', 'convert_to_ledger']);
if (cstr(doc.group_or_ledger) == 'Group') unhide_field('convert_to_ledger'); if (cstr(doc.group_or_ledger) == 'Group') unhide_field('convert_to_ledger');
else if (cstr(doc.group_or_ledger) == 'Ledger') unhide_field('convert_to_ledger'); else if (cstr(doc.group_or_ledger) == 'Ledger') unhide_field('convert_to_ledger');
} }

60
erpnext/accounts/doctype/journal_voucher/journal_voucher.txt
View File

@ -3,9 +3,9 @@
# These values are common in all dictionaries # These values are common in all dictionaries
{ {
'creation': '2012-03-27 14:35:43', 'creation': '2012-04-13 11:55:50',
'docstatus': 0, 'docstatus': 0,
'modified': '2012-03-27 14:45:48', 'modified': '2012-04-13 12:28:24',
'modified_by': u'Administrator', 'modified_by': u'Administrator',
'owner': u'Administrator' 'owner': u'Administrator'
}, },
@ -25,7 +25,7 @@
'show_in_menu': 0, 'show_in_menu': 0,
'subject': u' ', 'subject': u' ',
'tag_fields': u'voucher_type', 'tag_fields': u'voucher_type',
'version': 311 'version': 312
}, },
# These values are common for all DocField # These values are common for all DocField
@ -53,30 +53,6 @@
'name': u'Journal Voucher' 'name': u'Journal Voucher'
}, },
# DocPerm
{
'amend': 1,
'cancel': 1,
'create': 1,
'doctype': u'DocPerm',
'permlevel': 0,
'role': u'Accounts User',
'submit': 1,
'write': 1
},
# DocPerm
{
'amend': 0,
'cancel': 0,
'create': 0,
'doctype': u'DocPerm',
'permlevel': 1,
'role': u'Accounts User',
'submit': 0,
'write': 0
},
# DocPerm # DocPerm
{ {
'amend': 0, 'amend': 0,
@ -101,6 +77,30 @@
'write': 1 'write': 1
}, },
# DocPerm
{
'amend': 1,
'cancel': 1,
'create': 1,
'doctype': u'DocPerm',
'permlevel': 0,
'role': u'Accounts User',
'submit': 1,
'write': 1
},
# DocPerm
{
'amend': 0,
'cancel': 0,
'create': 0,
'doctype': u'DocPerm',
'permlevel': 1,
'role': u'Accounts User',
'submit': 0,
'write': 0
},
# DocField # DocField
{ {
'doctype': u'DocField', 'doctype': u'DocField',
@ -526,7 +526,7 @@
'doctype': u'DocField', 'doctype': u'DocField',
'fieldname': u'pay_to_recd_from', 'fieldname': u'pay_to_recd_from',
'fieldtype': u'Data', 'fieldtype': u'Data',
'hidden': 0, 'hidden': 1,
'label': u'Pay To / Recd From', 'label': u'Pay To / Recd From',
'no_copy': 1, 'no_copy': 1,
'permlevel': 0, 'permlevel': 0,
@ -539,7 +539,7 @@
'doctype': u'DocField', 'doctype': u'DocField',
'fieldname': u'total_amount', 'fieldname': u'total_amount',
'fieldtype': u'Data', 'fieldtype': u'Data',
'hidden': 0, 'hidden': 1,
'label': u'Total Amount', 'label': u'Total Amount',
'no_copy': 1, 'no_copy': 1,
'permlevel': 1, 'permlevel': 1,
@ -552,7 +552,7 @@
'doctype': u'DocField', 'doctype': u'DocField',
'fieldname': u'total_amount_in_words', 'fieldname': u'total_amount_in_words',
'fieldtype': u'Data', 'fieldtype': u'Data',
'hidden': 0, 'hidden': 1,
'label': u'Total Amount in Words', 'label': u'Total Amount in Words',
'no_copy': 1, 'no_copy': 1,
'permlevel': 1, 'permlevel': 1,