From 3abe9bd01899f2c76f8bac886bd907233e8fe46f Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Fri, 13 Apr 2012 12:36:44 +0530 Subject: [PATCH] fixes in fieldnames and hide unnecessary fields in jv --- erpnext/accounts/doctype/account/account.js | 6 +- .../journal_voucher/journal_voucher.txt | 60 +++++++++---------- 2 files changed, 33 insertions(+), 33 deletions(-) diff --git a/erpnext/accounts/doctype/account/account.js b/erpnext/accounts/doctype/account/account.js index 640e2a9c22..501ae40720 100644 --- a/erpnext/accounts/doctype/account/account.js +++ b/erpnext/accounts/doctype/account/account.js @@ -33,9 +33,9 @@ cur_frm.cscript.onload = function(doc, cdt, cdn) { // hide India specific fields var cp = wn.control_panel; if(cp.country == 'India') - unhide_field(['pan_number', 'tds_applicable', 'tds_details', 'TDS']); + unhide_field(['pan_number', 'tds_applicable', 'tds_details', 'tds']); else - hide_field(['pan_number', 'tds_applicable', 'tds_details', 'TDS']); + hide_field(['pan_number', 'tds_applicable', 'tds_details', 'tds']); } // Refresh @@ -50,7 +50,7 @@ cur_frm.cscript.refresh = function(doc, cdt, cdn) { // Hide/unhide group or ledger // ----------------------------------------- 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'); else if (cstr(doc.group_or_ledger) == 'Ledger') unhide_field('convert_to_ledger'); } diff --git a/erpnext/accounts/doctype/journal_voucher/journal_voucher.txt b/erpnext/accounts/doctype/journal_voucher/journal_voucher.txt index dedd2f916a..97055f3be0 100644 --- a/erpnext/accounts/doctype/journal_voucher/journal_voucher.txt +++ b/erpnext/accounts/doctype/journal_voucher/journal_voucher.txt @@ -3,9 +3,9 @@ # These values are common in all dictionaries { - 'creation': '2012-03-27 14:35:43', + 'creation': '2012-04-13 11:55:50', 'docstatus': 0, - 'modified': '2012-03-27 14:45:48', + 'modified': '2012-04-13 12:28:24', 'modified_by': u'Administrator', 'owner': u'Administrator' }, @@ -25,7 +25,7 @@ 'show_in_menu': 0, 'subject': u' ', 'tag_fields': u'voucher_type', - 'version': 311 + 'version': 312 }, # These values are common for all DocField @@ -53,30 +53,6 @@ '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 { 'amend': 0, @@ -101,6 +77,30 @@ '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 { 'doctype': u'DocField', @@ -526,7 +526,7 @@ 'doctype': u'DocField', 'fieldname': u'pay_to_recd_from', 'fieldtype': u'Data', - 'hidden': 0, + 'hidden': 1, 'label': u'Pay To / Recd From', 'no_copy': 1, 'permlevel': 0, @@ -539,7 +539,7 @@ 'doctype': u'DocField', 'fieldname': u'total_amount', 'fieldtype': u'Data', - 'hidden': 0, + 'hidden': 1, 'label': u'Total Amount', 'no_copy': 1, 'permlevel': 1, @@ -552,7 +552,7 @@ 'doctype': u'DocField', 'fieldname': u'total_amount_in_words', 'fieldtype': u'Data', - 'hidden': 0, + 'hidden': 1, 'label': u'Total Amount in Words', 'no_copy': 1, 'permlevel': 1,