diff --git a/accounts/Module Def/Accounts/Accounts.txt b/accounts/Module Def/Accounts/Accounts.txt index 708a2c942f..bd3cbbf7fd 100644 --- a/accounts/Module Def/Accounts/Accounts.txt +++ b/accounts/Module Def/Accounts/Accounts.txt @@ -5,7 +5,7 @@ { 'creation': '2010-09-25 10:50:34', 'docstatus': 0, - 'modified': '2011-07-15 10:43:04', + 'modified': '2011-07-26 18:14:48', 'modified_by': 'Administrator', 'owner': 'Administrator' }, @@ -40,7 +40,7 @@ 'module_icon': 'Accounts.gif', 'module_label': 'Accounts', 'module_name': 'Accounts', - 'module_seq': 5, + 'module_seq': 3, 'name': '__common__' }, @@ -107,8 +107,9 @@ # Module Def Item { - 'display_name': 'Loan', - 'doc_name': 'Loan', + 'description': 'Lease Agreement for Vehicles', + 'display_name': 'Lease Agreement', + 'doc_name': 'Lease Agreement', 'doc_type': 'Forms', 'doctype': 'Module Def Item', 'idx': 6 @@ -354,6 +355,15 @@ 'idx': 32 }, + # Module Def Item + { + 'display_name': 'Lease Agreement List', + 'doc_name': 'Lease Agreement List', + 'doc_type': 'Reports', + 'doctype': 'Module Def Item', + 'idx': 33 + }, + # Module Def Role { 'doctype': 'Module Def Role', diff --git a/accounts/search_criteria/accounts_receivable/accounts_receivable.js b/accounts/search_criteria/accounts_receivable/accounts_receivable.js index a51b8fb9c9..f31dc762a8 100644 --- a/accounts/search_criteria/accounts_receivable/accounts_receivable.js +++ b/accounts/search_criteria/accounts_receivable/accounts_receivable.js @@ -5,8 +5,8 @@ report.customize_filters = function() { this.filter_fields_dict['GL Entry'+FILTER_SEP +'From Posting Date'].df.filter_hide = 0; this.filter_fields_dict['GL Entry'+FILTER_SEP +'To Posting Date'].df.filter_hide = 0; this.filter_fields_dict['GL Entry'+FILTER_SEP +'Account'].df.filter_hide = 0; - - this.add_filter({fieldname:'aging_based_on', label:'Aging Based On', fieldtype:'Select', options:NEWLINE+'Transaction Date'+NEWLINE+'Aging Date'+NEWLINE+'Due Date',ignore : 1, parent:'Receivable Voucher', report_default:'Aging Date'}); + + this.add_filter({fieldname:'aging_based_on', label:'Aging Based On', fieldtype:'Select', options:NEWLINE+'Transaction Date'+NEWLINE+'Aging Date'+NEWLINE+'Due Date',ignore : 1, parent:'Receivable Voucher', report_default:'Aging Date'}); this.add_filter({fieldname:'range_1', label:'Range 1', fieldtype:'Data', ignore : 1, parent:'GL Entry'}); this.add_filter({fieldname:'range_2', label:'Range 2', fieldtype:'Data', ignore : 1, parent:'GL Entry'}); this.add_filter({fieldname:'range_3', label:'Range 3', fieldtype:'Data', ignore : 1, parent:'GL Entry'}); @@ -19,4 +19,4 @@ report.customize_filters = function() { this.dt.set_no_limit(1); } -this.mytabs.items['Select Columns'].hide() \ No newline at end of file +//this.mytabs.items['Select Columns'].hide() \ No newline at end of file diff --git a/buying/search_criteria/pending_po_items_to_receive/pending_po_items_to_receive.py b/buying/search_criteria/pending_po_items_to_receive/pending_po_items_to_receive.py index 486cc6df85..159d3930b9 100644 --- a/buying/search_criteria/pending_po_items_to_receive/pending_po_items_to_receive.py +++ b/buying/search_criteria/pending_po_items_to_receive/pending_po_items_to_receive.py @@ -1,2 +1,3 @@ +msgprint(colwidths) colwidths[col_idx['Pending Quantity To Receive']] = '200px' colwidths[col_idx['Pending Amount To Receive']] = '200px' \ No newline at end of file