diff --git a/.gitignore b/.gitignore index e9c8fc66875..56149a0d5d3 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,5 @@ *.pyc *.comp.js -*.txt .DS_Store server_tools patch.log diff --git a/accounts/Module Def/Accounts/Accounts.txt b/accounts/Module Def/Accounts/Accounts.txt index 708a2c942f8..35e7e5d38d4 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-27 11:43:40', '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,69 @@ '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 Item + { + 'display_name': 'Lease Monthly Future Installment Inflows', + 'doc_name': 'Lease Monthly Future Installment Inflows', + 'doc_type': 'Reports', + 'doctype': 'Module Def Item', + 'idx': 34 + }, + + # Module Def Item + { + 'display_name': 'Lease Overdue Age Wise', + 'doc_name': 'Lease Overdue Age Wise', + 'doc_type': 'Reports', + 'doctype': 'Module Def Item', + 'idx': 35 + }, + + # Module Def Item + { + 'display_name': 'Lease Overdue List', + 'doc_name': 'Lease Overdue List', + 'doc_type': 'Reports', + 'doctype': 'Module Def Item', + 'idx': 36 + }, + + # Module Def Item + { + 'display_name': 'Lease Receipts Client Wise', + 'doc_name': 'Lease Receipts Client Wise', + 'doc_type': 'Reports', + 'doctype': 'Module Def Item', + 'idx': 37 + }, + + # Module Def Item + { + 'display_name': 'Lease Receipt Summary Year to Date', + 'doc_name': 'Lease Receipt Summary Year to Date', + 'doc_type': 'Reports', + 'doctype': 'Module Def Item', + 'idx': 38 + }, + + # Module Def Item + { + 'display_name': 'Lease Yearly Future Installment Inflows', + 'doc_name': 'Lease Yearly Future Installment Inflows', + 'doc_type': 'Reports', + 'doctype': 'Module Def Item', + 'idx': 39 + }, + # Module Def Role { 'doctype': 'Module Def Role', diff --git a/accounts/doctype/account/account.txt b/accounts/doctype/account/account.txt index 9ce509c1785..b29c61782fd 100644 --- a/accounts/doctype/account/account.txt +++ b/accounts/doctype/account/account.txt @@ -12,7 +12,7 @@ # These values are common for all DocType { - '_last_update': '1308829300', + '_last_update': '1309508836', 'allow_copy': 1, 'allow_trash': 1, 'colour': 'White:FFF', @@ -179,7 +179,7 @@ 'oldfieldtype': 'Data', 'permlevel': 1, 'reqd': 1, - 'search_index': 1 + 'search_index': 0 }, # DocField @@ -225,7 +225,7 @@ 'options': '\nLedger\nGroup', 'permlevel': 1, 'reqd': 1, - 'search_index': 1 + 'search_index': 0 }, # DocField @@ -259,7 +259,7 @@ 'oldfieldname': 'debit_or_credit', 'oldfieldtype': 'Data', 'permlevel': 1, - 'search_index': 1 + 'search_index': 0 }, # DocField @@ -274,7 +274,7 @@ 'oldfieldtype': 'Select', 'options': 'Yes\nNo', 'permlevel': 1, - 'search_index': 1 + 'search_index': 0 }, # DocField @@ -344,7 +344,7 @@ 'options': 'Company', 'permlevel': 1, 'reqd': 1, - 'search_index': 1 + 'search_index': 0 }, # DocField diff --git a/accounts/doctype/account_balance/account_balance.txt b/accounts/doctype/account_balance/account_balance.txt index a53def25be1..1d23bb2fa1e 100644 --- a/accounts/doctype/account_balance/account_balance.txt +++ b/accounts/doctype/account_balance/account_balance.txt @@ -174,7 +174,7 @@ 'oldfieldname': 'fiscal_year', 'oldfieldtype': 'Link', 'options': 'Fiscal Year', - 'search_index': 1 + 'search_index': 0 }, # DocField diff --git a/accounts/doctype/cost_center/cost_center.txt b/accounts/doctype/cost_center/cost_center.txt index ce39929003f..fab2dd5f4d1 100644 --- a/accounts/doctype/cost_center/cost_center.txt +++ b/accounts/doctype/cost_center/cost_center.txt @@ -182,6 +182,7 @@ 'options': 'Company', 'permlevel': 0, 'reqd': 1, + 'search_index': 0, 'trigger': 'Client' }, @@ -227,7 +228,8 @@ 'oldfieldname': 'distribution_id', 'oldfieldtype': 'Link', 'options': 'Budget Distribution', - 'permlevel': 0 + 'permlevel': 0, + 'search_index': 0 }, # DocField diff --git a/accounts/doctype/fiscal_year/fiscal_year.txt b/accounts/doctype/fiscal_year/fiscal_year.txt index fe02b343109..4a7f49ac828 100644 --- a/accounts/doctype/fiscal_year/fiscal_year.txt +++ b/accounts/doctype/fiscal_year/fiscal_year.txt @@ -182,7 +182,7 @@ 'oldfieldtype': 'Link', 'options': 'Company', 'permlevel': 0, - 'search_index': 1 + 'search_index': 0 }, # DocField diff --git a/accounts/doctype/gl_entry/gl_entry.txt b/accounts/doctype/gl_entry/gl_entry.txt index 7278c4d13ad..776cbb3decf 100644 --- a/accounts/doctype/gl_entry/gl_entry.txt +++ b/accounts/doctype/gl_entry/gl_entry.txt @@ -12,7 +12,7 @@ # These values are common for all DocType { - '_last_update': '1294312170', + '_last_update': '1309508838', 'autoname': 'GL.#######', 'colour': 'White:FFF', 'doctype': 'DocType', @@ -119,7 +119,7 @@ 'label': 'Aging Date', 'oldfieldname': 'aging_date', 'oldfieldtype': 'Date', - 'search_index': 1 + 'search_index': 0 }, # DocField @@ -221,7 +221,7 @@ 'oldfieldname': 'voucher_type', 'oldfieldtype': 'Select', 'options': 'Journal Voucher\nReceivable Voucher\nPayable Voucher', - 'search_index': 1 + 'search_index': 0 }, # DocField @@ -262,7 +262,7 @@ 'oldfieldname': 'is_cancelled', 'oldfieldtype': 'Select', 'options': 'No\nYes', - 'search_index': 1 + 'search_index': 0 }, # DocField @@ -276,7 +276,7 @@ 'oldfieldname': 'is_opening', 'oldfieldtype': 'Select', 'options': 'No\nYes', - 'search_index': 1 + 'search_index': 0 }, # DocField @@ -304,7 +304,7 @@ 'oldfieldname': 'fiscal_year', 'oldfieldtype': 'Select', 'options': 'link:Fiscal Year', - 'search_index': 1 + 'search_index': 0 }, # DocField @@ -318,6 +318,6 @@ 'oldfieldname': 'company', 'oldfieldtype': 'Link', 'options': 'Company', - 'search_index': 1 + 'search_index': 0 } ] \ No newline at end of file diff --git a/accounts/doctype/journal_voucher/journal_voucher.txt b/accounts/doctype/journal_voucher/journal_voucher.txt deleted file mode 100644 index c40be8f7286..00000000000 --- a/accounts/doctype/journal_voucher/journal_voucher.txt +++ /dev/null @@ -1,802 +0,0 @@ -# DocType, Journal Voucher -[ - - # These values are common in all dictionaries - { - 'creation': '2010-08-08 17:09:06', - 'docstatus': 0, - 'modified': '2011-07-15 14:37:05', - 'modified_by': 'Administrator', - 'owner': 'Administrator' - }, - - # These values are common for all DocType - { - '_last_update': '1310533805', - 'colour': 'White:FFF', - 'doctype': 'DocType', - 'module': 'Accounts', - 'name': '__common__', - 'search_fields': 'voucher_type,posting_date, due_date, cheque_no', - 'section_style': 'Tabbed', - 'server_code_error': ' ', - 'show_in_menu': 0, - 'subject': ' ', - 'tag_fields': 'voucher_type', - 'version': 308 - }, - - # These values are common for all DocField - { - 'doctype': 'DocField', - 'name': '__common__', - 'parent': 'Journal Voucher', - 'parentfield': 'fields', - 'parenttype': 'DocType' - }, - - # These values are common for all DocPerm - { - 'doctype': 'DocPerm', - 'name': '__common__', - 'parent': 'Journal Voucher', - 'parentfield': 'permissions', - 'parenttype': 'DocType', - 'read': 1 - }, - - # DocType, Journal Voucher - { - 'doctype': 'DocType', - 'name': 'Journal Voucher' - }, - - # DocPerm - { - 'amend': 0, - 'cancel': 0, - 'create': 0, - 'doctype': 'DocPerm', - 'idx': 1, - 'permlevel': 1, - 'role': 'Accounts Manager', - 'submit': 0, - 'write': 0 - }, - - # DocPerm - { - 'amend': 1, - 'cancel': 1, - 'create': 1, - 'doctype': 'DocPerm', - 'idx': 2, - 'permlevel': 0, - 'role': 'Accounts Manager', - 'submit': 1, - 'write': 1 - }, - - # DocPerm - { - 'amend': 1, - 'cancel': 1, - 'create': 1, - 'doctype': 'DocPerm', - 'idx': 3, - 'permlevel': 0, - 'role': 'Accounts User', - 'submit': 1, - 'write': 1 - }, - - # DocPerm - { - 'amend': 0, - 'cancel': 0, - 'create': 0, - 'doctype': 'DocPerm', - 'idx': 4, - 'permlevel': 1, - 'role': 'Accounts User', - 'submit': 0, - 'write': 0 - }, - - # DocField - { - 'doctype': 'DocField', - 'fieldtype': 'Section Break', - 'idx': 1, - 'label': 'Basic Info', - 'oldfieldtype': 'Section Break', - 'permlevel': 0 - }, - - # DocField - { - 'doctype': 'DocField', - 'fieldtype': 'Section Break', - 'idx': 2, - 'label': '1. Select Series and Dates', - 'oldfieldtype': 'Section Break', - 'options': 'Simple', - 'permlevel': 0 - }, - - # DocField - { - 'doctype': 'DocField', - 'fieldtype': 'Column Break', - 'idx': 3, - 'oldfieldtype': 'Column Break', - 'permlevel': 0, - 'width': '50%' - }, - - # DocField - { - 'doctype': 'DocField', - 'fieldname': 'voucher_type', - 'fieldtype': 'Select', - 'idx': 4, - 'in_filter': 1, - 'label': 'Voucher Type', - 'oldfieldname': 'voucher_type', - 'oldfieldtype': 'Select', - 'options': '\nJournal Entry\nBank Voucher\nCash Voucher\nCredit Card Voucher\nDebit Note\nCredit Note\nContra Voucher\nExcise Voucher\nWrite Off Voucher\nLoan Receipt', - 'permlevel': 0, - 'print_hide': 0, - 'search_index': 1 - }, - - # DocField - { - 'colour': 'White:FFF', - 'depends_on': "eval:doc.voucher_type == 'Write Off Voucher'", - 'doctype': 'DocField', - 'fieldname': 'write_off_amount', - 'fieldtype': 'Currency', - 'idx': 5, - 'label': 'Write Off Amount <=', - 'permlevel': 0, - 'print_hide': 1, - 'report_hide': 1 - }, - - # DocField - { - 'colour': 'White:FFF', - 'default': 'Accounts Receivable', - 'depends_on': "eval:doc.voucher_type == 'Write Off Voucher'", - 'doctype': 'DocField', - 'fieldname': 'write_off_based_on', - 'fieldtype': 'Select', - 'idx': 6, - 'label': 'Write Off Based On', - 'options': 'Accounts Receivable\nAccounts Payable', - 'permlevel': 0, - 'print_hide': 1, - 'report_hide': 1 - }, - - # DocField - { - 'colour': 'White:FFF', - 'description': 'To manage multiple series please go to Setup > Manage Series', - 'doctype': 'DocField', - 'fieldname': 'naming_series', - 'fieldtype': 'Select', - 'idx': 7, - 'label': 'Series', - 'no_copy': 1, - 'oldfieldname': 'naming_series', - 'oldfieldtype': 'Select', - 'options': 'JV', - 'permlevel': 0, - 'print_hide': 1, - 'reqd': 1 - }, - - # DocField - { - 'colour': 'White:FFF', - 'default': 'Today', - 'doctype': 'DocField', - 'fieldname': 'voucher_date', - 'fieldtype': 'Date', - 'idx': 8, - 'in_filter': 1, - 'label': 'Voucher Date', - 'no_copy': 1, - 'oldfieldname': 'voucher_date', - 'oldfieldtype': 'Date', - 'permlevel': 0, - 'print_hide': 0, - 'reqd': 1, - 'search_index': 1 - }, - - # DocField - { - 'description': 'The date at which current entry will get or has actually executed.', - 'doctype': 'DocField', - 'fieldname': 'posting_date', - 'fieldtype': 'Date', - 'idx': 9, - 'in_filter': 1, - 'label': 'Posting Date', - 'no_copy': 1, - 'oldfieldname': 'posting_date', - 'oldfieldtype': 'Date', - 'permlevel': 0, - 'reqd': 1, - 'search_index': 1 - }, - - # DocField - { - 'doctype': 'DocField', - 'fieldname': 'due_date', - 'fieldtype': 'Date', - 'idx': 10, - 'label': 'Due Date', - 'oldfieldname': 'due_date', - 'oldfieldtype': 'Date', - 'permlevel': 0, - 'print_hide': 0 - }, - - # DocField - { - 'description': 'The date at which current entry is corrected in the system.', - 'doctype': 'DocField', - 'fieldname': 'amendment_date', - 'fieldtype': 'Date', - 'idx': 11, - 'label': 'Amendment Date', - 'no_copy': 1, - 'oldfieldname': 'amendment_date', - 'oldfieldtype': 'Date', - 'permlevel': 0, - 'print_hide': 1 - }, - - # DocField - { - 'doctype': 'DocField', - 'fieldname': 'amended_from', - 'fieldtype': 'Link', - 'idx': 12, - 'label': 'Amended From', - 'no_copy': 1, - 'oldfieldname': 'amended_from', - 'oldfieldtype': 'Link', - 'options': 'Journal Voucher', - 'permlevel': 1, - 'print_hide': 1 - }, - - # DocField - { - 'colour': 'White:FFF', - 'depends_on': "eval:doc.voucher_type == 'Write Off Voucher'", - 'doctype': 'DocField', - 'fieldtype': 'Button', - 'idx': 13, - 'label': 'Get Outstanding Invoices', - 'options': 'get_outstanding_invoices', - 'permlevel': 0, - 'print_hide': 1, - 'trigger': 'Server' - }, - - # DocField - { - 'doctype': 'DocField', - 'fieldtype': 'Column Break', - 'idx': 14, - 'oldfieldtype': 'Column Break', - 'permlevel': 0, - 'width': '50%' - }, - - # DocField - { - 'doctype': 'DocField', - 'fieldname': 'cheque_no', - 'fieldtype': 'Data', - 'idx': 15, - 'in_filter': 1, - 'label': 'Cheque No', - 'no_copy': 1, - 'oldfieldname': 'cheque_no', - 'oldfieldtype': 'Data', - 'permlevel': 0, - 'search_index': 1 - }, - - # DocField - { - 'doctype': 'DocField', - 'fieldname': 'cheque_date', - 'fieldtype': 'Date', - 'idx': 16, - 'label': 'Cheque Date', - 'no_copy': 1, - 'oldfieldname': 'cheque_date', - 'oldfieldtype': 'Date', - 'permlevel': 0 - }, - - # DocField - { - 'doctype': 'DocField', - 'fieldname': 'clearance_date', - 'fieldtype': 'Date', - 'idx': 17, - 'in_filter': 1, - 'label': 'Clearance Date', - 'no_copy': 1, - 'oldfieldname': 'clearance_date', - 'oldfieldtype': 'Date', - 'permlevel': 1, - 'print_hide': 0, - 'search_index': 1 - }, - - # DocField - { - 'doctype': 'DocField', - 'fieldname': 'user_remark', - 'fieldtype': 'Small Text', - 'idx': 18, - 'in_filter': 1, - 'label': 'User Remark', - 'no_copy': 1, - 'oldfieldname': 'user_remark', - 'oldfieldtype': 'Small Text', - 'permlevel': 0 - }, - - # DocField - { - 'description': 'User Remark will be added to Auto Remark', - 'doctype': 'DocField', - 'fieldname': 'remark', - 'fieldtype': 'Small Text', - 'idx': 19, - 'label': 'Remark', - 'no_copy': 1, - 'oldfieldname': 'remark', - 'oldfieldtype': 'Small Text', - 'permlevel': 1, - 'reqd': 0 - }, - - # DocField - { - 'doctype': 'DocField', - 'fieldtype': 'Section Break', - 'idx': 20, - 'label': '2. Add / Edit GL Entries', - 'oldfieldtype': 'Section Break', - 'options': 'Simple', - 'permlevel': 0 - }, - - # DocField - { - 'doctype': 'DocField', - 'fieldname': 'entries', - 'fieldtype': 'Table', - 'idx': 21, - 'label': 'Entries', - 'oldfieldname': 'entries', - 'oldfieldtype': 'Table', - 'options': 'Journal Voucher Detail', - 'permlevel': 0, - 'print_hide': 0 - }, - - # DocField - { - 'doctype': 'DocField', - 'fieldtype': 'Button', - 'idx': 22, - 'label': 'Get Balance', - 'oldfieldtype': 'Button', - 'permlevel': 0, - 'trigger': 'Client' - }, - - # DocField - { - 'doctype': 'DocField', - 'fieldname': 'total_debit', - 'fieldtype': 'Currency', - 'idx': 23, - 'in_filter': 1, - 'label': 'Total Debit', - 'no_copy': 1, - 'oldfieldname': 'total_debit', - 'oldfieldtype': 'Currency', - 'permlevel': 1 - }, - - # DocField - { - 'doctype': 'DocField', - 'fieldname': 'total_credit', - 'fieldtype': 'Currency', - 'idx': 24, - 'in_filter': 1, - 'label': 'Total Credit', - 'no_copy': 1, - 'oldfieldname': 'total_credit', - 'oldfieldtype': 'Currency', - 'permlevel': 1 - }, - - # DocField - { - 'doctype': 'DocField', - 'fieldname': 'difference', - 'fieldtype': 'Currency', - 'idx': 25, - 'label': 'Difference', - 'no_copy': 1, - 'oldfieldname': 'difference', - 'oldfieldtype': 'Currency', - 'permlevel': 1, - 'print_hide': 1 - }, - - # DocField - { - 'doctype': 'DocField', - 'fieldtype': 'Section Break', - 'idx': 26, - 'label': 'Addtional Info', - 'oldfieldtype': 'Section Break', - 'permlevel': 0 - }, - - # DocField - { - 'doctype': 'DocField', - 'fieldtype': 'Column Break', - 'idx': 27, - 'oldfieldtype': 'Column Break', - 'permlevel': 0, - 'width': '50%' - }, - - # DocField - { - 'doctype': 'DocField', - 'fieldname': 'bill_no', - 'fieldtype': 'Data', - 'idx': 28, - 'label': 'Bill No', - 'oldfieldname': 'bill_no', - 'oldfieldtype': 'Data', - 'permlevel': 0, - 'print_hide': 1 - }, - - # DocField - { - 'doctype': 'DocField', - 'fieldname': 'bill_date', - 'fieldtype': 'Date', - 'idx': 29, - 'label': 'Bill Date', - 'oldfieldname': 'bill_date', - 'oldfieldtype': 'Date', - 'permlevel': 0, - 'print_hide': 1 - }, - - # DocField - { - 'colour': 'White:FFF', - 'default': 'No', - 'doctype': 'DocField', - 'fieldname': 'is_opening', - 'fieldtype': 'Select', - 'idx': 30, - 'in_filter': 1, - 'label': 'Is Opening', - 'oldfieldname': 'is_opening', - 'oldfieldtype': 'Select', - 'options': 'No\nYes', - 'permlevel': 0, - 'print_hide': 1, - 'search_index': 1, - 'trigger': 'Client' - }, - - # DocField - { - 'doctype': 'DocField', - 'fieldname': 'aging_date', - 'fieldtype': 'Date', - 'idx': 31, - 'label': 'Aging Date', - 'no_copy': 0, - 'oldfieldname': 'aging_date', - 'oldfieldtype': 'Date', - 'permlevel': 0, - 'print_hide': 1 - }, - - # DocField - { - 'doctype': 'DocField', - 'fieldname': 'cancel_reason', - 'fieldtype': 'Data', - 'idx': 32, - 'label': 'Cancel Reason', - 'no_copy': 1, - 'oldfieldname': 'cancel_reason', - 'oldfieldtype': 'Data', - 'permlevel': 1, - 'print_hide': 1 - }, - - # DocField - { - 'doctype': 'DocField', - 'fieldname': 'pay_to_recd_from', - 'fieldtype': 'Data', - 'hidden': 0, - 'idx': 33, - 'label': 'Pay To / Recd From', - 'no_copy': 1, - 'permlevel': 0, - 'print_hide': 1, - 'report_hide': 1 - }, - - # DocField - { - 'doctype': 'DocField', - 'fieldname': 'total_amount', - 'fieldtype': 'Data', - 'hidden': 0, - 'idx': 34, - 'label': 'Total Amount', - 'no_copy': 1, - 'permlevel': 1, - 'print_hide': 1, - 'report_hide': 1 - }, - - # DocField - { - 'doctype': 'DocField', - 'fieldname': 'total_amount_in_words', - 'fieldtype': 'Data', - 'hidden': 0, - 'idx': 35, - 'label': 'Total Amount in Words', - 'no_copy': 1, - 'permlevel': 1, - 'print_hide': 1, - 'report_hide': 1 - }, - - # DocField - { - 'doctype': 'DocField', - 'fieldtype': 'Column Break', - 'idx': 36, - 'oldfieldtype': 'Column Break', - 'permlevel': 0, - 'width': '50%' - }, - - # DocField - { - 'doctype': 'DocField', - 'fieldname': 'fiscal_year', - 'fieldtype': 'Select', - 'idx': 37, - 'in_filter': 1, - 'label': 'Fiscal Year', - 'oldfieldname': 'fiscal_year', - 'oldfieldtype': 'Select', - 'options': 'link:Fiscal Year', - 'permlevel': 0, - 'print_hide': 1, - 'reqd': 1, - 'search_index': 1 - }, - - # DocField - { - 'doctype': 'DocField', - 'fieldname': 'company', - 'fieldtype': 'Link', - 'idx': 38, - 'in_filter': 1, - 'label': 'Company', - 'oldfieldname': 'company', - 'oldfieldtype': 'Link', - 'options': 'Company', - 'permlevel': 0, - 'print_hide': 1, - 'reqd': 1, - 'search_index': 1 - }, - - # DocField - { - 'allow_on_submit': 1, - 'colour': 'White:FFF', - 'doctype': 'DocField', - 'fieldname': 'select_print_heading', - 'fieldtype': 'Link', - 'idx': 39, - 'label': 'Select Print Heading', - 'no_copy': 1, - 'oldfieldname': 'select_print_heading', - 'oldfieldtype': 'Link', - 'options': 'Print Heading', - 'permlevel': 0, - 'print_hide': 1, - 'report_hide': 1, - 'trigger': 'Client' - }, - - # DocField - { - 'doctype': 'DocField', - 'fieldtype': 'Section Break', - 'idx': 40, - 'oldfieldtype': 'Section Break', - 'options': 'Simple', - 'permlevel': 0 - }, - - # DocField - { - 'allow_on_submit': 1, - 'doctype': 'DocField', - 'fieldtype': 'Button', - 'idx': 41, - 'label': 'View Ledger Entry', - 'oldfieldtype': 'Button', - 'permlevel': 0, - 'print_hide': 1, - 'trigger': 'Client' - }, - - # DocField - { - 'doctype': 'DocField', - 'fieldtype': 'Section Break', - 'idx': 42, - 'label': 'TDS', - 'oldfieldtype': 'Section Break', - 'permlevel': 0, - 'print_hide': 0 - }, - - # DocField - { - 'default': 'No', - 'doctype': 'DocField', - 'fieldname': 'tds_applicable', - 'fieldtype': 'Select', - 'idx': 43, - 'in_filter': 1, - 'label': 'TDS Applicable', - 'no_copy': 1, - 'oldfieldname': 'tds_applicable', - 'oldfieldtype': 'Select', - 'options': '\nYes\nNo', - 'permlevel': 0, - 'print_hide': 1, - 'search_index': 1 - }, - - # DocField - { - 'colour': 'White:FFF', - 'doctype': 'DocField', - 'fieldname': 'tds_category', - 'fieldtype': 'Select', - 'hidden': 0, - 'idx': 44, - 'in_filter': 1, - 'label': 'TDS Category', - 'no_copy': 1, - 'oldfieldname': 'tds_category', - 'oldfieldtype': 'Select', - 'options': 'link:TDS Category', - 'permlevel': 0, - 'print_hide': 1, - 'search_index': 1, - 'trigger': 'Client' - }, - - # DocField - { - 'colour': 'White:FFF', - 'doctype': 'DocField', - 'fieldname': 'supplier_account', - 'fieldtype': 'Link', - 'hidden': 0, - 'idx': 45, - 'label': 'Supplier Account', - 'no_copy': 1, - 'oldfieldname': 'supplier_account', - 'oldfieldtype': 'Link', - 'options': 'Account', - 'permlevel': 0, - 'print_hide': 1, - 'trigger': 'Client' - }, - - # DocField - { - 'colour': 'White:FFF', - 'doctype': 'DocField', - 'fieldtype': 'Button', - 'idx': 46, - 'label': 'Get TDS', - 'no_copy': 0, - 'oldfieldtype': 'Button', - 'permlevel': 0, - 'trigger': 'Client' - }, - - # DocField - { - 'colour': 'White:FFF', - 'description': 'Tax Code will be populated based on account head mentioned in TDS Category master', - 'doctype': 'DocField', - 'fieldname': 'tax_code', - 'fieldtype': 'Link', - 'idx': 47, - 'label': 'TDS Account Head', - 'no_copy': 1, - 'oldfieldname': 'tax_code', - 'oldfieldtype': 'Link', - 'options': 'Account', - 'permlevel': 0, - 'print_hide': 1 - }, - - # DocField - { - 'doctype': 'DocField', - 'fieldname': 'rate', - 'fieldtype': 'Currency', - 'idx': 48, - 'label': 'Rate', - 'no_copy': 1, - 'oldfieldname': 'rate', - 'oldfieldtype': 'Currency', - 'permlevel': 0, - 'print_hide': 1, - 'trigger': 'Client' - }, - - # DocField - { - 'doctype': 'DocField', - 'fieldname': 'ded_amount', - 'fieldtype': 'Currency', - 'idx': 49, - 'label': 'Amount', - 'no_copy': 1, - 'oldfieldname': 'ded_amount', - 'oldfieldtype': 'Currency', - 'permlevel': 0, - 'print_hide': 1, - 'trigger': 'Client' - } -] \ No newline at end of file diff --git a/accounts/doctype/journal_voucher_detail/journal_voucher_detail.txt b/accounts/doctype/journal_voucher_detail/journal_voucher_detail.txt index 39da0841f72..4a350c21f4b 100644 --- a/accounts/doctype/journal_voucher_detail/journal_voucher_detail.txt +++ b/accounts/doctype/journal_voucher_detail/journal_voucher_detail.txt @@ -69,7 +69,7 @@ 'oldfieldtype': 'Link', 'options': 'Cost Center', 'permlevel': 0, - 'search_index': 1, + 'search_index': 0, 'width': '180px' }, diff --git a/accounts/doctype/lease_agreement/__init__.py b/accounts/doctype/lease_agreement/__init__.py new file mode 100644 index 00000000000..e69de29bb2d diff --git a/accounts/doctype/lease_agreement/lease_agreement.js b/accounts/doctype/lease_agreement/lease_agreement.js new file mode 100644 index 00000000000..8c681a11b26 --- /dev/null +++ b/accounts/doctype/lease_agreement/lease_agreement.js @@ -0,0 +1,66 @@ +$.extend(cur_frm.cscript, { + Generate: function(doc, dt, dn) { + cur_frm.cscript.clear_installments(doc); + tot=0;i=0; + while(tot 600 and from_export == 0: - msgprint("This is a very large report and cannot be shown in the browser as it is likely to make your browser very slow.Please select Account or click on 'Export' to open in excel") - raise Exception +if len(res) > 600 and from_export == 0: + msgprint("This is a very large report and cannot be shown in the browser as it is likely to make your browser very slow.Please select Account or click on 'Export' to open in excel") + raise Exception # ------------------------------------------------------------------ # main loop starts here # ------------------------------------------------------------------ +# get supplier type +supp_type_dict = {} +for each in sql("select t2.name, t1.supplier_type from tabSupplier t1, tabAccount t2 where t1.name = t2.account_name group by t2.name"): + supp_type_dict[each[0]] = each[1] + +# get due_date, bill_no, bill_date from PV +pv_dict = {} +for t in sql("select name, due_date, bill_no, bill_date from `tabPayable Voucher` group by name"): + pv_dict[t[0]] = [cstr(t[1]), t[2], cstr(t[3])] + +# pv outside this period +pv_outside_period = [d[0] for d in sql("select distinct name from `tabPayable Voucher` where (posting_date < '%s' or posting_date > '%s') and docstatus = 1" % (from_date, to_date))] + + out = [] total_booking_amt, total_outstanding_amt = 0,0 for r in res: - # get supplier type - supplier_type = sql("select t1.supplier_type from tabSupplier t1, tabAccount t2 where t1.name = t2.account_name and t2.name = '%s'" % r[col_idx['Account']]) - r.append(supplier_type and cstr(supplier_type[0][0]) or '') + outstanding_amt, due_date, bill_no, bill_date, cond = 0, '','','', '' + booking_amt = r.pop(8) + + # supplier type + r.append(supp_type_dict.get(r[col_idx['Account']], '')) + + # if entry against Payable Voucher + if r[col_idx['Against Voucher']] and r[col_idx['Voucher Type']] == 'Payable Voucher': + r += pv_dict.get(r[col_idx['Voucher No']], ['', '', '']) + cond = " and ifnull(against_voucher, '') = '%s'" % r[col_idx['Against Voucher']] - outstanding_amt, booking_amt, due_date, bill_no, bill_date, cond = 0,0, '','','', '' + # if entry against JV & and not adjusted within period + elif r[col_idx['Against Voucher Type']] == 'Payable Voucher' and r[col_idx['Against Voucher']] in pv_outside_period: + booking_amt = 0 + cond = " and voucher_no = '%s' and ifnull(against_voucher, '') = '%s'" % (r[col_idx['Voucher No']], r[col_idx['Against Voucher']]) + + # if un-adjusted + elif not r[col_idx['Against Voucher']]: + booking_amt = 0 + cond = " and ((voucher_no = '%s' and ifnull(against_voucher, '') = '') or (ifnull(against_voucher, '') = '%s' and voucher_type = 'Journal Voucher'))" % (r[col_idx['Voucher No']], r[col_idx['Voucher No']]) - # if entry against Payable Voucher - if r[col_idx['Against Voucher']] and r[col_idx['Voucher Type']] == 'Payable Voucher': - due_date, bill_no, bill_date = [cstr(t) for t in sql("select due_date,bill_no,bill_date from `tabPayable Voucher` where name = %s", r[col_idx['Voucher No']])[0]] + if cond: + outstanding_amt = flt(sql("select sum(ifnull(credit, 0))-sum(ifnull(debit, 0)) from `tabGL Entry` where account = '%s' and ifnull(is_cancelled, 'No') = 'No' and posting_date <= '%s' %s" % (r[col_idx['Account']], to_date, cond))[0][0] or 0) - # get opening - booking_amt = sql("select credit from `tabGL Entry` where account = %s and voucher_no = %s and is_cancelled = 'No'", (r[col_idx['Account']], r[col_idx['Voucher No']])) - booking_amt = booking_amt and flt(booking_amt[0][0]) or 0 + # add to total outstanding + total_outstanding_amt += flt(outstanding_amt) - cond = " and against_voucher = '%s' and against_voucher is not null" % r[col_idx['Against Voucher']] + # add to total booking amount + if outstanding_amt and r[col_idx['Voucher Type']] == 'Payable Voucher' and r[col_idx['Against Voucher']]: + total_booking_amt += flt(booking_amt) - # if entry against JV & and not adjusted within period - elif r[col_idx['Against Voucher Type']] == 'Payable Voucher' and sql("select name from `tabPayable Voucher` where name = '%s' and (posting_date < '%s' or posting_date > '%s') and docstatus = 1" % (r[col_idx['Against Voucher']], from_date, to_date)): - cond = " and voucher_no = '%s' and ifnull(against_voucher, '') = '%s'" % (r[col_idx['Voucher No']], r[col_idx['Against Voucher']]) - - # if un-adjusted - elif not r[col_idx['Against Voucher']]: - cond = " and ((voucher_no = '%s' and ifnull(against_voucher, '') = '') or (ifnull(against_voucher, '') = '%s' and voucher_type = 'Journal Voucher'))" % (r[col_idx['Voucher No']], r[col_idx['Voucher No']]) + r += [booking_amt, outstanding_amt] + + # split into date ranges + val_l1 = val_l2 = val_l3 = val_l4 = val_l5_above= 0 + if r[col_idx[aging_based_on]]: + diff = (getdate(to_date) - getdate(r[col_idx[aging_based_on]])).days + if diff < cint(filter_values['range_1']): + val_l1 = outstanding_amt + if diff >= cint(filter_values['range_1']) and diff < cint(filter_values['range_2']): + val_l2 = outstanding_amt + if diff >= cint(filter_values['range_2']) and diff < cint(filter_values['range_3']): + val_l3 = outstanding_amt + if diff >= cint(filter_values['range_3']) and diff < cint(filter_values['range_4']): + val_l4 = outstanding_amt + if diff >= cint(filter_values['range_4']): + val_l5_above = outstanding_amt - if cond: - outstanding_amt = flt(sql("select sum(ifnull(credit, 0))-sum(ifnull(debit, 0)) from `tabGL Entry` where account = '%s' and ifnull(is_cancelled, 'No') = 'No' and posting_date <= '%s' %s" % (r[col_idx['Account']], to_date, cond))[0][0] or 0) + r += [diff, val_l1, val_l2, val_l3, val_l4, val_l5_above] - # add to total outstanding - total_outstanding_amt += flt(outstanding_amt) - - # add to total booking amount - if outstanding_amt and r[col_idx['Voucher Type']] == 'Payable Voucher' and r[col_idx['Against Voucher']]: - total_booking_amt += flt(booking_amt) - - r += [due_date, bill_no, bill_date, booking_amt, outstanding_amt] - - # split into date ranges - val_l1 = val_l2 = val_l3 = val_l4 = val_l5_above= 0 - if r[col_idx[aging_based_on]]: - diff = (getdate(to_date) - getdate(r[col_idx[aging_based_on]])).days - if diff < cint(filter_values['range_1']): - val_l1 = outstanding_amt - if diff >= cint(filter_values['range_1']) and diff < cint(filter_values['range_2']): - val_l2 = outstanding_amt - if diff >= cint(filter_values['range_2']) and diff < cint(filter_values['range_3']): - val_l3 = outstanding_amt - if diff >= cint(filter_values['range_3']) and diff < cint(filter_values['range_4']): - val_l4 = outstanding_amt - if diff >= cint(filter_values['range_4']): - val_l5_above = outstanding_amt - - r += [diff, val_l1, val_l2, val_l3, val_l4, val_l5_above] - - # Only show that entry which has outstanding - if abs(flt(outstanding_amt)) > 0.001: - out.append(r) - -if len(out) > 300 and from_export == 0: - msgprint("This is a very large report and cannot be shown in the browser as it is likely to make your browser very slow.Please select Account or click on 'Export' to open in excel") - raise Exception + # Only show that entry which has outstanding + if abs(flt(outstanding_amt)) > 0.001: + out.append(r) + +if len(out) > 300 and from_export == 0: + msgprint("This is a very large report and cannot be shown in the browser as it is likely to make your browser very slow.Please select Account or click on 'Export' to open in excel") + raise Exception # Append Extra rows to RES diff --git a/accounts/search_criteria/accounts_payable/accounts_payable.sql b/accounts/search_criteria/accounts_payable/accounts_payable.sql index 520535f51f1..2054b1e7f0e 100644 --- a/accounts/search_criteria/accounts_payable/accounts_payable.sql +++ b/accounts/search_criteria/accounts_payable/accounts_payable.sql @@ -1,26 +1,11 @@ -SELECT * -FROM ( - -SELECT a.posting_date, a.voucher_no, a.account, a.credit AS inv_amount, ifnull( a.credit, 0 ) - ifnull( b.debit, 0 ) AS outstanding -FROM ( - -SELECT gl . * -FROM `tabGL Entry` gl, `tabAccount` acc -WHERE gl.account = acc.name -AND acc.master_type = 'Supplier' -AND ifnull( gl.is_cancelled, 'No' ) = 'No' -AND gl.credit >0 -AND gl.posting_date <= current_date -)a -LEFT JOIN ( - -SELECT against_voucher, account, sum( debit ) AS debit -FROM `tabGL Entry` -WHERE ifnull( is_cancelled, 'No' ) = 'No' -AND posting_date <= current_date -GROUP BY against_voucher, account -)b ON a.voucher_no = b.against_voucher -AND a.account = b.account -)c -WHERE outstanding !=0 -ORDER BY posting_date, voucher_no \ No newline at end of file +SELECT DISTINCT `tabGL Entry`.`Aging_date`,`tabGL Entry`.`transaction_date`,`tabGL Entry`.`account`, `tabGL Entry`.`against_voucher_type`, `tabGL Entry`.`against_voucher`,`tabGL Entry`.`voucher_type`,`tabGL Entry`.`voucher_no`, `tabGL Entry`.`remarks`, `tabGL Entry`.`credit` +FROM `tabGL Entry`,`tabAccount` +WHERE `tabGL Entry`.`posting_date`>= '%(posting_date)s' + AND `tabGL Entry`.`posting_date`<= '%(posting_date1)s' + AND `tabGL Entry`.`account` LIKE '%(account)s%%' + AND `tabGL Entry`.`company` LIKE '%(company)s%%' + AND ((ifnull(`tabGL Entry`.voucher_type,'') = 'Payable Voucher' and `tabGL Entry`.credit>0) OR `tabGL Entry`.voucher_type = 'Journal Voucher') + AND `tabGL Entry`.`is_cancelled` = 'No' + AND `tabAccount`.master_type = 'Supplier' + AND `tabAccount`.name = `tabGL Entry`.account + ORDER BY `tabGL Entry`.`posting_date` diff --git a/accounts/search_criteria/accounts_receivable/accounts_receivable.js b/accounts/search_criteria/accounts_receivable/accounts_receivable.js index a51b8fb9c9a..f31dc762a82 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/accounts/search_criteria/lease_agreement_list/__init__.py b/accounts/search_criteria/lease_agreement_list/__init__.py new file mode 100644 index 00000000000..e69de29bb2d diff --git a/accounts/search_criteria/lease_agreement_list/lease_agreement_list.txt b/accounts/search_criteria/lease_agreement_list/lease_agreement_list.txt new file mode 100644 index 00000000000..164da38af20 --- /dev/null +++ b/accounts/search_criteria/lease_agreement_list/lease_agreement_list.txt @@ -0,0 +1,30 @@ +# Search Criteria, lease_agreement_list +[ + + # These values are common in all dictionaries + { + 'creation': '2011-07-27 13:14:29', + 'docstatus': 0, + 'modified': '2011-07-27 13:14:29', + 'modified_by': 'Administrator', + 'owner': 'Administrator' + }, + + # These values are common for all Search Criteria + { + 'columns': 'GL Entry\x01ID,GL Entry\x01Owner,GL Entry\x01Posting Date,GL Entry\x01Aging Date,GL Entry\x01Account,GL Entry\x01Cost Center,GL Entry\x01Against,GL Entry\x01Against Voucher,GL Entry\x01Voucher Type,GL Entry\x01Voucher No,GL Entry\x01Remarks,GL Entry\x01Is Cancelled,GL Entry\x01Is Opening,GL Entry\x01Fiscal Year,GL Entry\x01Company', + 'criteria_name': 'Lease Agreement List', + 'doc_type': 'GL Entry', + 'doctype': 'Search Criteria', + 'filters': "{'GL Entry\x01Voucher Type':'','GL Entry\x01Is Cancelled':'','GL Entry\x01Is Opening':'','GL Entry\x01Fiscal Year':''}", + 'module': 'Accounts', + 'name': '__common__', + 'standard': 'Yes' + }, + + # Search Criteria, lease_agreement_list + { + 'doctype': 'Search Criteria', + 'name': 'lease_agreement_list' + } +] \ No newline at end of file diff --git a/accounts/search_criteria/lease_monthly_future_installment_inflows/__init__.py b/accounts/search_criteria/lease_monthly_future_installment_inflows/__init__.py new file mode 100644 index 00000000000..e69de29bb2d diff --git a/accounts/search_criteria/lease_monthly_future_installment_inflows/lease_monthly_future_installment_inflows.txt b/accounts/search_criteria/lease_monthly_future_installment_inflows/lease_monthly_future_installment_inflows.txt new file mode 100644 index 00000000000..a531bb9f276 --- /dev/null +++ b/accounts/search_criteria/lease_monthly_future_installment_inflows/lease_monthly_future_installment_inflows.txt @@ -0,0 +1,30 @@ +# Search Criteria, lease_monthly_future_installment_inflows +[ + + # These values are common in all dictionaries + { + 'creation': '2011-07-27 13:14:29', + 'docstatus': 0, + 'modified': '2011-07-27 13:14:29', + 'modified_by': 'Administrator', + 'owner': 'Administrator' + }, + + # These values are common for all Search Criteria + { + 'columns': 'GL Entry\x01ID,GL Entry\x01Owner,GL Entry\x01Posting Date,GL Entry\x01Aging Date,GL Entry\x01Account,GL Entry\x01Cost Center,GL Entry\x01Against,GL Entry\x01Against Voucher,GL Entry\x01Voucher Type,GL Entry\x01Voucher No,GL Entry\x01Remarks,GL Entry\x01Is Cancelled,GL Entry\x01Is Opening,GL Entry\x01Fiscal Year,GL Entry\x01Company', + 'criteria_name': 'Lease Monthly Future Installment Inflows', + 'doc_type': 'GL Entry', + 'doctype': 'Search Criteria', + 'filters': "{'GL Entry\x01Voucher Type':'','GL Entry\x01Is Cancelled':'','GL Entry\x01Is Opening':'','GL Entry\x01Fiscal Year':''}", + 'module': 'Accounts', + 'name': '__common__', + 'standard': 'Yes' + }, + + # Search Criteria, lease_monthly_future_installment_inflows + { + 'doctype': 'Search Criteria', + 'name': 'lease_monthly_future_installment_inflows' + } +] \ No newline at end of file diff --git a/accounts/search_criteria/lease_over_due_list/__init__.py b/accounts/search_criteria/lease_over_due_list/__init__.py new file mode 100644 index 00000000000..e69de29bb2d diff --git a/accounts/search_criteria/lease_over_due_list/lease_over_due_list.txt b/accounts/search_criteria/lease_over_due_list/lease_over_due_list.txt new file mode 100644 index 00000000000..22bdc55d548 --- /dev/null +++ b/accounts/search_criteria/lease_over_due_list/lease_over_due_list.txt @@ -0,0 +1,30 @@ +# Search Criteria, lease_over_due_list +[ + + # These values are common in all dictionaries + { + 'creation': '2011-07-26 18:11:47', + 'docstatus': 0, + 'modified': '2011-07-26 18:27:01', + 'modified_by': 'Administrator', + 'owner': 'Administrator' + }, + + # These values are common for all Search Criteria + { + 'columns': 'GL Entry\x01ID,GL Entry\x01Owner,GL Entry\x01Posting Date,GL Entry\x01Aging Date,GL Entry\x01Account,GL Entry\x01Cost Center,GL Entry\x01Against,GL Entry\x01Against Voucher,GL Entry\x01Voucher Type,GL Entry\x01Voucher No,GL Entry\x01Remarks,GL Entry\x01Is Cancelled,GL Entry\x01Is Opening,GL Entry\x01Fiscal Year,GL Entry\x01Company', + 'criteria_name': 'Lease Over Due List', + 'doc_type': 'GL Entry', + 'doctype': 'Search Criteria', + 'filters': "{'GL Entry\x01Voucher Type':'','GL Entry\x01Is Cancelled':'','GL Entry\x01Is Opening':'','GL Entry\x01Fiscal Year':''}", + 'module': 'Accounts', + 'name': '__common__', + 'standard': 'Yes' + }, + + # Search Criteria, lease_over_due_list + { + 'doctype': 'Search Criteria', + 'name': 'lease_over_due_list' + } +] \ No newline at end of file diff --git a/accounts/search_criteria/lease_overdue_age_wise/__init__.py b/accounts/search_criteria/lease_overdue_age_wise/__init__.py new file mode 100644 index 00000000000..e69de29bb2d diff --git a/accounts/search_criteria/lease_overdue_age_wise/lease_overdue_age_wise.txt b/accounts/search_criteria/lease_overdue_age_wise/lease_overdue_age_wise.txt new file mode 100644 index 00000000000..dcd0f94aaaf --- /dev/null +++ b/accounts/search_criteria/lease_overdue_age_wise/lease_overdue_age_wise.txt @@ -0,0 +1,30 @@ +# Search Criteria, lease_overdue_age_wise +[ + + # These values are common in all dictionaries + { + 'creation': '2011-07-27 13:14:29', + 'docstatus': 0, + 'modified': '2011-07-27 13:14:29', + 'modified_by': 'Administrator', + 'owner': 'Administrator' + }, + + # These values are common for all Search Criteria + { + 'columns': 'GL Entry\x01ID,GL Entry\x01Owner,GL Entry\x01Posting Date,GL Entry\x01Aging Date,GL Entry\x01Account,GL Entry\x01Cost Center,GL Entry\x01Against,GL Entry\x01Against Voucher,GL Entry\x01Voucher Type,GL Entry\x01Voucher No,GL Entry\x01Remarks,GL Entry\x01Is Cancelled,GL Entry\x01Is Opening,GL Entry\x01Fiscal Year,GL Entry\x01Company', + 'criteria_name': 'Lease Overdue Age Wise', + 'doc_type': 'GL Entry', + 'doctype': 'Search Criteria', + 'filters': "{'GL Entry\x01Voucher Type':'','GL Entry\x01Is Cancelled':'','GL Entry\x01Is Opening':'','GL Entry\x01Fiscal Year':''}", + 'module': 'Accounts', + 'name': '__common__', + 'standard': 'Yes' + }, + + # Search Criteria, lease_overdue_age_wise + { + 'doctype': 'Search Criteria', + 'name': 'lease_overdue_age_wise' + } +] \ No newline at end of file diff --git a/accounts/search_criteria/lease_receipt_summary_year_to_date/__init__.py b/accounts/search_criteria/lease_receipt_summary_year_to_date/__init__.py new file mode 100644 index 00000000000..e69de29bb2d diff --git a/accounts/search_criteria/lease_receipt_summary_year_to_date/lease_receipt_summary_year_to_date.txt b/accounts/search_criteria/lease_receipt_summary_year_to_date/lease_receipt_summary_year_to_date.txt new file mode 100644 index 00000000000..405c8a30c57 --- /dev/null +++ b/accounts/search_criteria/lease_receipt_summary_year_to_date/lease_receipt_summary_year_to_date.txt @@ -0,0 +1,33 @@ +# Search Criteria, lease_receipt_summary_year_to_date +[ + + # These values are common in all dictionaries + { + 'creation': '2011-07-27 13:14:29', + 'docstatus': 0, + 'modified': '2011-07-27 13:14:29', + 'modified_by': 'Administrator', + 'owner': 'Administrator' + }, + + # These values are common for all Search Criteria + { + 'columns': 'GL Entry\x01ID,GL Entry\x01Owner,GL Entry\x01Posting Date,GL Entry\x01Aging Date,GL Entry\x01Account,GL Entry\x01Cost Center,GL Entry\x01Against,GL Entry\x01Against Voucher,GL Entry\x01Voucher Type,GL Entry\x01Voucher No,GL Entry\x01Remarks,GL Entry\x01Is Cancelled,GL Entry\x01Is Opening,GL Entry\x01Fiscal Year,GL Entry\x01Company', + 'criteria_name': 'Lease Receipt Summary (Year to date)', + 'doc_type': 'GL Entry', + 'doctype': 'Search Criteria', + 'filters': "{'GL Entry\x01Voucher Type':'','GL Entry\x01Is Cancelled':'','GL Entry\x01Is Opening':'','GL Entry\x01Fiscal Year':''}", + 'module': 'Accounts', + 'name': '__common__', + 'page_len': 50, + 'sort_by': '`tabGL Entry`.`company`', + 'sort_order': 'DESC', + 'standard': 'Yes' + }, + + # Search Criteria, lease_receipt_summary_year_to_date + { + 'doctype': 'Search Criteria', + 'name': 'lease_receipt_summary_year_to_date' + } +] \ No newline at end of file diff --git a/accounts/search_criteria/lease_receipts_client_wise/__init__.py b/accounts/search_criteria/lease_receipts_client_wise/__init__.py new file mode 100644 index 00000000000..e69de29bb2d diff --git a/accounts/search_criteria/lease_receipts_client_wise/lease_receipts_client_wise.txt b/accounts/search_criteria/lease_receipts_client_wise/lease_receipts_client_wise.txt new file mode 100644 index 00000000000..eff40878e49 --- /dev/null +++ b/accounts/search_criteria/lease_receipts_client_wise/lease_receipts_client_wise.txt @@ -0,0 +1,30 @@ +# Search Criteria, lease_receipts_client_wise +[ + + # These values are common in all dictionaries + { + 'creation': '2011-07-27 13:14:29', + 'docstatus': 0, + 'modified': '2011-07-27 13:14:29', + 'modified_by': 'Administrator', + 'owner': 'Administrator' + }, + + # These values are common for all Search Criteria + { + 'columns': 'GL Entry\x01ID,GL Entry\x01Owner,GL Entry\x01Posting Date,GL Entry\x01Aging Date,GL Entry\x01Account,GL Entry\x01Cost Center,GL Entry\x01Against,GL Entry\x01Against Voucher,GL Entry\x01Voucher Type,GL Entry\x01Voucher No,GL Entry\x01Remarks,GL Entry\x01Is Cancelled,GL Entry\x01Is Opening,GL Entry\x01Fiscal Year,GL Entry\x01Company', + 'criteria_name': 'Lease Receipts Client wise', + 'doc_type': 'GL Entry', + 'doctype': 'Search Criteria', + 'filters': "{'GL Entry\x01Voucher Type':'','GL Entry\x01Is Cancelled':'','GL Entry\x01Is Opening':'','GL Entry\x01Fiscal Year':''}", + 'module': 'Accounts', + 'name': '__common__', + 'standard': 'Yes' + }, + + # Search Criteria, lease_receipts_client_wise + { + 'doctype': 'Search Criteria', + 'name': 'lease_receipts_client_wise' + } +] \ No newline at end of file diff --git a/accounts/search_criteria/lease_yearly_future_installment_inflows/__init__.py b/accounts/search_criteria/lease_yearly_future_installment_inflows/__init__.py new file mode 100644 index 00000000000..e69de29bb2d diff --git a/accounts/search_criteria/lease_yearly_future_installment_inflows/lease_yearly_future_installment_inflows.txt b/accounts/search_criteria/lease_yearly_future_installment_inflows/lease_yearly_future_installment_inflows.txt new file mode 100644 index 00000000000..aa522241b4b --- /dev/null +++ b/accounts/search_criteria/lease_yearly_future_installment_inflows/lease_yearly_future_installment_inflows.txt @@ -0,0 +1,30 @@ +# Search Criteria, lease_yearly_future_installment_inflows +[ + + # These values are common in all dictionaries + { + 'creation': '2011-07-27 13:14:29', + 'docstatus': 0, + 'modified': '2011-07-27 13:14:29', + 'modified_by': 'Administrator', + 'owner': 'Administrator' + }, + + # These values are common for all Search Criteria + { + 'columns': 'GL Entry\x01ID,GL Entry\x01Owner,GL Entry\x01Posting Date,GL Entry\x01Aging Date,GL Entry\x01Account,GL Entry\x01Cost Center,GL Entry\x01Against,GL Entry\x01Against Voucher,GL Entry\x01Voucher Type,GL Entry\x01Voucher No,GL Entry\x01Remarks,GL Entry\x01Is Cancelled,GL Entry\x01Is Opening,GL Entry\x01Fiscal Year,GL Entry\x01Company', + 'criteria_name': 'Lease Yearly Future Installment Inflows', + 'doc_type': 'GL Entry', + 'doctype': 'Search Criteria', + 'filters': "{'GL Entry\x01Voucher Type':'','GL Entry\x01Is Cancelled':'','GL Entry\x01Is Opening':'','GL Entry\x01Fiscal Year':''}", + 'module': 'Accounts', + 'name': '__common__', + 'standard': 'Yes' + }, + + # Search Criteria, lease_yearly_future_installment_inflows + { + 'doctype': 'Search Criteria', + 'name': 'lease_yearly_future_installment_inflows' + } +] \ No newline at end of file diff --git a/accounts/utils/__init__.py b/accounts/utils/__init__.py new file mode 100644 index 00000000000..e8ca13e9975 --- /dev/null +++ b/accounts/utils/__init__.py @@ -0,0 +1,27 @@ +from webnotes.model.doc import make_autoname, Document, addchild +# Posts JV + +def post_jv(data): + jv = Document('Journal Voucher') + jv.voucher_type = data.get('voucher_type') + jv.naming_series = data.get('naming_series') + jv.voucher_date = data.get('cheque_date') + jv.posting_date = data.get('cheque_date') + jv.cheque_no = data.get('cheque_number') + jv.cheque_date = data.get('cheque_date') + jv.fiscal_year = data.get('fiscal_year') # To be modified to take care + jv.company = data.get('company') + + jv.save(1) + + jc = addchild(jv,'entries','Journal Voucher Detail',0) + jc.account = data.get('debit_account') + jc.debit = data.get('amount') + jc.save() + + jc = addchild(jv,'entries','Journal Voucher Detail',0) + jc.account = data.get('credit_account') + jc.credit = data.get('amount') + jc.save() + + return jv.name \ No newline at end of file diff --git a/buying/doctype/indent/indent.txt b/buying/doctype/indent/indent.txt index 93767a8d208..cd6c91296c1 100644 --- a/buying/doctype/indent/indent.txt +++ b/buying/doctype/indent/indent.txt @@ -282,6 +282,7 @@ 'oldfieldtype': 'Data', 'options': 'Sales Order', 'permlevel': 0, + 'search_index': 0, 'width': '100px' }, @@ -338,7 +339,7 @@ 'permlevel': 0, 'print_hide': 1, 'reqd': 1, - 'search_index': 1, + 'search_index': 0, 'width': '150px' }, @@ -357,7 +358,7 @@ 'permlevel': 0, 'print_hide': 1, 'reqd': 1, - 'search_index': 1, + 'search_index': 0, 'width': '150px' }, @@ -487,7 +488,8 @@ 'options': 'Term', 'permlevel': 0, 'print_hide': 1, - 'report_hide': 1 + 'report_hide': 1, + 'search_index': 0 }, # DocField diff --git a/buying/doctype/indent_detail/indent_detail.txt b/buying/doctype/indent_detail/indent_detail.txt index c81b9cf4b25..c207266bbbb 100644 --- a/buying/doctype/indent_detail/indent_detail.txt +++ b/buying/doctype/indent_detail/indent_detail.txt @@ -85,7 +85,7 @@ 'oldfieldtype': 'Data', 'permlevel': 0, 'reqd': 1, - 'search_index': 1, + 'search_index': 0, 'width': '100px' }, @@ -132,6 +132,7 @@ 'options': 'Brand', 'permlevel': 1, 'print_hide': 1, + 'search_index': 0, 'width': '100px' }, @@ -151,7 +152,7 @@ 'permlevel': 1, 'print_hide': 1, 'reqd': 0, - 'search_index': 1 + 'search_index': 0 }, # DocField @@ -199,6 +200,7 @@ 'options': 'UOM', 'permlevel': 1, 'reqd': 1, + 'search_index': 0, 'width': '50px' }, diff --git a/buying/doctype/po_detail/po_detail.txt b/buying/doctype/po_detail/po_detail.txt index 9e4d790c0df..71d78df1f3e 100644 --- a/buying/doctype/po_detail/po_detail.txt +++ b/buying/doctype/po_detail/po_detail.txt @@ -54,7 +54,7 @@ 'permlevel': 0, 'print_hide': 1, 'reqd': 1, - 'search_index': 1 + 'search_index': 0 }, # DocField @@ -89,7 +89,7 @@ 'permlevel': 0, 'print_hide': 1, 'reqd': 1, - 'search_index': 1 + 'search_index': 0 }, # DocField @@ -182,6 +182,7 @@ 'permlevel': 0, 'print_hide': 0, 'reqd': 1, + 'search_index': 0, 'trigger': 'Client', 'width': '100px' }, @@ -331,7 +332,8 @@ 'oldfieldtype': 'Link', 'options': 'Brand', 'permlevel': 1, - 'print_hide': 1 + 'print_hide': 1, + 'search_index': 0 }, # DocField @@ -348,7 +350,7 @@ 'options': 'Item Group', 'permlevel': 1, 'print_hide': 1, - 'search_index': 1 + 'search_index': 0 }, # DocField diff --git a/buying/doctype/qa_inspection_report/qa_inspection_report.txt b/buying/doctype/qa_inspection_report/qa_inspection_report.txt index 5febdec44ef..10890dc8461 100644 --- a/buying/doctype/qa_inspection_report/qa_inspection_report.txt +++ b/buying/doctype/qa_inspection_report/qa_inspection_report.txt @@ -206,7 +206,8 @@ 'oldfieldtype': 'Link', 'options': 'Serial No', 'permlevel': 0, - 'print_hide': 0 + 'print_hide': 0, + 'search_index': 0 }, # DocField @@ -219,7 +220,8 @@ 'oldfieldname': 'batch_no', 'oldfieldtype': 'Link', 'options': 'Batch', - 'permlevel': 0 + 'permlevel': 0, + 'search_index': 0 }, # DocField @@ -255,7 +257,7 @@ 'options': 'Delivery Note', 'permlevel': 0, 'print_hide': 0, - 'search_index': 1 + 'search_index': 0 }, # DocField diff --git a/buying/doctype/supplier/supplier.txt b/buying/doctype/supplier/supplier.txt index b7797e548fb..a7a08c3a07d 100644 --- a/buying/doctype/supplier/supplier.txt +++ b/buying/doctype/supplier/supplier.txt @@ -5,7 +5,7 @@ { 'creation': '2010-08-08 17:09:26', 'docstatus': 0, - 'modified': '2011-05-10 17:42:21', + 'modified': '2011-07-19 16:18:58', 'modified_by': 'Administrator', 'owner': 'Administrator' }, @@ -25,7 +25,7 @@ 'show_in_menu': 0, 'subject': ' ', 'tag_fields': 'supplier_type', - 'version': 86 + 'version': 87 }, # These values are common for all DocField @@ -163,24 +163,11 @@ 'permlevel': 0 }, - # DocField - { - 'doctype': 'DocField', - 'fieldname': 'supplier_status', - 'fieldtype': 'Select', - 'idx': 6, - 'label': 'Supplier Status', - 'oldfieldname': 'supplier_status', - 'oldfieldtype': 'Select', - 'options': '\nApproved\nUnapproved', - 'permlevel': 0 - }, - # DocField { 'doctype': 'DocField', 'fieldtype': 'Section Break', - 'idx': 7, + 'idx': 6, 'label': 'Address & Contacts', 'oldfieldtype': 'Column Break', 'permlevel': 0 @@ -192,7 +179,7 @@ 'depends_on': 'eval:doc.__islocal', 'doctype': 'DocField', 'fieldtype': 'HTML', - 'idx': 8, + 'idx': 7, 'label': 'Address Desc', 'options': 'Addresses will appear only when you save the supplier', 'permlevel': 0 @@ -203,7 +190,7 @@ 'colour': 'White:FFF', 'doctype': 'DocField', 'fieldtype': 'HTML', - 'idx': 9, + 'idx': 8, 'label': 'Address HTML', 'permlevel': 1 }, @@ -212,7 +199,7 @@ { 'doctype': 'DocField', 'fieldtype': 'Column Break', - 'idx': 10, + 'idx': 9, 'permlevel': 0, 'width': '50%' }, @@ -223,7 +210,7 @@ 'depends_on': 'eval:doc.__islocal', 'doctype': 'DocField', 'fieldtype': 'HTML', - 'idx': 11, + 'idx': 10, 'label': 'Contact Desc', 'options': 'Contact Details will appear only when you save the supplier', 'permlevel': 0 @@ -233,7 +220,7 @@ { 'doctype': 'DocField', 'fieldtype': 'HTML', - 'idx': 12, + 'idx': 11, 'label': 'Contact HTML', 'permlevel': 1 }, @@ -242,7 +229,7 @@ { 'doctype': 'DocField', 'fieldtype': 'Section Break', - 'idx': 13, + 'idx': 12, 'label': 'More Info', 'oldfieldtype': 'Section Break', 'permlevel': 0 @@ -255,7 +242,7 @@ 'doctype': 'DocField', 'fieldname': 'company', 'fieldtype': 'Link', - 'idx': 14, + 'idx': 13, 'in_filter': 1, 'label': 'Company', 'oldfieldname': 'company', @@ -263,7 +250,7 @@ 'options': 'Company', 'permlevel': 0, 'reqd': 1, - 'search_index': 1 + 'search_index': 0 }, # DocField @@ -273,7 +260,7 @@ 'doctype': 'DocField', 'fieldname': 'supplier_details', 'fieldtype': 'Text', - 'idx': 15, + 'idx': 14, 'label': 'Supplier Details', 'oldfieldname': 'supplier_details', 'oldfieldtype': 'Code', @@ -284,7 +271,7 @@ { 'doctype': 'DocField', 'fieldtype': 'Column Break', - 'idx': 16, + 'idx': 15, 'permlevel': 0, 'width': '50%' }, @@ -294,7 +281,7 @@ 'doctype': 'DocField', 'fieldname': 'credit_days', 'fieldtype': 'Int', - 'idx': 17, + 'idx': 16, 'label': 'Credit Days', 'permlevel': 0 }, @@ -304,7 +291,7 @@ 'doctype': 'DocField', 'fieldname': 'website', 'fieldtype': 'Data', - 'idx': 18, + 'idx': 17, 'label': 'Website', 'oldfieldname': 'website', 'oldfieldtype': 'Data', @@ -317,7 +304,7 @@ 'depends_on': 'eval:!doc.__islocal', 'doctype': 'DocField', 'fieldtype': 'Section Break', - 'idx': 19, + 'idx': 18, 'label': 'Transaction History', 'oldfieldtype': 'Section Break', 'permlevel': 0 @@ -329,7 +316,7 @@ 'depends_on': 'eval:!doc.__islocal', 'doctype': 'DocField', 'fieldtype': 'HTML', - 'idx': 20, + 'idx': 19, 'label': 'History HTML', 'oldfieldtype': 'HTML', 'permlevel': 0 @@ -340,7 +327,7 @@ 'doctype': 'DocField', 'fieldname': 'trash_reason', 'fieldtype': 'Small Text', - 'idx': 21, + 'idx': 20, 'label': 'Trash Reason', 'oldfieldname': 'trash_reason', 'oldfieldtype': 'Small Text', 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 486cc6df855..159d3930b97 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 diff --git a/hr/doctype/attendance/attendance.txt b/hr/doctype/attendance/attendance.txt index a52225e7a57..4f189b1cdcf 100644 --- a/hr/doctype/attendance/attendance.txt +++ b/hr/doctype/attendance/attendance.txt @@ -141,7 +141,7 @@ 'oldfieldtype': 'Select', 'options': '\nPresent\nAbsent\nHalf Day', 'reqd': 1, - 'search_index': 1 + 'search_index': 0 }, # DocField @@ -193,7 +193,7 @@ 'oldfieldname': 'att_date', 'oldfieldtype': 'Date', 'reqd': 1, - 'search_index': 0 + 'search_index': 1 }, # DocField diff --git a/hr/doctype/educational_qualifications/educational_qualifications.txt b/hr/doctype/educational_qualifications/educational_qualifications.txt index 21f4a9adf1c..d57139bdf81 100644 --- a/hr/doctype/educational_qualifications/educational_qualifications.txt +++ b/hr/doctype/educational_qualifications/educational_qualifications.txt @@ -75,7 +75,7 @@ 'oldfieldtype': 'Select', 'options': '\nGraduate\nPost Graduate\nUnder Graduate', 'reqd': 0, - 'search_index': 1 + 'search_index': 0 }, # DocField diff --git a/hr/doctype/employee/employee.txt b/hr/doctype/employee/employee.txt index cbe281d8377..49a494b99b1 100644 --- a/hr/doctype/employee/employee.txt +++ b/hr/doctype/employee/employee.txt @@ -173,7 +173,8 @@ 'oldfieldname': 'employee_name', 'oldfieldtype': 'Data', 'permlevel': 0, - 'reqd': 1 + 'reqd': 1, + 'search_index': 1 }, # DocField @@ -275,7 +276,7 @@ 'options': '\nActive\nLeft', 'permlevel': 0, 'reqd': 1, - 'search_index': 1 + 'search_index': 0 }, # DocField @@ -408,7 +409,8 @@ 'oldfieldtype': 'Link', 'options': 'Department', 'permlevel': 0, - 'reqd': 1 + 'reqd': 1, + 'search_index': 1 }, # DocField diff --git a/hr/doctype/expense_voucher/expense_voucher.txt b/hr/doctype/expense_voucher/expense_voucher.txt index 0f7812e87c6..596d4b5c500 100644 --- a/hr/doctype/expense_voucher/expense_voucher.txt +++ b/hr/doctype/expense_voucher/expense_voucher.txt @@ -189,7 +189,7 @@ 'oldfieldname': 'employee_name', 'oldfieldtype': 'Data', 'permlevel': 1, - 'search_index': 1, + 'search_index': 0, 'width': '150px' }, diff --git a/hr/doctype/leave_allocation/leave_allocation.txt b/hr/doctype/leave_allocation/leave_allocation.txt index 0b0c96c25d4..b147a7fb023 100644 --- a/hr/doctype/leave_allocation/leave_allocation.txt +++ b/hr/doctype/leave_allocation/leave_allocation.txt @@ -136,7 +136,7 @@ 'in_filter': 1, 'label': 'Employee Name', 'permlevel': 1, - 'search_index': 1 + 'search_index': 0 }, # DocField diff --git a/hr/doctype/leave_application/leave_application.txt b/hr/doctype/leave_application/leave_application.txt index 11d01e6ba11..06b4170eb4c 100644 --- a/hr/doctype/leave_application/leave_application.txt +++ b/hr/doctype/leave_application/leave_application.txt @@ -3,9 +3,9 @@ # These values are common in all dictionaries { - 'creation': '2011-02-17 13:25:56', + 'creation': '2011-02-10 14:10:08', 'docstatus': 0, - 'modified': '2011-07-08 13:28:15', + 'modified': '2011-07-11 12:48:49', 'modified_by': 'Administrator', 'owner': 'Administrator' }, @@ -54,28 +54,28 @@ # DocPerm { - 'amend': 0, - 'cancel': 0, + 'amend': 1, + 'cancel': 1, 'create': 1, 'doctype': 'DocPerm', 'idx': 1, + 'match': 'owner', 'permlevel': 0, - 'role': 'Employee', - 'submit': 0, + 'submit': 1, 'write': 1 }, # DocPerm { - 'amend': 1, - 'cancel': 1, - 'create': 1, + 'amend': 0, + 'cancel': 0, + 'create': 0, 'doctype': 'DocPerm', 'idx': 2, + 'match': 'owner', 'permlevel': 0, - 'role': 'HR User', - 'submit': 1, - 'write': 1 + 'submit': 0, + 'write': 0 }, # DocPerm @@ -86,6 +86,19 @@ 'doctype': 'DocPerm', 'idx': 3, 'permlevel': 0, + 'role': 'HR User', + 'submit': 1, + 'write': 1 + }, + + # DocPerm + { + 'amend': 1, + 'cancel': 1, + 'create': 1, + 'doctype': 'DocPerm', + 'idx': 4, + 'permlevel': 0, 'role': 'HR Manager', 'submit': 1, 'write': 1 @@ -93,28 +106,18 @@ # DocPerm { - 'amend': 0, - 'cancel': 0, - 'create': 0, 'doctype': 'DocPerm', - 'idx': 4, + 'idx': 5, 'permlevel': 1, - 'role': 'HR User', - 'submit': 0, - 'write': 0 + 'role': 'HR User' }, # DocPerm { - 'amend': 0, - 'cancel': 0, - 'create': 0, 'doctype': 'DocPerm', - 'idx': 5, + 'idx': 6, 'permlevel': 1, - 'role': 'HR Manager', - 'submit': 0, - 'write': 0 + 'role': 'HR Manager' }, # DocField @@ -149,7 +152,7 @@ 'in_filter': 1, 'label': 'Employee Name', 'permlevel': 1, - 'search_index': 1 + 'search_index': 0 }, # DocField @@ -201,7 +204,7 @@ 'options': 'link:Fiscal Year', 'permlevel': 0, 'reqd': 1, - 'search_index': 1 + 'search_index': 0 }, # DocField @@ -234,6 +237,7 @@ 'idx': 10, 'label': 'From Date', 'permlevel': 0, + 'search_index': 1, 'trigger': 'Client' }, @@ -246,6 +250,7 @@ 'idx': 11, 'label': 'To Date', 'permlevel': 0, + 'search_index': 1, 'trigger': 'Client' }, diff --git a/hr/doctype/salary_slip/salary_slip.txt b/hr/doctype/salary_slip/salary_slip.txt index 2886e424b59..423b6c03d8d 100644 --- a/hr/doctype/salary_slip/salary_slip.txt +++ b/hr/doctype/salary_slip/salary_slip.txt @@ -5,7 +5,7 @@ { 'creation': '2010-08-08 17:09:20', 'docstatus': 0, - 'modified': '2011-07-14 16:07:20', + 'modified': '2011-07-27 13:10:28', 'modified_by': 'Administrator', 'owner': 'Administrator' }, @@ -21,7 +21,7 @@ 'server_code_error': ' ', 'show_in_menu': 0, 'subject': 'For %(employee_name)s, %(designation)s', - 'version': 392 + 'version': 393 }, # These values are common for all DocField @@ -55,19 +55,7 @@ 'cancel': 0, 'create': 0, 'doctype': 'DocPerm', - 'match': 'owner', - 'permlevel': 0, - 'role': 'Employee', - 'submit': 0, - 'write': 0 - }, - - # DocPerm - { - 'amend': 0, - 'cancel': 0, - 'create': 0, - 'doctype': 'DocPerm', + 'idx': 1, 'match': 'owner', 'permlevel': 0, 'role': 'Employee', @@ -80,7 +68,7 @@ 'amend': 0, 'create': 1, 'doctype': 'DocPerm', - 'idx': 3, + 'idx': 2, 'permlevel': 0, 'role': 'HR User', 'submit': 1, @@ -93,7 +81,7 @@ 'cancel': 1, 'create': 1, 'doctype': 'DocPerm', - 'idx': 4, + 'idx': 3, 'permlevel': 0, 'role': 'HR Manager', 'submit': 1, @@ -103,7 +91,7 @@ # DocPerm { 'doctype': 'DocPerm', - 'idx': 5, + 'idx': 4, 'permlevel': 1, 'role': 'HR User' }, @@ -111,7 +99,7 @@ # DocPerm { 'doctype': 'DocPerm', - 'idx': 6, + 'idx': 5, 'permlevel': 1, 'role': 'HR Manager' }, @@ -150,7 +138,7 @@ 'options': 'Employee', 'permlevel': 0, 'reqd': 1, - 'search_index': 0 + 'search_index': 1 }, # DocField @@ -180,7 +168,7 @@ 'options': 'Department', 'permlevel': 1, 'reqd': 0, - 'search_index': 1 + 'search_index': 0 }, # DocField @@ -195,7 +183,7 @@ 'oldfieldtype': 'Link', 'options': 'Designation', 'permlevel': 1, - 'search_index': 1 + 'search_index': 0 }, # DocField @@ -210,7 +198,7 @@ 'oldfieldtype': 'Link', 'options': 'Branch', 'permlevel': 1, - 'search_index': 1 + 'search_index': 0 }, # DocField @@ -225,7 +213,7 @@ 'oldfieldtype': 'Link', 'options': 'Grade', 'permlevel': 1, - 'search_index': 1 + 'search_index': 0 }, # DocField @@ -287,7 +275,7 @@ 'options': 'Fiscal Year', 'permlevel': 0, 'reqd': 1, - 'search_index': 1 + 'search_index': 0 }, # DocField diff --git a/knowledge_base/doctype/question/question.txt b/knowledge_base/doctype/question/question.txt index 428d269fe99..187789ce6fc 100644 --- a/knowledge_base/doctype/question/question.txt +++ b/knowledge_base/doctype/question/question.txt @@ -115,7 +115,8 @@ 'label': 'Tag 1', 'oldfieldname': 'tag_1', 'oldfieldtype': 'Link', - 'options': 'Question Tag' + 'options': 'Question Tag', + 'search_index': 0 }, # DocField @@ -136,7 +137,8 @@ 'label': 'Tag 2', 'oldfieldname': 'tag_2', 'oldfieldtype': 'Link', - 'options': 'Question Tag' + 'options': 'Question Tag', + 'search_index': 0 }, # DocField @@ -148,7 +150,8 @@ 'label': 'Tag 3', 'oldfieldname': 'tag_3', 'oldfieldtype': 'Link', - 'options': 'Question Tag' + 'options': 'Question Tag', + 'search_index': 0 }, # DocField diff --git a/patches/erpnext_structure_cleanup.py b/patches/erpnext_structure_cleanup.py index 8b765de19d4..e78a82ef180 100644 --- a/patches/erpnext_structure_cleanup.py +++ b/patches/erpnext_structure_cleanup.py @@ -195,6 +195,6 @@ def run_patches(): sync_mapper() delete_unwanted_modules() # landed cost wizard link in stock - reload_doc('stock', 'Module Def', 'stock') + reload_doc('stock', 'Module Def', 'Stock') sql("commit") diff --git a/patches/index_patch.py b/patches/index_patch.py index 8f6c4f2d810..3ef8ec367ae 100644 --- a/patches/index_patch.py +++ b/patches/index_patch.py @@ -2,6 +2,9 @@ This patch removes wrong indexs and add proper indexes in tables """ +import webnotes +sql = webnotes.conn.sql +from webnotes.utils import cint, cstr def create_proper_index(): from webnotes.modules.export_module import export_to_files @@ -264,29 +267,29 @@ def create_proper_index(): 'Print Heading': [], 'TDS Rate Detail': ['category'] } - - for dt in dt_index_fields.keys(): - current_index = sql("show indexes from `tab%s`" % dt) + #sql("commit") # only required if run from login + exist_dt = [cstr(d[0]) for d in sql("select name from `tabDocType`")] - proper_index = dt_index_fields[dt] + for dt in [d for d in dt_index_fields.keys() if d in exist_dt]: + try: + current_index = sql("show indexes from `tab%s`" % dt) - for d in current_index: - if d[4] not in ['name', 'parent', 'parenttype']: - if d[4] not in proper_index: - sql("ALTER TABLE `tab%s` DROP INDEX %s" % (dt, d[4])) - sql("start transaction") - sql("UPDATE `tabDocField` SET search_index = 0 WHERE fieldname = '%s' AND parent = '%s'" % (d[4], dt)) - sql("commit") - else: - proper_index.remove(d[4]) + proper_index = dt_index_fields[dt] - for d in proper_index: - sql("ALTER TABLE `tab%s` ADD INDEX ( `%s` ) " % (dt, d)) - sql("start transaction") - sql("UPDATE `tabDocField` SET search_index = 1 WHERE fieldname = '%s' AND parent = '%s'" % (d, dt)) - sql("commit") - - sql("start transaction") - dt_module = sql("select module from `tabDocType` where name = '%s'" % dt)[0][0] - export_to_files(record_list = [['DocType', dt]], record_module = dt_module) - sql("commit") + for d in current_index: + if d[4] not in ['name', 'parent', 'parenttype']: + if d[4] not in proper_index: + sql("ALTER TABLE `tab%s` DROP INDEX %s" % (dt, d[4])) + sql("start transaction") + sql("UPDATE `tabDocField` SET search_index = 0 WHERE fieldname = '%s' AND parent = '%s'" % (d[4], dt)) + sql("commit") + else: + proper_index.remove(d[4]) + + for d in proper_index: + sql("ALTER TABLE `tab%s` ADD INDEX ( `%s` ) " % (dt, d)) + sql("start transaction") + sql("UPDATE `tabDocField` SET search_index = 1 WHERE fieldname = '%s' AND parent = '%s'" % (d, dt)) + sql("commit") + except: + continue diff --git a/patches/patch.py b/patches/patch.py index 47f39bf21de..13da883f313 100644 --- a/patches/patch.py +++ b/patches/patch.py @@ -1,7 +1,7 @@ # REMEMBER to update this # ======================== -last_patch = 327 +last_patch = 332 #------------------------------------------- @@ -46,7 +46,7 @@ def execute(patch_no): for d in path_list: doclist = eval(open(d,'r').read()) webnotes.conn.sql("update `tab%s` set module = '%s' where name = '%s'" % (doclist[0]['doctype'], doclist[0]['module'], doclist[0]['name'])) - + elif patch_no==38: import webnotes webnotes.conn.set_global("system_message", "System Updates: Hello! You would have noticed some changes on the Home Page. As a part of our commitment to make the system more friendly and social, we have re-designed the feed so that now you will only see feed that is relevant to you (either you have created something or you have been mentioned in the document).

On the individual listings, you can add tags and also color them!

You will also get time-to-time updates from our side here. Do keep sending your feedback at support@erpnext.com.") @@ -56,7 +56,7 @@ def execute(patch_no): pass elif patch_no == 40: - + import_from_files(record_list=[['material_management','doctype','item']]) elif patch_no == 42: acc = sql("select name, lft, rgt from tabAccount where account_name in ('Incomes', 'Expenses')") @@ -65,7 +65,7 @@ def execute(patch_no): elif patch_no == 43: import webnotes.model webnotes.model.delete_doc('Page', 'Module Manager') - + # cleanup of Service, Customer Support, Utilities Modules # ------------------------------------------------------- elif patch_no == 44: @@ -86,7 +86,7 @@ def execute(patch_no): # remove utilities webnotes.conn.sql('delete from `tabModule Def` where name in ("Customer Support", "Utilities")') - + elif patch_no == 45: webnotes.conn.sql('delete from tabDocField where options="Ticket Response Detail"') @@ -125,7 +125,7 @@ def execute(patch_no): elif patch_no == 56: sql("delete from `tabModule Def Item` where parent = 'CRM' and doc_type = 'Reports' and doc_name = 'Delivery Note' and display_name = 'Territory, Item Group wise GP'") elif patch_no == 57: - + import_from_files(record_list=[['crm','doctype','sales_order_detail']]) elif patch_no == 58: # module def patches @@ -133,24 +133,24 @@ def execute(patch_no): sql("delete from `tabModule Def Item` where doc_type in ('Separator', 'Setup Forms', 'More Reports')") sql("delete from `tabModule Def Item` where doc_name = 'Project Activity'") sql("update `tabModule Def` set module_label = 'People', disabled='No', is_hidden='No' where name = 'My Company'") - + # insert new module items from webnotes.model.doc import make_autoname if not sql("select name from `tabModule Def Item` where parent='Projects' and doc_name='Ticket'"): - sql("""insert into `tabModule Def Item` - (name, parent, parenttype, parentfield, docstatus, doc_type, doc_name, display_name, idx) values + sql("""insert into `tabModule Def Item` + (name, parent, parenttype, parentfield, docstatus, doc_type, doc_name, display_name, idx) values (%s, 'Projects', 'Module Def', 'items', 0, 'Forms', 'Ticket', 'Task', 1)""", make_autoname('MDI.#####')) if not sql("select name from `tabModule Def Item` where parent='Projects' and doc_name='Timesheet'"): - sql("""insert into `tabModule Def Item` - (name, parent, parenttype, parentfield, docstatus, doc_type, doc_name, display_name, idx) values + sql("""insert into `tabModule Def Item` + (name, parent, parenttype, parentfield, docstatus, doc_type, doc_name, display_name, idx) values (%s, 'Projects', 'Module Def', 'items', 0, 'Forms', 'Timesheet', 'Timesheet', 2)""", make_autoname('MDI.#####')) - + if not sql("select name from `tabModule Def Item` where parent='Projects' and doc_name='Projects'"): - sql("""insert into `tabModule Def Item` - (name, parent, parenttype, parentfield, docstatus, doc_type, doc_name, display_name, idx) values + sql("""insert into `tabModule Def Item` + (name, parent, parenttype, parentfield, docstatus, doc_type, doc_name, display_name, idx) values (%s, 'Projects', 'Module Def', 'items', 0, 'Pages', 'Projects', 'Gantt Chart', 1)""", make_autoname('MDI.#####')) - + elif patch_no == 59: webnotes.conn.set_value('Control Panel',None,'mail_footer','') webnotes.conn.set_global('global_mail_footer','
Sent via ERPNext
') @@ -160,16 +160,16 @@ def execute(patch_no): sql("delete from `tabTDS Category Account` where company not in (select name from tabCompany)") elif patch_no == 62: # Import Supplier Quotation - + import_from_files(record_list=[['srm','doctype','supplier_quotation']]) # Adding Status Filter sql("update tabDocType set search_fields = concat('status,',search_fields) where name IN ('Delivery Note','Leave Transaction')") # Import Other Charges - + import_from_files(record_list=[['setup','doctype','other_charges']]) elif patch_no == 63: sql("update `tabDocField` set permlevel = 1 where fieldname in ('return_date', 'return_details') and parent = 'Sales and Purchase Return Wizard'") - + import_from_files(record_list = [['accounts', 'doctype', 'rv_detail'], ['material_management', 'doctype', 'sales_and_purchase_return_wizard'], ['material_management', 'doctype', 'stock_entry']]) elif patch_no == 64: sql("update tabDocField set `hidden` = 1, `print_hide` = 1, `report_hide` = 1 where options in ('RFQ','Supplier Quotation')") @@ -183,7 +183,7 @@ def execute(patch_no): import webnotes webnotes.conn.set_global("system_message", """

UI Updates

Based on user feedback, we have made a couple of changes in the UI:Do send us your feedback!""") webnotes.conn.set_global("system_message_id", "4") - + sql("update `tabModule Def Item` set doc_type = 'Setup Forms' where doc_name in ('TDS Payment', 'TDS Return Acknowledgement', 'Form 16A', 'Period Closing Voucher', 'IT Checklist')") from webnotes.session_cache import clear_cache clear_cache(webnotes.session['user']) @@ -212,7 +212,7 @@ def execute(patch_no): for d in fld_map: emp_obj.doc.fields[d] = prof_obj.doc.fields[d] emp_obj.doc.current_accommodation_type = prof_obj.doc.present_accommodation_type - + # address per_addr = cstr(e[2]) + '\n' + cstr(e[3]) + '\n' + cstr(e[4]) + '\n' + cstr(e[5]) + ', ' + cstr(e[6]) + '\n' + 'PIN - ' + cstr(e[7]) + '\n' + 'Ph. No' + cstr(e[8]) cur_addr = cstr(e[9]) + '\n' + cstr(e[10]) + '\n' + cstr(e[11]) + '\n' + cstr(e[12]) + ', ' + cstr(e[13]) + '\n' + 'PIN - ' + cstr(e[14]) + '\n' + 'Ph. No' + cstr(e[15]) @@ -244,7 +244,7 @@ def execute(patch_no): elif patch_no == 70: # update search criteria module -> System sql("update tabDocType set module='System' where name='Search Criteria'") - + # Cleanups to Contact sql("update tabDocField set fieldtype='Data' where options='Designation' and parent='Contact'") sql("update tabDocField set fieldtype='Data' where options='Department' and parent='Contact'") @@ -254,10 +254,10 @@ def execute(patch_no): from webnotes.modules.import_module import import_from_files import_from_files(record_list=[['tools','doctype','contact']]) - + # remove last_contact_date from Lead sql("delete from tabDocField where fieldname='last_contact_date' and parent='Lead'") - + elif patch_no == 71: # Make Stock Qty and Conversion Factor field editable. Also no need to mention Conversion factor in table can do it directly sql("update `tabDocField` set `permlevel` = 0, `width` = '100px', `trigger` = 'Client' where parent IN ('PO Detail','Purchase Receipt Detail') and fieldname in ('stock_qty','conversion_factor')") @@ -266,18 +266,18 @@ def execute(patch_no): elif patch_no == 72: # Core Patch # ---------- - + from webnotes.modules.import_module import import_from_files - + # import module def import_from_files(record_list = [['core', 'Module Def', 'Core']]) elif patch_no == 73: # set module in DocTypes sql("update tabDocType set module='Core' where name in ('DocType', 'DocField', 'DocPerm', 'Role', 'UserRole', 'Profile', 'Print Format', 'DocFormat', 'Control Panel', 'Event', 'Event Role', 'Event User', 'DefaultValue', 'Default Home Page', 'File', 'File Group', 'File Data', 'Letter Head', 'Module Def', 'Module Def Item', 'Module Def Role', 'Page', 'Page Role', 'Search Criteria', 'DocType Label', 'DocType Mapper', 'Field Mapper Detail', 'Table Mapper Detail')") - + # set module in Page sql("update tabPage set module='Core' where name='Login Page'") - + # move file browser to Tools sql("update tabPage set module='Tools' where name='File Browser'") sql("update tabDocType set module='Tools' where name='File Browser Control'") @@ -351,7 +351,7 @@ def execute(patch_no): p.add_permission('Salary Slip', 'Employee', 1, read = 1, match = 'owner') elif patch_no == 79: # Import Modules - + import_from_files(record_list=[['payroll','doctype','leave_application'],['payroll','doctype','leave_allocation'],['payroll','doctype','leave_control_panel'],['payroll','doctype','holiday_list'],['payroll','doctype','holiday_list_detail'],['payroll','Module Def','Payroll']]) elif patch_no == 80: # Holiday List @@ -405,7 +405,7 @@ def execute(patch_no): elif patch_no == 81: # Import Modules - + import_from_files(record_list=[['payroll','Module Def','Payroll']]) elif patch_no == 82: sql("update tabDocType set search_fields = 'employee,leave_type,total_leaves_allocated,fiscal_year' where name = 'Leave Allocation'") @@ -432,13 +432,13 @@ def execute(patch_no): sql("update tabDocPerm set `match` = '' where parent = 'Leave Application' and role = 'HR User'") elif patch_no == 86: # Import Modules - + import_from_files(record_list=[['payroll','doctype','leave_type']]) elif patch_no == 87: sql("update `tabLeave Type` set is_lwp = 1 where name = 'Leave Without Pay'") elif patch_no == 88: # Import Modules - + import_from_files(record_list=[['payroll','doctype','leave_allocation']]) elif patch_no == 89: sql("delete from `tabModule Def Item` where doc_type = 'Setup Forms' and doc_name in ('Payroll Rule', 'IT Checklist', 'Employee Profile') and parent = 'Payroll'") @@ -457,10 +457,10 @@ def execute(patch_no): sql("update `tabTable Mapper Detail` set validation_logic = 'qty > ifnull(billed_qty,0) and docstatus = 1' where parent = 'Sales Order-Receivable Voucher' and from_table = 'Sales Order Detail'") sql("update `tabField Mapper Detail` set from_field = 'customer' where to_field = 'customer' and parent = 'Sales Order-Receivable Voucher'") elif patch_no == 94: - + import_from_files(record_list=[['crm','doctype','sms_center']]) elif patch_no == 95: - + import_from_files(record_list=[['mapper','DocType Mapper','Sales Order-Receivable Voucher'], ['mapper','DocType Mapper','Delivery Note-Receivable Voucher']]) elif patch_no == 96: sql("delete from `tabModule Def Item` where doc_type = 'Reports' and display_name = 'Cenvat Credit - Input or Capital Goods' and parent = 'Accounts'") @@ -490,7 +490,7 @@ def execute(patch_no): elif patch_no == 103: sql("update tabDocField set fieldname = '' where fieldtype = 'HTML'") elif patch_no == 104: - + import_from_files(record_list=[['payroll','search_criteria','stdsrch_00001'],['payroll','search_criteria','stdsrch_00002'],['payroll','search_criteria','stdsrch_00003'],['payroll','Module Def','Payroll'],['payroll','doctype','leave_application'],['payroll','doctype','leave_allocation']]) elif patch_no == 105: # Employee Leave Balance @@ -535,7 +535,7 @@ def execute(patch_no): # patch for timesheet cleanup from webnotes.model import delete_doc delete_doc('DocType', 'Timesheet Detail') - + from webnotes.modules.import_module import import_from_files import_from_files(record_list = [['Projects', 'DocType', 'Timesheet'], ['Projects', 'DocType', 'Timesheet Detail'], ['Projects', 'DocType', 'Activity Type']]) @@ -543,7 +543,7 @@ def execute(patch_no): # again! from webnotes.model import delete_doc delete_doc('DocType', 'Timesheet Detail') - + from webnotes.modules.import_module import import_from_files import_from_files(record_list = [['Projects', 'DocType', 'Timesheet Detail']]) elif patch_no == 117: @@ -646,13 +646,13 @@ def execute(patch_no): elif patch_no == 142: # fixes to letter head and personalize from webnotes.model import delete_doc - + delete_doc('DocType', 'Batch Settings') delete_doc('DocType', 'Batch Settings Detail') delete_doc('DocType', 'Social Badge') delete_doc('Page', 'Personalize Page') delete_doc('DocType', 'Personalize Page Control') - + import_from_files(record_list=[['core','doctype','letter_head'], ['setup','doctype','personalize']]) elif patch_no == 144: webnotes.conn.sql("update tabDocField set fieldtype='Code' where parent='Letter Head' and fieldname='content'") @@ -917,7 +917,7 @@ def execute(patch_no): reload_doc('knowledge_base', 'page', 'questions') reload_doc('knowledge_base', 'Module Def', 'Knowledge Base') sql("update `tabModule Def` set disabled='No' where name='Knowledge Base'") - elif patch_no == 229: + elif patch_no == 229: reload_doc('knowledge_base', 'page', 'question_view') elif patch_no == 230: reload_doc('srm', 'doctype', 'indent') @@ -933,7 +933,7 @@ def execute(patch_no): elif patch_no == 234: sql("update `tabTable Mapper Detail` set validation_logic = 'docstatus=1' where parent = 'Sales Order-Indent' and from_table = 'Sales Order Detail'") elif patch_no == 235: - for sc in sql("""select name from `tabSearch Criteria` where ifnull(name,'') + for sc in sql("""select name from `tabSearch Criteria` where ifnull(name,'') like 'srch%' or ifnull(name,'') like '%stdsrch'"""): try: get_obj('Search Criteria', sc[0]).rename() @@ -951,7 +951,7 @@ def execute(patch_no): elif patch_no == 239: reload_doc('core', 'doctype', 'docfield') reload_doc('core', 'doctype', 'doctype') - + from patches.feed_patch import set_subjects_and_tagfields set_subjects_and_tagfields() elif patch_no == 240: @@ -1026,7 +1026,7 @@ def execute(patch_no): sql("update `tabItem` set description_html = replace(description_html, 'http://46.4.50.84/v170-test/', '')") elif patch_no == 257: from patches.customer_address import run_old_data_sync_patch - run_old_data_sync_patch() + run_old_data_sync_patch() elif patch_no == 258: sql("update tabDocField set `default`=NULL where fieldname = 'naming_series'") elif patch_no == 259: @@ -1050,7 +1050,7 @@ def execute(patch_no): elif patch_no == 263: ol = ['','Open','To Reply','Waiting for Customer','Hold','Closed'] sql("update tabDocField set options=%s where parent=%s and fieldname=%s", ('\n'.join(ol), 'Support Ticket', 'status')) - elif patch_no == 264: + elif patch_no == 264: sql("delete from tabDocField where parent = 'Customer Issue' and (fieldname = 'issue_in' or fieldname = 'issue_category')") sql("update tabDocField set options=NULL where parent='Support Ticket' and label = 'Send'") elif patch_no == 266: @@ -1077,12 +1077,12 @@ def execute(patch_no): reload_doc('crm','doctype','sales_order') reload_doc('material_management','doctype','delivery_note') sql("delete from tabDocField where fieldname='per_amt_billed' and parent in ('Sales Order', 'Delivery Note')") - - sql("""update `tabSales Order` set delivery_status = if(ifnull(per_delivered,0) < 0.001, 'Not Delivered', + + sql("""update `tabSales Order` set delivery_status = if(ifnull(per_delivered,0) < 0.001, 'Not Delivered', if(per_delivered >= 99.99, 'Fully Delivered', 'Partly Delivered'))""") - sql("""update `tabSales Order` set billing_status = if(ifnull(per_billed,0) < 0.001, 'Not Billed', + sql("""update `tabSales Order` set billing_status = if(ifnull(per_billed,0) < 0.001, 'Not Billed', if(per_billed >= 99.99, 'Fully Billed', 'Partly Billed'))""") - sql("""update `tabDelivery Note` set billing_status = if(ifnull(per_billed,0) < 0.001, 'Not Billed', + sql("""update `tabDelivery Note` set billing_status = if(ifnull(per_billed,0) < 0.001, 'Not Billed', if(per_billed >= 99.99, 'Fully Billed', 'Partly Billed'))""") elif patch_no == 272: from webnotes.model import delete_doc @@ -1116,7 +1116,7 @@ def execute(patch_no): rec = sql("select voucher_type, voucher_no, ifnull(is_cancelled, 'No') from `tab%s` where modified >= '2011-06-15 01:00:00' group by voucher_no" % t) for d in rec: sql("update `tab%s` set docstatus = %s where name = '%s'" % (d[0], d[2]=='No' and 1 or 2, d[1])) - + other_dt = ['Enquiry', 'Quotation', 'Sales Order', 'Indent', 'Purchase Order', 'Production Order', 'Customer Issue', 'Installation Note'] for dt in other_dt: rec = sql("select name, status from `tab%s` where modified >= '2011-06-15 01:00:00'" % dt) @@ -1151,9 +1151,9 @@ def execute(patch_no): reload_doc('accounts', 'doctype', 'payable_voucher') elif patch_no == 289: sql("update `tabDocType` set subject = 'From %(supplier_name)s worth %(grand_total)s due on %(due_date)s | %(outstanding_amount)s outstanding' where name = 'Payable Voucher'") - sql("update `tabDocType` set search_fields = 'status,transaction_date,customer,lead,order_type' where name = 'Quotation'") + sql("update `tabDocType` set search_fields = 'status,transaction_date,customer,lead,order_type' where name = 'Quotation'") elif patch_no == 290: - count = sql("""SELECT * FROM `tabModule Def` + count = sql("""SELECT * FROM `tabModule Def` WHERE `module_name` LIKE 'Home'""") if not count: md = Document('Module Def') @@ -1236,14 +1236,14 @@ def execute(patch_no): rec = sql("select voucher_type, voucher_no, ifnull(is_cancelled, 'No') from `tab%s` where modified >= '2011-07-06 10:00:00' group by voucher_no" % t) for d in rec: sql("update `tab%s` set docstatus = %s where name = '%s'" % (d[0], d[2]=='No' and 1 or 2, d[1])) - + other_dt = ['Enquiry', 'Quotation', 'Sales Order', 'Indent', 'Purchase Order', 'Production Order', 'Customer Issue', 'Installation Note'] for dt in other_dt: rec = sql("select name, status from `tab%s` where modified >= '2011-07-06 10:00:00'" % dt) for r in rec: sql("update `tab%s` set docstatus = %s where name = '%s'" % (dt, (r[1] in ['Submitted', 'Closed'] and 1 or r[1]=='Cancelled' and 2 or 0), r[0])) - - + + dt_list = ['Delivery Note', 'Purchase Receipt'] for dt in dt_list: sql("update `tab%s` set status = 'Submitted' where docstatus = 1 and modified >='2011-07-06 10:00:00'" % dt) @@ -1254,7 +1254,7 @@ def execute(patch_no): tbl = sql("select options from `tabDocField` where fieldtype = 'Table' and parent = '%s'" % d) for t in tbl: sql("update `tab%s` t1, `tab%s` t2 set t1.docstatus = t2.docstatus where t1.parent = t2.name" % (t[0], d)) - + elif patch_no == 314: # delete double feed sql("delete from tabFeed where subject like 'New %'") @@ -1273,7 +1273,7 @@ def execute(patch_no): elif patch_no == 316: pass elif patch_no == 317: - sql("update `tabPage` set name = 'profile-settings' where page_name = 'Profile Settings'") + sql("update `tabPage` set name = 'profile-settings' where page_name = 'Profile Settings'") elif patch_no == 318: reload_doc('utilities', 'doctype', 'bulk_rename_tool') elif patch_no == 319: @@ -1300,7 +1300,7 @@ def execute(patch_no): elif patch_no == 327: # patch for support email settings now moved to email settings reload_doc('setup','doctype','email_settings') - + # map fields from support to email settings field_map = { 'support_email': 'email', @@ -1311,14 +1311,40 @@ def execute(patch_no): 'sync_support_mails': 'integrate_incoming', 'signature': 'support_signature' } - + for key in field_map: webnotes.conn.set_value('Email Settings',None,key, \ webnotes.conn.get_value('Support Email Settings',None,field_map[key])) - + # delete support email settings from webnotes.model import delete_doc delete_doc('DocType', 'Support Email Settings') reload_doc('support','doctype','support_ticket') - sql("delete from tabDocField where fieldname='problem_description' and parent='Support Ticket'") \ No newline at end of file + sql("delete from tabDocField where fieldname='problem_description' and parent='Support Ticket'") + elif patch_no == 328: + if webnotes.conn.get_value('Control Panel', None, 'account_id') != 'axjanak2011': + sql("delete from `tabDocField` where fieldname = 'supplier_status' and parent = 'Supplier'") + elif patch_no == 329: + reload_doc('utilities', 'doctype', 'rename_tool') + reload_doc('utilities', 'doctype', 'bulk_rename_tool') + elif patch_no == 330: + reload_doc('accounts', 'doctype', 'lease_agreement') + reload_doc('accounts', 'doctype', 'lease_installment') + + reload_doc('accounts', 'search_criteria', 'lease_agreement_list') + reload_doc('accounts', 'search_criteria', 'lease_monthly_future_installment_inflows') + reload_doc('accounts', 'search_criteria', 'lease_overdue_age_wise') + reload_doc('accounts', 'search_criteria', 'lease_overdue_list') + reload_doc('accounts', 'search_criteria', 'lease_receipts_client_wise') + reload_doc('accounts', 'search_criteria', 'lease_receipt_summary_year_to_date') + reload_doc('accounts', 'search_criteria', 'lease_yearly_future_installment_inflows') + + reload_doc('accounts', 'Module Def', 'Accounts') + elif patch_no == 331: + p = get_obj('Patch Util') + # permission + p.add_permission('Lease Agreement', 'Accounts Manager', 0, read = 1, write=1,submit=1, cancel=1,amend=1) + p.add_permission('Lease Agreement', 'Accounts Manager', 1, read = 1) + elif patch_no == 332: + sql("update `tabDocField` set permlevel=1, hidden = 1 where parent = 'Bulk Rename Tool' and fieldname = 'file_list'") diff --git a/production/doctype/bill_of_materials/bill_of_materials.txt b/production/doctype/bill_of_materials/bill_of_materials.txt index 4e788d7cdb5..37d8b69491b 100644 --- a/production/doctype/bill_of_materials/bill_of_materials.txt +++ b/production/doctype/bill_of_materials/bill_of_materials.txt @@ -12,6 +12,7 @@ # These values are common for all DocType { + '_last_update': '1309508837', 'allow_attach': 0, 'allow_copy': 0, 'allow_email': 0, diff --git a/production/doctype/bom_operation/bom_operation.txt b/production/doctype/bom_operation/bom_operation.txt index 873faec352c..9bc7f9e32f6 100644 --- a/production/doctype/bom_operation/bom_operation.txt +++ b/production/doctype/bom_operation/bom_operation.txt @@ -114,6 +114,7 @@ 'options': 'Workstation', 'permlevel': 0, 'reqd': 1, + 'search_index': 0, 'trigger': 'Client' }, diff --git a/production/doctype/bom_replace_utility_detail/bom_replace_utility_detail.txt b/production/doctype/bom_replace_utility_detail/bom_replace_utility_detail.txt index ab18e44accb..d36f26ba0ac 100644 --- a/production/doctype/bom_replace_utility_detail/bom_replace_utility_detail.txt +++ b/production/doctype/bom_replace_utility_detail/bom_replace_utility_detail.txt @@ -99,6 +99,7 @@ 'oldfieldname': 'bom_created', 'oldfieldtype': 'Link', 'options': 'Bill Of Materials', - 'permlevel': 1 + 'permlevel': 1, + 'search_index': 0 } ] \ No newline at end of file diff --git a/production/doctype/flat_bom_detail/flat_bom_detail.txt b/production/doctype/flat_bom_detail/flat_bom_detail.txt index 4b8812b44eb..73393005fb2 100644 --- a/production/doctype/flat_bom_detail/flat_bom_detail.txt +++ b/production/doctype/flat_bom_detail/flat_bom_detail.txt @@ -162,7 +162,8 @@ 'label': 'Stock UOM', 'oldfieldname': 'stock_uom', 'oldfieldtype': 'Link', - 'options': 'UOM' + 'options': 'UOM', + 'search_index': 0 }, # DocField diff --git a/production/doctype/pp_detail/pp_detail.txt b/production/doctype/pp_detail/pp_detail.txt index 61a34bdf76c..482fae23ca4 100644 --- a/production/doctype/pp_detail/pp_detail.txt +++ b/production/doctype/pp_detail/pp_detail.txt @@ -131,7 +131,7 @@ 'oldfieldtype': 'Date', 'permlevel': 0, 'reqd': 1, - 'search_index': 1, + 'search_index': 0, 'width': '100px' }, @@ -146,6 +146,7 @@ 'oldfieldtype': 'Link', 'options': 'Bill Of Materials', 'permlevel': 0, + 'search_index': 0, 'width': '100px' }, diff --git a/production/doctype/production_order/production_order.txt b/production/doctype/production_order/production_order.txt index 7df63971d41..c927edfae1d 100644 --- a/production/doctype/production_order/production_order.txt +++ b/production/doctype/production_order/production_order.txt @@ -180,6 +180,7 @@ 'options': 'Bill Of Materials', 'permlevel': 1, 'reqd': 1, + 'search_index': 0, 'trigger': 'Client' }, @@ -306,7 +307,8 @@ 'oldfieldtype': 'Link', 'options': 'Warehouse', 'permlevel': 0, - 'reqd': 1 + 'reqd': 1, + 'search_index': 0 }, # DocField @@ -323,7 +325,8 @@ 'oldfieldtype': 'Link', 'options': 'Warehouse', 'permlevel': 0, - 'reqd': 1 + 'reqd': 1, + 'search_index': 0 }, # DocField @@ -367,7 +370,8 @@ 'oldfieldtype': 'Link', 'options': 'Company', 'permlevel': 0, - 'reqd': 1 + 'reqd': 1, + 'search_index': 0 }, # DocField diff --git a/production/doctype/update_delivery_date_detail/update_delivery_date_detail.txt b/production/doctype/update_delivery_date_detail/update_delivery_date_detail.txt index f8499ce4a77..646a97ee0af 100644 --- a/production/doctype/update_delivery_date_detail/update_delivery_date_detail.txt +++ b/production/doctype/update_delivery_date_detail/update_delivery_date_detail.txt @@ -86,7 +86,8 @@ 'oldfieldname': 'state', 'oldfieldtype': 'Link', 'options': 'State', - 'permlevel': 0 + 'permlevel': 0, + 'search_index': 0 }, # DocField @@ -100,7 +101,8 @@ 'oldfieldtype': 'Link', 'options': 'Territory', 'permlevel': 1, - 'print_hide': 1 + 'print_hide': 1, + 'search_index': 0 }, # DocField diff --git a/projects/doctype/project/project.txt b/projects/doctype/project/project.txt index b1442468898..3d57e12b919 100644 --- a/projects/doctype/project/project.txt +++ b/projects/doctype/project/project.txt @@ -94,7 +94,8 @@ 'oldfieldname': 'project_name', 'oldfieldtype': 'Data', 'permlevel': 0, - 'reqd': 1 + 'reqd': 1, + 'search_index': 1 }, # DocField @@ -112,7 +113,7 @@ 'options': 'Open\nCompleted\nCancelled', 'permlevel': 0, 'reqd': 1, - 'search_index': 1 + 'search_index': 0 }, # DocField @@ -356,7 +357,7 @@ 'oldfieldname': 'customer_name', 'oldfieldtype': 'Data', 'permlevel': 1, - 'search_index': 1 + 'search_index': 0 }, # DocField @@ -401,6 +402,7 @@ 'options': 'Territory', 'permlevel': 0, 'reqd': 0, + 'search_index': 0, 'trigger': 'Client' }, @@ -438,7 +440,8 @@ 'oldfieldname': 'customer_group', 'oldfieldtype': 'Link', 'options': 'Customer Group', - 'permlevel': 1 + 'permlevel': 1, + 'search_index': 0 }, # DocField diff --git a/projects/doctype/timesheet/timesheet.txt b/projects/doctype/timesheet/timesheet.txt index 462b64bc284..839da19ad1a 100644 --- a/projects/doctype/timesheet/timesheet.txt +++ b/projects/doctype/timesheet/timesheet.txt @@ -145,7 +145,8 @@ 'oldfieldtype': 'Link', 'options': 'Profile', 'permlevel': 0, - 'reqd': 1 + 'reqd': 1, + 'search_index': 0 }, # DocField diff --git a/projects/doctype/timesheet_detail/timesheet_detail.txt b/projects/doctype/timesheet_detail/timesheet_detail.txt index a96c14b9ff4..0098228ff10 100644 --- a/projects/doctype/timesheet_detail/timesheet_detail.txt +++ b/projects/doctype/timesheet_detail/timesheet_detail.txt @@ -75,6 +75,7 @@ 'options': 'Activity Type', 'permlevel': 0, 'reqd': 1, + 'search_index': 0, 'width': '200px' }, diff --git a/selling/doctype/customer/customer.txt b/selling/doctype/customer/customer.txt index 364b148fafb..24271ee688c 100644 --- a/selling/doctype/customer/customer.txt +++ b/selling/doctype/customer/customer.txt @@ -5,14 +5,14 @@ { 'creation': '2010-08-08 17:08:56', 'docstatus': 0, - 'modified': '2011-05-26 17:31:31', + 'modified': '2011-07-20 10:42:05', 'modified_by': 'Administrator', 'owner': 'Administrator' }, # These values are common for all DocType { - '_last_update': '1306834669', + '_last_update': '1309508837', 'allow_print': 0, 'allow_trash': 1, 'colour': 'White:FFF', @@ -26,7 +26,7 @@ 'show_in_menu': 0, 'subject': "eval:'%(customer_name)s'=='%(name)s' ? ' ' : '%(customer_name)s'", 'tag_fields': 'customer_group,customer_type', - 'version': 431 + 'version': 433 }, # These values are common for all DocField @@ -176,7 +176,7 @@ 'idx': 4, 'label': 'Series', 'no_copy': 1, - 'options': '\nCUST\nCUSTMUM', + 'options': '\nCUST\nCUSTMUM\nCUSTOM', 'permlevel': 0, 'print_hide': 0 }, @@ -340,7 +340,7 @@ 'options': 'Company', 'permlevel': 0, 'reqd': 1, - 'search_index': 1 + 'search_index': 0 }, # DocField diff --git a/selling/doctype/enquiry/enquiry.txt b/selling/doctype/enquiry/enquiry.txt index c13ad46956d..260e077bae7 100644 --- a/selling/doctype/enquiry/enquiry.txt +++ b/selling/doctype/enquiry/enquiry.txt @@ -187,7 +187,7 @@ 'permlevel': 0, 'print_hide': 1, 'reqd': 0, - 'search_index': 0, + 'search_index': 1, 'trigger': 'Client' }, @@ -244,6 +244,7 @@ 'options': 'Lead', 'permlevel': 0, 'print_hide': 1, + 'search_index': 1, 'trigger': 'Client' }, @@ -326,6 +327,7 @@ 'oldfieldtype': 'Date', 'permlevel': 0, 'reqd': 1, + 'search_index': 1, 'width': '50px' }, @@ -405,7 +407,7 @@ 'permlevel': 0, 'print_hide': 1, 'reqd': 1, - 'search_index': 1, + 'search_index': 0, 'trigger': 'Client' }, @@ -426,7 +428,7 @@ 'permlevel': 0, 'print_hide': 1, 'reqd': 0, - 'search_index': 1, + 'search_index': 0, 'trigger': 'Client' }, @@ -492,7 +494,7 @@ 'permlevel': 0, 'print_hide': 1, 'reqd': 1, - 'search_index': 1 + 'search_index': 0 }, # DocField @@ -509,7 +511,7 @@ 'permlevel': 0, 'print_hide': 1, 'reqd': 1, - 'search_index': 1 + 'search_index': 0 }, # DocField diff --git a/selling/doctype/enquiry_detail/enquiry_detail.txt b/selling/doctype/enquiry_detail/enquiry_detail.txt index bd9275b93ba..284b43642c9 100644 --- a/selling/doctype/enquiry_detail/enquiry_detail.txt +++ b/selling/doctype/enquiry_detail/enquiry_detail.txt @@ -90,7 +90,8 @@ 'oldfieldname': 'item_group', 'oldfieldtype': 'Link', 'options': 'Item Group', - 'print_hide': 1 + 'print_hide': 1, + 'search_index': 0 }, # DocField @@ -104,7 +105,8 @@ 'oldfieldname': 'brand', 'oldfieldtype': 'Link', 'options': 'Brand', - 'print_hide': 1 + 'print_hide': 1, + 'search_index': 0 }, # DocField @@ -140,6 +142,7 @@ 'label': 'UOM', 'oldfieldname': 'uom', 'oldfieldtype': 'Link', - 'options': 'UOM' + 'options': 'UOM', + 'search_index': 0 } ] \ No newline at end of file diff --git a/selling/doctype/installation_note/installation_note.txt b/selling/doctype/installation_note/installation_note.txt index adfce208b1c..8feb2f59913 100644 --- a/selling/doctype/installation_note/installation_note.txt +++ b/selling/doctype/installation_note/installation_note.txt @@ -201,7 +201,7 @@ 'oldfieldtype': 'Data', 'permlevel': 1, 'reqd': 0, - 'search_index': 1 + 'search_index': 0 }, # DocField @@ -257,7 +257,7 @@ 'permlevel': 0, 'print_hide': 1, 'reqd': 1, - 'search_index': 1 + 'search_index': 0 }, # DocField @@ -292,7 +292,8 @@ 'oldfieldname': 'inst_date', 'oldfieldtype': 'Date', 'permlevel': 0, - 'reqd': 1 + 'reqd': 1, + 'search_index': 1 }, # DocField @@ -340,7 +341,7 @@ 'permlevel': 0, 'print_hide': 1, 'reqd': 1, - 'search_index': 1, + 'search_index': 0, 'trigger': 'Client' }, diff --git a/selling/doctype/installed_item_details/installed_item_details.txt b/selling/doctype/installed_item_details/installed_item_details.txt index 7971cb52d2e..3b4632c56fe 100644 --- a/selling/doctype/installed_item_details/installed_item_details.txt +++ b/selling/doctype/installed_item_details/installed_item_details.txt @@ -140,7 +140,7 @@ 'oldfieldtype': 'Data', 'permlevel': 1, 'print_hide': 1, - 'search_index': 1, + 'search_index': 0, 'width': '150px' }, diff --git a/selling/doctype/lead/lead.txt b/selling/doctype/lead/lead.txt index a476c66577b..23873236a59 100644 --- a/selling/doctype/lead/lead.txt +++ b/selling/doctype/lead/lead.txt @@ -188,7 +188,7 @@ 'options': "\nExisting Customer\nReference\nAdvertisement\nCold Calling\nExhibition\nSupplier Reference\nMass Mailing\nCustomer's Vendor\nCampaign\nWebsite", 'permlevel': 0, 'reqd': 1, - 'search_index': 1, + 'search_index': 0, 'trigger': 'Client' }, @@ -239,7 +239,7 @@ 'oldfieldtype': 'Data', 'permlevel': 0, 'reqd': 0, - 'search_index': 1, + 'search_index': 0, 'trigger': 'Client' }, @@ -350,7 +350,7 @@ 'options': '\nHot\nWarm\nCold', 'permlevel': 0, 'reqd': 0, - 'search_index': 1 + 'search_index': 0 }, # DocField @@ -616,7 +616,7 @@ 'oldfieldtype': 'Link', 'options': 'Profile', 'permlevel': 0, - 'search_index': 1 + 'search_index': 0 }, # DocField @@ -633,7 +633,7 @@ 'options': '\nLower Income\nMiddle Income\nUpper Income', 'permlevel': 0, 'reqd': 0, - 'search_index': 1 + 'search_index': 0 }, # DocField diff --git a/selling/doctype/quotation/quotation.txt b/selling/doctype/quotation/quotation.txt index e198b86086f..6763c2df254 100644 --- a/selling/doctype/quotation/quotation.txt +++ b/selling/doctype/quotation/quotation.txt @@ -414,7 +414,7 @@ 'permlevel': 0, 'print_hide': 0, 'reqd': 1, - 'search_index': 1 + 'search_index': 0 }, # DocField @@ -435,7 +435,7 @@ 'permlevel': 1, 'print_hide': 1, 'reqd': 1, - 'search_index': 1 + 'search_index': 0 }, # DocField @@ -520,7 +520,7 @@ 'permlevel': 0, 'print_hide': 1, 'reqd': 1, - 'search_index': 1, + 'search_index': 0, 'trigger': 'Client' }, @@ -539,7 +539,7 @@ 'permlevel': 0, 'print_hide': 1, 'reqd': 0, - 'search_index': 1, + 'search_index': 0, 'trigger': 'Client' }, @@ -584,7 +584,7 @@ 'permlevel': 0, 'print_hide': 1, 'reqd': 1, - 'search_index': 1, + 'search_index': 0, 'trigger': 'Client', 'width': '100px' }, @@ -1035,7 +1035,7 @@ 'permlevel': 0, 'print_hide': 1, 'reqd': 1, - 'search_index': 1, + 'search_index': 0, 'trigger': 'Client', 'width': '150px' }, @@ -1055,7 +1055,7 @@ 'permlevel': 0, 'print_hide': 1, 'reqd': 1, - 'search_index': 1 + 'search_index': 0 }, # DocField diff --git a/selling/doctype/quotation_detail/quotation_detail.txt b/selling/doctype/quotation_detail/quotation_detail.txt index 074443bd267..23c86fab4f6 100644 --- a/selling/doctype/quotation_detail/quotation_detail.txt +++ b/selling/doctype/quotation_detail/quotation_detail.txt @@ -73,7 +73,7 @@ 'permlevel': 0, 'print_hide': 1, 'reqd': 1, - 'search_index': 1, + 'search_index': 0, 'width': '150px' }, @@ -260,7 +260,7 @@ 'options': 'Item Group', 'permlevel': 1, 'print_hide': 1, - 'search_index': 1 + 'search_index': 0 }, # DocField @@ -276,7 +276,7 @@ 'options': 'Brand', 'permlevel': 1, 'print_hide': 1, - 'search_index': 1, + 'search_index': 0, 'width': '150px' }, diff --git a/selling/doctype/return_detail/return_detail.txt b/selling/doctype/return_detail/return_detail.txt index 7091b3f3821..4c1e2f721c7 100644 --- a/selling/doctype/return_detail/return_detail.txt +++ b/selling/doctype/return_detail/return_detail.txt @@ -75,7 +75,8 @@ 'oldfieldname': 'uom', 'oldfieldtype': 'Link', 'options': 'UOM', - 'permlevel': 1 + 'permlevel': 1, + 'search_index': 0 }, # DocField diff --git a/selling/doctype/sales_order_detail/sales_order_detail.txt b/selling/doctype/sales_order_detail/sales_order_detail.txt index e89768c6ecf..7e46d74af15 100644 --- a/selling/doctype/sales_order_detail/sales_order_detail.txt +++ b/selling/doctype/sales_order_detail/sales_order_detail.txt @@ -394,7 +394,7 @@ 'options': 'Brand', 'permlevel': 1, 'print_hide': 1, - 'search_index': 1 + 'search_index': 0 }, # DocField @@ -410,7 +410,7 @@ 'options': 'Item Group', 'permlevel': 1, 'print_hide': 1, - 'search_index': 1 + 'search_index': 0 }, # DocField diff --git a/setup/doctype/authorization_rule/authorization_rule.txt b/setup/doctype/authorization_rule/authorization_rule.txt index ef20f3621a3..a4364956ae5 100644 --- a/setup/doctype/authorization_rule/authorization_rule.txt +++ b/setup/doctype/authorization_rule/authorization_rule.txt @@ -79,7 +79,8 @@ 'oldfieldname': 'company', 'oldfieldtype': 'Link', 'options': 'Company', - 'reqd': 0 + 'reqd': 0, + 'search_index': 0 }, # DocField @@ -157,7 +158,8 @@ 'label': 'Applicable To (Employee)', 'oldfieldname': 'to_emp', 'oldfieldtype': 'Link', - 'options': 'Employee' + 'options': 'Employee', + 'search_index': 0 }, # DocField @@ -171,7 +173,8 @@ 'label': 'Applicable To (Designation)', 'oldfieldname': 'to_designation', 'oldfieldtype': 'Link', - 'options': 'Designation' + 'options': 'Designation', + 'search_index': 0 }, # DocField diff --git a/setup/doctype/company/company.txt b/setup/doctype/company/company.txt index a7498d6e057..15ba781a67e 100644 --- a/setup/doctype/company/company.txt +++ b/setup/doctype/company/company.txt @@ -5,7 +5,7 @@ { 'creation': '2010-08-08 17:08:55', 'docstatus': 0, - 'modified': '2011-07-06 11:42:34', + 'modified': '2011-07-01 17:43:29', 'modified_by': 'Administrator', 'owner': 'Administrator' }, diff --git a/setup/doctype/naming_series_options/naming_series_options.txt b/setup/doctype/naming_series_options/naming_series_options.txt index f30686daaa6..b964556fdce 100644 --- a/setup/doctype/naming_series_options/naming_series_options.txt +++ b/setup/doctype/naming_series_options/naming_series_options.txt @@ -66,7 +66,8 @@ 'idx': 1, 'label': 'Doc Type', 'oldfieldname': 'doc_type', - 'oldfieldtype': 'Data' + 'oldfieldtype': 'Data', + 'search_index': 1 }, # DocField diff --git a/setup/doctype/other_charges/other_charges.txt b/setup/doctype/other_charges/other_charges.txt index b9908fc3b01..ac9c6c58b16 100644 --- a/setup/doctype/other_charges/other_charges.txt +++ b/setup/doctype/other_charges/other_charges.txt @@ -160,7 +160,7 @@ 'oldfieldtype': 'Data', 'permlevel': 0, 'reqd': 1, - 'search_index': 1 + 'search_index': 0 }, # DocField @@ -186,7 +186,7 @@ 'options': 'Company', 'permlevel': 0, 'reqd': 1, - 'search_index': 1 + 'search_index': 0 }, # DocField diff --git a/setup/doctype/sales_partner/sales_partner.txt b/setup/doctype/sales_partner/sales_partner.txt index a61a9fb2dce..18b3abb5b4e 100644 --- a/setup/doctype/sales_partner/sales_partner.txt +++ b/setup/doctype/sales_partner/sales_partner.txt @@ -191,7 +191,7 @@ 'oldfieldtype': 'Select', 'options': '\nChannel Partner\nDistributor\nDealer\nAgent\nRetailer\nImplementation Partner\nReseller', 'permlevel': 0, - 'search_index': 1 + 'search_index': 0 }, # DocField diff --git a/setup/doctype/sales_person/sales_person.txt b/setup/doctype/sales_person/sales_person.txt index 0ffcd7422ab..0680c3886fb 100644 --- a/setup/doctype/sales_person/sales_person.txt +++ b/setup/doctype/sales_person/sales_person.txt @@ -156,7 +156,7 @@ 'oldfieldtype': 'Data', 'permlevel': 0, 'reqd': 1, - 'search_index': 1 + 'search_index': 0 }, # DocField @@ -281,7 +281,7 @@ 'oldfieldtype': 'Select', 'options': 'link:Country', 'permlevel': 0, - 'search_index': 1, + 'search_index': 0, 'trigger': 'Client' }, @@ -297,7 +297,7 @@ 'oldfieldtype': 'Select', 'options': 'link:State', 'permlevel': 0, - 'search_index': 1 + 'search_index': 0 }, # DocField @@ -324,7 +324,8 @@ 'oldfieldname': 'territory', 'oldfieldtype': 'Link', 'options': 'Territory', - 'permlevel': 0 + 'permlevel': 0, + 'search_index': 0 }, # DocField @@ -397,7 +398,8 @@ 'oldfieldname': 'distribution_id', 'oldfieldtype': 'Link', 'options': 'Budget Distribution', - 'permlevel': 0 + 'permlevel': 0, + 'search_index': 0 }, # DocField diff --git a/setup/doctype/term/term.txt b/setup/doctype/term/term.txt index f169780b4da..fe3bd7576d3 100644 --- a/setup/doctype/term/term.txt +++ b/setup/doctype/term/term.txt @@ -155,7 +155,7 @@ 'oldfieldtype': 'Data', 'permlevel': 0, 'reqd': 1, - 'search_index': 1 + 'search_index': 0 }, # DocField diff --git a/setup/doctype/territory/territory.txt b/setup/doctype/territory/territory.txt index 0bf94f30299..a4de2d6f2d5 100644 --- a/setup/doctype/territory/territory.txt +++ b/setup/doctype/territory/territory.txt @@ -160,7 +160,7 @@ 'oldfieldtype': 'Link', 'options': 'Sales Person', 'permlevel': 0, - 'search_index': 1 + 'search_index': 0 }, # DocField @@ -267,7 +267,8 @@ 'oldfieldname': 'distribution_id', 'oldfieldtype': 'Link', 'options': 'Budget Distribution', - 'permlevel': 0 + 'permlevel': 0, + 'search_index': 0 }, # DocField diff --git a/setup/doctype/upload_accounts_transactions/__init__.py b/setup/doctype/upload_accounts_transactions/__init__.py new file mode 100644 index 00000000000..e69de29bb2d diff --git a/setup/doctype/upload_accounts_transactions/upload_accounts_transactions.js b/setup/doctype/upload_accounts_transactions/upload_accounts_transactions.js new file mode 100644 index 00000000000..041638fd936 --- /dev/null +++ b/setup/doctype/upload_accounts_transactions/upload_accounts_transactions.js @@ -0,0 +1,18 @@ + +//--------- ONLOAD ------------- +cur_frm.cscript.onload = function(doc, cdt, cdn) { +} + +cur_frm.cscript.refresh = function(doc, cdt, cdn) { + if(!doc.file_list) { + set_field_options('Upload Accounts Transactions Help', '
To upload transactions, please attach a (.csv) file with 5 columns - Date, Transaction Number, Account, Debit Amount, Credit Amount (no headings necessary). See attachments box in the right column
') + } else { + set_field_options('Upload Accounts Transactions Help', '
To update transactions from the attachment, please click on "Upload Accounts Transactions"
') + } +} + +cur_frm.cscript['Upload Accounts Transactions'] = function(doc, cdt, cdn) { + if(confirm("This action will append all transactions and cannot be un-done. Are you sure you want to continue?")) { + $c_obj([doc], 'upload_accounts_transactions', '', function(r, rt) { }); + } +} diff --git a/setup/doctype/upload_accounts_transactions/upload_accounts_transactions.py b/setup/doctype/upload_accounts_transactions/upload_accounts_transactions.py new file mode 100644 index 00000000000..2028e5fe60f --- /dev/null +++ b/setup/doctype/upload_accounts_transactions/upload_accounts_transactions.py @@ -0,0 +1,103 @@ +# Please edit this list and import only required elements +import webnotes + +from webnotes.utils import add_days, add_months, add_years, cint, cstr, date_diff, default_fields, flt, fmt_money, formatdate, generate_hash, getTraceback, get_defaults, get_first_day, get_last_day, getdate, has_common, month_name, now, nowdate, replace_newlines, sendmail, set_default, str_esc_quote, user_format, validate_email_add +from webnotes.model import db_exists +from webnotes.model.doc import Document, addchild, removechild, getchildren, make_autoname, SuperDocType +from webnotes.model.doclist import getlist, copy_doclist +from webnotes.model.code import get_obj, get_server_obj, run_server_obj, updatedb, check_syntax +from webnotes import session, form, is_testing, msgprint, errprint + +set = webnotes.conn.set +sql = webnotes.conn.sql +get_value = webnotes.conn.get_value +in_transaction = webnotes.conn.in_transaction +convert_to_lists = webnotes.conn.convert_to_lists + +# ----------------------------------------------------------------------------------------- + +class DocType: + def __init__(self, d, dl): + self.doc, self.doclist = d, dl + self.cl = [] + + # upload transactions + def upload_accounts_transactions(self): + import csv + data = csv.reader(self.get_csv_data().splitlines()) + + abbr = sql("select concat(' - ',abbr) as abbr from tabCompany where name=%s",self.doc.company) + updated = 0 + jv_name='' +# jv = Document('Journal Voucher') + global line,jv,name,jv_go + for line in data: + if len(line)>=7: #Minimum no of fields + if line[3]!=jv_name: #Create JV + if jv_name!='': + jv_go = get_obj('Journal Voucher',name, with_children=1) + jv_go.validate() + jv_go.on_submit() + + jv_name=line[3] + jv = Document('Journal Voucher') + jv.voucher_type = line[0] + jv.naming_series = line[1] + jv.voucher_date = formatdate(line[2]) + jv.posting_date = formatdate(line[2]) +# jv.name = line[3] + jv.fiscal_year = self.doc.fiscal_year + jv.company = self.doc.company + jv.remark = len(line)==8 and line[3]+' '+line[7] or line[3]+' Uploaded Record' + jv.docstatus=1 + jv.save(1) + name=jv.name + + jc = addchild(jv,'entries','Journal Voucher Detail',0) + jc.account = line[4]+abbr[0][0] + jc.cost_center=len(line)==9 and line[8] or self.doc.default_cost_center + if line[5]!='': + jc.debit = line[5] + else: + jc.credit = line[6] + jc.save() + + else: #Create JV Child + jc = addchild(jv,'entries','Journal Voucher Detail',0) + jc.account = line[4]+abbr[0][0] + jc.cost_center=len(line)==9 and line[8] or self.doc.default_cost_center + if line[5]!='': + jc.debit = line[5] + else: + jc.credit = line[6] + jc.save() + else: + msgprint("[Ignored] Incorrect format: %s" % str(line)) + if jv_name!='': + jv_go = get_obj('Journal Voucher',name, with_children=1) + jv_go.validate() + jv_go.on_submit() + + msgprint("%s items updated" % updated) + + # clear prices + def clear_prices(self): + cnt = sql("select count(*) from `tabRef Rate Detail` where price_list_name = %s", self.doc.name) + sql("delete from `tabRef Rate Detail` where price_list_name = %s", self.doc.name) + msgprint("%s prices cleared" % cnt[0][0]) + + # Update CSV data + def get_csv_data(self): + if not self.doc.file_list: + msgprint("File not attached!") + raise Exception + + fid = self.doc.file_list.split(',')[1] + + from webnotes.utils import file_manager + fn, content = file_manager.get_file(fid) + + if not type(content) == str: + content = content.tostring() + + return content diff --git a/setup/doctype/upload_accounts_transactions/upload_accounts_transactions.txt b/setup/doctype/upload_accounts_transactions/upload_accounts_transactions.txt new file mode 100644 index 00000000000..d637a886a60 --- /dev/null +++ b/setup/doctype/upload_accounts_transactions/upload_accounts_transactions.txt @@ -0,0 +1,126 @@ +# DocType, Upload Accounts Transactions +[ + + # These values are common in all dictionaries + { + 'creation': '2011-07-18 14:56:48', + 'docstatus': 0, + 'modified': '2011-07-19 12:19:13', + 'modified_by': 'Administrator', + 'owner': 'Administrator' + }, + + # These values are common for all DocType + { + '_last_update': '1310985428', + 'allow_attach': 1, + 'colour': 'White:FFF', + 'doctype': 'DocType', + 'issingle': 1, + 'max_attachments': 1, + 'module': 'Setup', + 'name': '__common__', + 'section_style': 'Simple', + 'show_in_menu': 1, + 'version': 5 + }, + + # These values are common for all DocField + { + 'doctype': 'DocField', + 'name': '__common__', + 'parent': 'Upload Accounts Transactions', + 'parentfield': 'fields', + 'parenttype': 'DocType', + 'permlevel': 0 + }, + + # These values are common for all DocPerm + { + 'cancel': 1, + 'create': 1, + 'doctype': 'DocPerm', + 'execute': 1, + 'idx': 1, + 'name': '__common__', + 'parent': 'Upload Accounts Transactions', + 'parentfield': 'permissions', + 'parenttype': 'DocType', + 'permlevel': 0, + 'read': 1, + 'role': 'Accounts Manager', + 'submit': 1, + 'write': 1 + }, + + # DocType, Upload Accounts Transactions + { + 'doctype': 'DocType', + 'name': 'Upload Accounts Transactions' + }, + + # DocPerm + { + 'doctype': 'DocPerm' + }, + + # DocField + { + 'doctype': 'DocField', + 'fieldtype': 'HTML', + 'idx': 1, + 'label': 'Usage', + 'options': '
\nUpload Account Transactions Help\n

To update the account transactions, upload a CSV file with five columns Date, Transaction Number, Account Name, Credit and Debit amount and click on the "Upload Account Transactions" button. The system will add the transactions.\n

' + }, + + # DocField + { + 'doctype': 'DocField', + 'fieldname': 'fiscal_year', + 'fieldtype': 'Link', + 'idx': 2, + 'label': 'Fiscal Year', + 'options': 'Fiscal Year', + 'reqd': 1 + }, + + # DocField + { + 'doctype': 'DocField', + 'fieldname': 'company', + 'fieldtype': 'Link', + 'idx': 3, + 'label': 'Company', + 'options': 'Company', + 'reqd': 1 + }, + + # DocField + { + 'doctype': 'DocField', + 'fieldname': 'default_cost_center', + 'fieldtype': 'Link', + 'idx': 4, + 'label': 'Default Cost Center', + 'options': 'Cost Center', + 'reqd': 1 + }, + + # DocField + { + 'doctype': 'DocField', + 'fieldname': 'file_list', + 'fieldtype': 'Small Text', + 'hidden': 1, + 'idx': 5, + 'label': 'File List' + }, + + # DocField + { + 'doctype': 'DocField', + 'fieldtype': 'Button', + 'idx': 6, + 'label': 'Upload Accounts Transactions' + } +] \ No newline at end of file diff --git a/setup/doctype/workflow_rule/workflow_rule.txt b/setup/doctype/workflow_rule/workflow_rule.txt index d95a481be0c..7c358265ad1 100644 --- a/setup/doctype/workflow_rule/workflow_rule.txt +++ b/setup/doctype/workflow_rule/workflow_rule.txt @@ -106,7 +106,7 @@ 'oldfieldtype': 'Select', 'options': '\nActive\nInactive', 'reqd': 1, - 'search_index': 1 + 'search_index': 0 }, # DocField diff --git a/setup/page/setup/setup.js b/setup/page/setup/setup.js index c0ba3d4dc0d..b29e7ad9e0a 100644 --- a/setup/page/setup/setup.js +++ b/setup/page/setup/setup.js @@ -183,6 +183,7 @@ SetupData = function(cnty){ ['Country',1,'Country','','Country master'], ['State',1,'State','','State master'], ['Rename Tool',3,'Rename Tool','','Rename a record'], + ['Bulk Rename Tool',3,'Bulk Rename Tool','','Rename multiple records at a time'], ['Activty Type',1,'Activity Type','','Types of activities that you can select in your Timesheet'], ['City',1,'City','','City master']]}; diff --git a/stock/doctype/bin/bin.txt b/stock/doctype/bin/bin.txt index 2ecbcf0d3c3..6a402972fdb 100644 --- a/stock/doctype/bin/bin.txt +++ b/stock/doctype/bin/bin.txt @@ -162,7 +162,7 @@ 'label': 'Reserved Quantity', 'oldfieldname': 'reserved_qty', 'oldfieldtype': 'Currency', - 'search_index': 1 + 'search_index': 0 }, # DocField @@ -176,7 +176,7 @@ 'label': 'Actual Quantity', 'oldfieldname': 'actual_qty', 'oldfieldtype': 'Currency', - 'search_index': 1 + 'search_index': 0 }, # DocField @@ -190,7 +190,7 @@ 'label': 'Ordered Quantity', 'oldfieldname': 'ordered_qty', 'oldfieldtype': 'Currency', - 'search_index': 1 + 'search_index': 0 }, # DocField @@ -204,7 +204,7 @@ 'label': 'Indented Quantity', 'oldfieldname': 'indented_qty', 'oldfieldtype': 'Currency', - 'search_index': 1 + 'search_index': 0 }, # DocField @@ -217,7 +217,7 @@ 'label': 'Planned Qty', 'oldfieldname': 'planned_qty', 'oldfieldtype': 'Currency', - 'search_index': 1 + 'search_index': 0 }, # DocField @@ -258,7 +258,7 @@ 'label': 'UOM', 'oldfieldname': 'stock_uom', 'oldfieldtype': 'Data', - 'search_index': 1 + 'search_index': 0 }, # DocField diff --git a/stock/doctype/delivery_note/delivery_note.txt b/stock/doctype/delivery_note/delivery_note.txt index 0c1cc52c36e..97280e99831 100644 --- a/stock/doctype/delivery_note/delivery_note.txt +++ b/stock/doctype/delivery_note/delivery_note.txt @@ -332,7 +332,7 @@ 'permlevel': 0, 'print_hide': 0, 'reqd': 1, - 'search_index': 1, + 'search_index': 0, 'width': '100px' }, @@ -352,7 +352,7 @@ 'permlevel': 1, 'print_hide': 1, 'reqd': 1, - 'search_index': 1, + 'search_index': 0, 'width': '150px' }, @@ -372,7 +372,7 @@ 'oldfieldtype': 'Currency', 'permlevel': 1, 'print_hide': 1, - 'search_index': 1 + 'search_index': 0 }, # DocField @@ -391,7 +391,7 @@ 'oldfieldtype': 'Currency', 'permlevel': 1, 'print_hide': 1, - 'search_index': 1 + 'search_index': 0 }, # DocField @@ -439,7 +439,7 @@ 'permlevel': 0, 'print_hide': 1, 'reqd': 1, - 'search_index': 1 + 'search_index': 0 }, # DocField @@ -453,7 +453,7 @@ 'options': 'Customer Group', 'permlevel': 0, 'print_hide': 1, - 'search_index': 1 + 'search_index': 0 }, # DocField @@ -1014,7 +1014,7 @@ 'permlevel': 0, 'print_hide': 1, 'reqd': 1, - 'search_index': 1, + 'search_index': 0, 'width': '150px' }, @@ -1032,7 +1032,7 @@ 'permlevel': 0, 'print_hide': 1, 'reqd': 1, - 'search_index': 1, + 'search_index': 0, 'width': '150px' }, diff --git a/stock/doctype/delivery_note_detail/delivery_note_detail.txt b/stock/doctype/delivery_note_detail/delivery_note_detail.txt index f5dd8bf9514..78aea3267f0 100644 --- a/stock/doctype/delivery_note_detail/delivery_note_detail.txt +++ b/stock/doctype/delivery_note_detail/delivery_note_detail.txt @@ -285,7 +285,8 @@ 'oldfieldtype': 'Link', 'options': 'Batch', 'permlevel': 0, - 'print_hide': 1 + 'print_hide': 1, + 'search_index': 0 }, # DocField @@ -299,7 +300,8 @@ 'oldfieldtype': 'Link', 'options': 'Item Group', 'permlevel': 1, - 'print_hide': 1 + 'print_hide': 1, + 'search_index': 0 }, # DocField @@ -314,6 +316,7 @@ 'options': 'Brand', 'permlevel': 1, 'print_hide': 1, + 'search_index': 0, 'width': '150px' }, @@ -423,7 +426,7 @@ 'oldfieldtype': 'Data', 'permlevel': 1, 'print_hide': 1, - 'search_index': 1, + 'search_index': 0, 'width': '150px' }, @@ -455,7 +458,7 @@ 'oldfieldtype': 'Data', 'permlevel': 1, 'print_hide': 1, - 'search_index': 0, + 'search_index': 1, 'width': '150px' }, diff --git a/stock/doctype/delivery_note_packing_detail/delivery_note_packing_detail.txt b/stock/doctype/delivery_note_packing_detail/delivery_note_packing_detail.txt index 10fdfdaa4ec..3924c13a8fd 100644 --- a/stock/doctype/delivery_note_packing_detail/delivery_note_packing_detail.txt +++ b/stock/doctype/delivery_note_packing_detail/delivery_note_packing_detail.txt @@ -178,7 +178,8 @@ 'oldfieldname': 'uom', 'oldfieldtype': 'Link', 'options': 'UOM', - 'permlevel': 1 + 'permlevel': 1, + 'search_index': 0 }, # DocField diff --git a/stock/doctype/item/item.txt b/stock/doctype/item/item.txt index a20c9687aca..ec42ff4a589 100644 --- a/stock/doctype/item/item.txt +++ b/stock/doctype/item/item.txt @@ -12,7 +12,7 @@ # These values are common for all DocType { - '_last_update': '1308741898', + '_last_update': '1309508838', 'allow_attach': 1, 'allow_trash': 1, 'autoname': 'field:item_code', @@ -197,7 +197,7 @@ 'oldfieldtype': 'Data', 'permlevel': 0, 'reqd': 1, - 'search_index': 1 + 'search_index': 0 }, # DocField @@ -241,7 +241,8 @@ 'options': 'Brand', 'permlevel': 0, 'print_hide': 1, - 'reqd': 0 + 'reqd': 0, + 'search_index': 0 }, # DocField @@ -312,7 +313,8 @@ 'oldfieldtype': 'Link', 'options': 'UOM', 'permlevel': 0, - 'reqd': 1 + 'reqd': 1, + 'search_index': 0 }, # DocField @@ -355,7 +357,8 @@ 'oldfieldname': 'default_warehouse', 'oldfieldtype': 'Link', 'options': 'Warehouse', - 'permlevel': 0 + 'permlevel': 0, + 'search_index': 0 }, # DocField @@ -556,6 +559,7 @@ 'oldfieldtype': 'Link', 'options': 'Account', 'permlevel': 0, + 'search_index': 0, 'trigger': 'Client' }, @@ -571,7 +575,8 @@ 'oldfieldname': 'cost_center', 'oldfieldtype': 'Link', 'options': 'Cost Center', - 'permlevel': 0 + 'permlevel': 0, + 'search_index': 0 }, # DocField @@ -719,7 +724,8 @@ 'idx': 43, 'label': 'Default Income Account', 'options': 'Account', - 'permlevel': 0 + 'permlevel': 0, + 'search_index': 0 }, # DocField @@ -730,7 +736,8 @@ 'idx': 44, 'label': 'Cost Center', 'options': 'Cost Center', - 'permlevel': 0 + 'permlevel': 0, + 'search_index': 0 }, # DocField @@ -872,7 +879,8 @@ 'oldfieldname': 'default_bom', 'oldfieldtype': 'Link', 'options': 'Bill Of Materials', - 'permlevel': 1 + 'permlevel': 1, + 'search_index': 0 }, # DocField @@ -909,19 +917,6 @@ 'reqd': 1 }, - # DocField - { - 'doctype': 'DocField', - 'fieldname': 'item_attachments_details', - 'fieldtype': 'Table', - 'idx': 58, - 'label': 'Item Attachments Details', - 'oldfieldname': 'item_attachments_details', - 'oldfieldtype': 'Table', - 'options': 'Item Attachments Detail', - 'permlevel': 0 - }, - # DocField { 'doctype': 'DocField', diff --git a/stock/doctype/landed_cost_detail/landed_cost_detail.txt b/stock/doctype/landed_cost_detail/landed_cost_detail.txt index 78efae544cc..57c73703f41 100644 --- a/stock/doctype/landed_cost_detail/landed_cost_detail.txt +++ b/stock/doctype/landed_cost_detail/landed_cost_detail.txt @@ -49,7 +49,8 @@ 'label': 'Account Head', 'oldfieldname': 'account_head', 'oldfieldtype': 'Link', - 'options': 'Account' + 'options': 'Account', + 'search_index': 1 }, # DocField diff --git a/stock/doctype/landed_cost_master/landed_cost_master.txt b/stock/doctype/landed_cost_master/landed_cost_master.txt index e405274e5e8..71374f870ce 100644 --- a/stock/doctype/landed_cost_master/landed_cost_master.txt +++ b/stock/doctype/landed_cost_master/landed_cost_master.txt @@ -12,6 +12,7 @@ # These values are common for all DocType { + '_last_update': '1309508838', 'autoname': 'field:title', 'colour': 'White:FFF', 'doctype': 'DocType', diff --git a/stock/doctype/lc_pr_detail/lc_pr_detail.txt b/stock/doctype/lc_pr_detail/lc_pr_detail.txt index 706af56586d..d09285db92e 100644 --- a/stock/doctype/lc_pr_detail/lc_pr_detail.txt +++ b/stock/doctype/lc_pr_detail/lc_pr_detail.txt @@ -48,7 +48,8 @@ 'label': 'Purchase Receipt No', 'oldfieldname': 'purchase_receipt_no', 'oldfieldtype': 'Link', - 'options': 'Purchase Receipt' + 'options': 'Purchase Receipt', + 'search_index': 1 }, # DocField diff --git a/stock/doctype/purchase_receipt/purchase_receipt.txt b/stock/doctype/purchase_receipt/purchase_receipt.txt index 97596302929..31f6cd60056 100644 --- a/stock/doctype/purchase_receipt/purchase_receipt.txt +++ b/stock/doctype/purchase_receipt/purchase_receipt.txt @@ -338,7 +338,7 @@ 'oldfieldtype': 'Date', 'permlevel': 0, 'reqd': 1, - 'search_index': 1, + 'search_index': 0, 'trigger': 'Client', 'width': '100px' }, @@ -359,7 +359,7 @@ 'permlevel': 1, 'print_hide': 1, 'reqd': 1, - 'search_index': 1, + 'search_index': 0, 'width': '150px' }, @@ -888,7 +888,7 @@ 'permlevel': 0, 'print_hide': 1, 'reqd': 1, - 'search_index': 1, + 'search_index': 0, 'width': '150px' }, @@ -906,7 +906,7 @@ 'permlevel': 0, 'print_hide': 1, 'reqd': 1, - 'search_index': 1, + 'search_index': 0, 'width': '150px' }, diff --git a/stock/doctype/purchase_receipt_detail/purchase_receipt_detail.txt b/stock/doctype/purchase_receipt_detail/purchase_receipt_detail.txt index d030b9e4b7e..a8e0d47060e 100644 --- a/stock/doctype/purchase_receipt_detail/purchase_receipt_detail.txt +++ b/stock/doctype/purchase_receipt_detail/purchase_receipt_detail.txt @@ -100,6 +100,7 @@ 'options': 'UOM', 'permlevel': 0, 'reqd': 1, + 'search_index': 0, 'trigger': 'Client', 'width': '100px' }, @@ -324,6 +325,7 @@ 'options': 'Batch', 'permlevel': 0, 'print_hide': 1, + 'search_index': 0, 'trigger': 'Client' }, @@ -342,6 +344,7 @@ 'options': 'Warehouse', 'permlevel': 1, 'print_hide': 1, + 'search_index': 0, 'width': '100px' }, @@ -358,7 +361,8 @@ 'oldfieldtype': 'Link', 'options': 'QA Inspection Report', 'permlevel': 0, - 'print_hide': 1 + 'print_hide': 1, + 'search_index': 0 }, # DocField @@ -373,7 +377,8 @@ 'oldfieldtype': 'Link', 'options': 'Brand', 'permlevel': 1, - 'print_hide': 1 + 'print_hide': 1, + 'search_index': 0 }, # DocField @@ -390,7 +395,7 @@ 'options': 'Item Group', 'permlevel': 1, 'print_hide': 1, - 'search_index': 1 + 'search_index': 0 }, # DocField @@ -474,7 +479,7 @@ 'permlevel': 1, 'print_hide': 1, 'reqd': 0, - 'search_index': 1, + 'search_index': 0, 'width': '150px' }, diff --git a/stock/doctype/ref_rate_detail/ref_rate_detail.txt b/stock/doctype/ref_rate_detail/ref_rate_detail.txt index 078fadc75d7..1774b08d3a1 100644 --- a/stock/doctype/ref_rate_detail/ref_rate_detail.txt +++ b/stock/doctype/ref_rate_detail/ref_rate_detail.txt @@ -34,8 +34,7 @@ 'parent': 'Ref Rate Detail', 'parentfield': 'fields', 'parenttype': 'DocType', - 'permlevel': 0, - 'search_index': 1 + 'permlevel': 0 }, # DocType, Ref Rate Detail @@ -54,7 +53,8 @@ 'oldfieldname': 'price_list_name', 'oldfieldtype': 'Select', 'options': 'link:Price List', - 'reqd': 1 + 'reqd': 1, + 'search_index': 1 }, # DocField @@ -66,7 +66,8 @@ 'label': 'Ref Rate', 'oldfieldname': 'ref_rate', 'oldfieldtype': 'Currency', - 'reqd': 0 + 'reqd': 0, + 'search_index': 0 }, # DocField @@ -79,6 +80,7 @@ 'oldfieldname': 'ref_currency', 'oldfieldtype': 'Select', 'options': 'link:Currency', - 'reqd': 1 + 'reqd': 1, + 'search_index': 1 } ] \ No newline at end of file diff --git a/stock/doctype/sales_bom/sales_bom.txt b/stock/doctype/sales_bom/sales_bom.txt index 8863eb2d344..b97458aec37 100644 --- a/stock/doctype/sales_bom/sales_bom.txt +++ b/stock/doctype/sales_bom/sales_bom.txt @@ -268,6 +268,7 @@ 'oldfieldname': 'stock_uom', 'oldfieldtype': 'Link', 'options': 'UOM', - 'permlevel': 0 + 'permlevel': 0, + 'search_index': 0 } ] \ No newline at end of file diff --git a/stock/doctype/sales_bom_detail/sales_bom_detail.txt b/stock/doctype/sales_bom_detail/sales_bom_detail.txt index 31d2f1a47ec..3b104e7b40f 100644 --- a/stock/doctype/sales_bom_detail/sales_bom_detail.txt +++ b/stock/doctype/sales_bom_detail/sales_bom_detail.txt @@ -114,6 +114,7 @@ 'oldfieldname': 'uom', 'oldfieldtype': 'Link', 'options': 'UOM', - 'permlevel': 1 + 'permlevel': 1, + 'search_index': 0 } ] \ No newline at end of file diff --git a/stock/doctype/serial_no/serial_no.txt b/stock/doctype/serial_no/serial_no.txt index dd250ee7bd7..9aa6119ffc3 100644 --- a/stock/doctype/serial_no/serial_no.txt +++ b/stock/doctype/serial_no/serial_no.txt @@ -193,7 +193,7 @@ 'oldfieldtype': 'Data', 'permlevel': 0, 'reqd': 1, - 'search_index': 1 + 'search_index': 0 }, # DocField @@ -628,7 +628,7 @@ 'oldfieldtype': 'Select', 'options': '\nUnder Warranty\nOut of Warranty\nUnder AMC\nOut of AMC', 'permlevel': 0, - 'search_index': 1, + 'search_index': 0, 'width': '150px' }, @@ -715,7 +715,7 @@ 'options': 'link:Company', 'permlevel': 0, 'reqd': 1, - 'search_index': 1 + 'search_index': 0 }, # DocField @@ -729,7 +729,7 @@ 'options': 'link:Fiscal Year', 'permlevel': 0, 'reqd': 1, - 'search_index': 1 + 'search_index': 0 }, # DocField diff --git a/stock/doctype/stock_entry/stock_entry.txt b/stock/doctype/stock_entry/stock_entry.txt index 951986fea3d..d7477c223bd 100644 --- a/stock/doctype/stock_entry/stock_entry.txt +++ b/stock/doctype/stock_entry/stock_entry.txt @@ -3,9 +3,9 @@ # These values are common in all dictionaries { - 'creation': '2009-05-12 16:46:45', + 'creation': '2010-08-08 17:09:25', 'docstatus': 0, - 'modified': '2011-07-10 14:12:39', + 'modified': '2011-07-11 12:48:52', 'modified_by': 'Administrator', 'owner': 'Administrator' }, @@ -76,7 +76,7 @@ 'doctype': 'DocPerm', 'idx': 1, 'permlevel': 0, - 'role': 'Material User', + 'role': 'Material Manager', 'submit': 1, 'write': 1 }, @@ -89,28 +89,35 @@ 'doctype': 'DocPerm', 'idx': 2, 'permlevel': 1, - 'role': 'Material User', + 'role': 'Material Manager', 'submit': 0, 'write': 0 }, # DocPerm { - 'create': 0, + 'amend': 1, + 'cancel': 1, + 'create': 1, 'doctype': 'DocPerm', 'idx': 3, - 'permlevel': 2, - 'role': 'Production User', + 'permlevel': 0, + 'role': 'Material User', + 'submit': 1, 'write': 1 }, # DocPerm { + 'amend': 0, + 'cancel': 0, + 'create': 0, 'doctype': 'DocPerm', 'idx': 4, - 'permlevel': 2, - 'role': 'Production Manager', - 'write': 1 + 'permlevel': 1, + 'role': 'Material User', + 'submit': 0, + 'write': 0 }, # DocPerm @@ -134,13 +141,23 @@ 'role': 'Production User' }, + # DocPerm + { + 'create': 0, + 'doctype': 'DocPerm', + 'idx': 7, + 'permlevel': 2, + 'role': 'Production User', + 'write': 1 + }, + # DocPerm { 'amend': 1, 'cancel': 1, 'create': 1, 'doctype': 'DocPerm', - 'idx': 7, + 'idx': 8, 'permlevel': 0, 'role': 'Production Manager', 'submit': 1, @@ -150,34 +167,17 @@ # DocPerm { 'doctype': 'DocPerm', - 'idx': 8, + 'idx': 9, 'permlevel': 1, 'role': 'Production Manager' }, # DocPerm { - 'amend': 0, - 'cancel': 0, - 'create': 0, - 'doctype': 'DocPerm', - 'idx': 9, - 'permlevel': 1, - 'role': 'Material Manager', - 'submit': 0, - 'write': 0 - }, - - # DocPerm - { - 'amend': 1, - 'cancel': 1, - 'create': 1, 'doctype': 'DocPerm', 'idx': 10, - 'permlevel': 0, - 'role': 'Material Manager', - 'submit': 1, + 'permlevel': 2, + 'role': 'Production Manager', 'write': 1 }, @@ -209,14 +209,13 @@ 'doctype': 'DocField', 'fieldname': 'naming_series', 'fieldtype': 'Select', - 'hidden': 0, 'idx': 3, 'in_filter': 0, 'label': 'Series', 'no_copy': 1, 'oldfieldname': 'naming_series', 'oldfieldtype': 'Select', - 'options': '\nSTE', + 'options': 'STE', 'permlevel': 0, 'print_hide': 1, 'report_hide': 0, @@ -231,7 +230,6 @@ 'doctype': 'DocField', 'fieldname': 'amendment_date', 'fieldtype': 'Date', - 'hidden': 0, 'idx': 4, 'in_filter': 0, 'label': 'Amendment Date', @@ -241,7 +239,6 @@ 'permlevel': 0, 'print_hide': 1, 'report_hide': 0, - 'reqd': 0, 'search_index': 0 }, @@ -252,7 +249,6 @@ 'doctype': 'DocField', 'fieldname': 'purpose', 'fieldtype': 'Select', - 'hidden': 0, 'idx': 5, 'in_filter': 1, 'label': 'Purpose', @@ -261,7 +257,6 @@ 'oldfieldtype': 'Select', 'options': 'Material Issue\nMaterial Receipt\nMaterial Transfer\nSales Return\nPurchase Return\nSubcontracting\nProduction Order', 'permlevel': 0, - 'print_hide': 0, 'report_hide': 0, 'reqd': 1, 'search_index': 0, @@ -286,8 +281,7 @@ 'permlevel': 0, 'print_hide': 1, 'report_hide': 0, - 'reqd': 0, - 'search_index': 0, + 'search_index': 1, 'trigger': 'Client' }, @@ -309,8 +303,7 @@ 'permlevel': 0, 'print_hide': 1, 'report_hide': 0, - 'reqd': 0, - 'search_index': 0, + 'search_index': 1, 'trigger': 'Client' }, @@ -345,7 +338,6 @@ 'permlevel': 0, 'print_hide': 1, 'report_hide': 0, - 'reqd': 0, 'search_index': 0, 'trigger': 'Client' }, @@ -356,7 +348,6 @@ 'doctype': 'DocField', 'fieldname': 'supplier_name', 'fieldtype': 'Data', - 'hidden': 0, 'idx': 10, 'in_filter': 0, 'label': 'Supplier Name', @@ -364,9 +355,7 @@ 'oldfieldname': 'supplier_name', 'oldfieldtype': 'Data', 'permlevel': 1, - 'print_hide': 0, 'report_hide': 0, - 'reqd': 0, 'search_index': 0 }, @@ -385,9 +374,7 @@ 'oldfieldname': 'supplier_address', 'oldfieldtype': 'Small Text', 'permlevel': 0, - 'print_hide': 0, 'report_hide': 0, - 'reqd': 0, 'search_index': 0, 'trigger': 'Client' }, @@ -410,7 +397,6 @@ 'permlevel': 0, 'print_hide': 1, 'report_hide': 0, - 'reqd': 0, 'search_index': 0, 'trigger': 'Client' }, @@ -429,9 +415,7 @@ 'oldfieldname': 'customer_name', 'oldfieldtype': 'Data', 'permlevel': 1, - 'print_hide': 0, 'report_hide': 0, - 'reqd': 0, 'search_index': 0 }, @@ -449,9 +433,7 @@ 'oldfieldname': 'customer_address', 'oldfieldtype': 'Small Text', 'permlevel': 0, - 'print_hide': 0, 'report_hide': 0, - 'reqd': 0, 'search_index': 0 }, @@ -473,7 +455,6 @@ 'permlevel': 2, 'print_hide': 1, 'report_hide': 0, - 'reqd': 0, 'search_index': 0, 'trigger': 'Client' }, @@ -496,8 +477,7 @@ 'permlevel': 2, 'print_hide': 1, 'report_hide': 0, - 'reqd': 0, - 'search_index': 0, + 'search_index': 1, 'trigger': 'Client' }, @@ -507,7 +487,6 @@ 'doctype': 'DocField', 'fieldname': 'fg_completed_qty', 'fieldtype': 'Currency', - 'hidden': 0, 'idx': 17, 'in_filter': 0, 'label': 'FG Completed Qty', @@ -517,7 +496,6 @@ 'permlevel': 2, 'print_hide': 1, 'report_hide': 0, - 'reqd': 0, 'search_index': 0, 'trigger': 'Client' }, @@ -527,15 +505,13 @@ 'colour': 'White:FFF', 'doctype': 'DocField', 'fieldtype': 'HTML', - 'hidden': 0, 'idx': 18, 'label': 'Warehouse HTML', 'no_copy': 0, 'oldfieldtype': 'HTML', 'options': "
Warehouse
", 'permlevel': 0, - 'print_hide': 1, - 'reqd': 0 + 'print_hide': 1 }, # DocField @@ -545,7 +521,6 @@ 'doctype': 'DocField', 'fieldname': 'from_warehouse', 'fieldtype': 'Link', - 'hidden': 0, 'idx': 19, 'in_filter': 0, 'label': 'Source Warehouse', @@ -569,7 +544,6 @@ 'doctype': 'DocField', 'fieldname': 'to_warehouse', 'fieldtype': 'Link', - 'hidden': 0, 'idx': 20, 'in_filter': 0, 'label': 'Target Warehouse', @@ -581,7 +555,7 @@ 'print_hide': 1, 'report_hide': 0, 'reqd': 0, - 'search_index': 1, + 'search_index': 0, 'trigger': 'Client' }, @@ -616,7 +590,6 @@ 'doctype': 'DocField', 'fieldname': 'transfer_date', 'fieldtype': 'Date', - 'hidden': 0, 'idx': 23, 'in_filter': 1, 'label': 'Transfer Date', @@ -627,7 +600,7 @@ 'print_hide': 0, 'report_hide': 0, 'reqd': 1, - 'search_index': 1 + 'search_index': 0 }, # DocField @@ -637,7 +610,6 @@ 'doctype': 'DocField', 'fieldname': 'posting_date', 'fieldtype': 'Date', - 'hidden': 0, 'idx': 24, 'in_filter': 1, 'label': 'Posting Date', @@ -657,7 +629,6 @@ 'doctype': 'DocField', 'fieldname': 'posting_time', 'fieldtype': 'Time', - 'hidden': 0, 'idx': 25, 'in_filter': 0, 'label': 'Posting Time', @@ -677,7 +648,6 @@ 'doctype': 'DocField', 'fieldname': 'amended_from', 'fieldtype': 'Link', - 'hidden': 0, 'idx': 26, 'in_filter': 0, 'label': 'Amended From', @@ -688,7 +658,6 @@ 'permlevel': 1, 'print_hide': 1, 'report_hide': 0, - 'reqd': 0, 'search_index': 0 }, @@ -698,7 +667,6 @@ 'doctype': 'DocField', 'fieldname': 'transporter', 'fieldtype': 'Data', - 'hidden': 0, 'idx': 27, 'in_filter': 0, 'label': 'Transporter', @@ -708,7 +676,6 @@ 'permlevel': 0, 'print_hide': 1, 'report_hide': 0, - 'reqd': 0, 'search_index': 0 }, @@ -718,7 +685,6 @@ 'doctype': 'DocField', 'fieldname': 'is_excisable_goods', 'fieldtype': 'Select', - 'hidden': 0, 'idx': 28, 'in_filter': 0, 'label': 'Is Excisable Goods', @@ -729,7 +695,6 @@ 'permlevel': 0, 'print_hide': 1, 'report_hide': 0, - 'reqd': 0, 'search_index': 0 }, @@ -739,7 +704,6 @@ 'doctype': 'DocField', 'fieldname': 'excisable_goods', 'fieldtype': 'Select', - 'hidden': 0, 'idx': 29, 'in_filter': 0, 'label': 'Excisable Goods', @@ -750,7 +714,6 @@ 'permlevel': 0, 'print_hide': 1, 'report_hide': 0, - 'reqd': 0, 'search_index': 0 }, @@ -771,7 +734,6 @@ 'permlevel': 0, 'print_hide': 1, 'report_hide': 0, - 'reqd': 0, 'search_index': 0 }, @@ -781,7 +743,6 @@ 'doctype': 'DocField', 'fieldname': 'remarks', 'fieldtype': 'Text', - 'hidden': 0, 'idx': 31, 'in_filter': 0, 'label': 'Remarks', @@ -837,25 +798,6 @@ 'print_hide': 1 }, - # DocField - { - 'allow_on_submit': 0, - 'doctype': 'DocField', - 'fieldtype': 'Button', - 'hidden': 0, - 'idx': 35, - 'in_filter': 0, - 'label': 'Get Current Stock', - 'no_copy': 0, - 'oldfieldtype': 'Button', - 'options': 'get_stock_and_rate', - 'permlevel': 0, - 'print_hide': 1, - 'report_hide': 0, - 'reqd': 0, - 'search_index': 0 - }, - # DocField { 'doctype': 'DocField', @@ -881,7 +823,6 @@ 'permlevel': 2, 'print_hide': 1, 'report_hide': 0, - 'reqd': 0, 'search_index': 0 }, @@ -902,7 +843,6 @@ 'doctype': 'DocField', 'fieldname': 'mtn_details', 'fieldtype': 'Table', - 'hidden': 0, 'idx': 39, 'in_filter': 0, 'label': 'MTN Details', @@ -913,7 +853,6 @@ 'permlevel': 0, 'print_hide': 0, 'report_hide': 0, - 'reqd': 0, 'search_index': 0 }, @@ -923,7 +862,6 @@ 'doctype': 'DocField', 'fieldname': 'total_amount', 'fieldtype': 'Currency', - 'hidden': 0, 'idx': 40, 'in_filter': 0, 'label': 'Total Amount', @@ -933,7 +871,6 @@ 'permlevel': 1, 'print_hide': 1, 'report_hide': 0, - 'reqd': 0, 'search_index': 0 }, @@ -953,7 +890,6 @@ 'doctype': 'DocField', 'fieldname': 'company', 'fieldtype': 'Link', - 'hidden': 0, 'idx': 42, 'in_filter': 1, 'label': 'Company', @@ -965,7 +901,7 @@ 'print_hide': 1, 'report_hide': 0, 'reqd': 1, - 'search_index': 1 + 'search_index': 0 }, # DocField @@ -974,7 +910,6 @@ 'doctype': 'DocField', 'fieldname': 'fiscal_year', 'fieldtype': 'Select', - 'hidden': 0, 'idx': 43, 'in_filter': 0, 'label': 'Fiscal Year', @@ -986,7 +921,7 @@ 'print_hide': 1, 'report_hide': 0, 'reqd': 1, - 'search_index': 1 + 'search_index': 0 }, # DocField @@ -995,7 +930,6 @@ 'doctype': 'DocField', 'fieldname': 'select_print_heading', 'fieldtype': 'Link', - 'hidden': 0, 'idx': 44, 'in_filter': 0, 'label': 'Select Print Heading', @@ -1004,9 +938,7 @@ 'oldfieldtype': 'Link', 'options': 'Print Heading', 'permlevel': 0, - 'print_hide': 0, 'report_hide': 0, - 'reqd': 0, 'search_index': 0 } ] \ No newline at end of file diff --git a/stock/doctype/stock_entry_detail/stock_entry_detail.txt b/stock/doctype/stock_entry_detail/stock_entry_detail.txt index b4fca096383..1d2408bf88b 100644 --- a/stock/doctype/stock_entry_detail/stock_entry_detail.txt +++ b/stock/doctype/stock_entry_detail/stock_entry_detail.txt @@ -135,6 +135,7 @@ 'options': 'Batch', 'permlevel': 0, 'print_hide': 1, + 'search_index': 0, 'trigger': 'Client' }, @@ -152,7 +153,7 @@ 'permlevel': 1, 'print_hide': 1, 'reqd': 0, - 'search_index': 1 + 'search_index': 0 }, # DocField @@ -196,6 +197,7 @@ 'options': 'UOM', 'permlevel': 0, 'reqd': 1, + 'search_index': 0, 'trigger': 'Client' }, diff --git a/stock/doctype/stock_ledger_entry/stock_ledger_entry.txt b/stock/doctype/stock_ledger_entry/stock_ledger_entry.txt index 603f095aa3e..823837a160c 100644 --- a/stock/doctype/stock_ledger_entry/stock_ledger_entry.txt +++ b/stock/doctype/stock_ledger_entry/stock_ledger_entry.txt @@ -12,7 +12,7 @@ # These values are common for all DocType { - '_last_update': '1307707462', + '_last_update': '1309508840', 'autoname': 'SLE/.########', 'colour': 'White:FFF', 'doctype': 'DocType', @@ -163,7 +163,7 @@ 'oldfieldtype': 'Select', 'options': 'link:Warehouse Type', 'permlevel': 1, - 'search_index': 1 + 'search_index': 0 }, # DocField @@ -194,7 +194,7 @@ 'oldfieldname': 'posting_time', 'oldfieldtype': 'Time', 'permlevel': 1, - 'search_index': 0, + 'search_index': 1, 'width': '100px' }, @@ -210,7 +210,7 @@ 'oldfieldname': 'transaction_date', 'oldfieldtype': 'Date', 'permlevel': 1, - 'search_index': 1, + 'search_index': 0, 'width': '100px' }, @@ -225,7 +225,7 @@ 'oldfieldname': 'voucher_type', 'oldfieldtype': 'Data', 'permlevel': 1, - 'search_index': 1, + 'search_index': 0, 'width': '150px' }, @@ -240,7 +240,7 @@ 'oldfieldname': 'voucher_no', 'oldfieldtype': 'Data', 'permlevel': 1, - 'search_index': 1, + 'search_index': 0, 'width': '150px' }, @@ -394,7 +394,7 @@ 'oldfieldname': 'company', 'oldfieldtype': 'Data', 'permlevel': 1, - 'search_index': 1, + 'search_index': 0, 'width': '150px' }, @@ -409,7 +409,7 @@ 'oldfieldname': 'fiscal_year', 'oldfieldtype': 'Data', 'permlevel': 1, - 'search_index': 1, + 'search_index': 0, 'width': '150px' }, @@ -425,7 +425,7 @@ 'oldfieldtype': 'Select', 'options': '\nYes\nNo', 'permlevel': 1, - 'search_index': 1, + 'search_index': 0, 'width': '100px' }, @@ -441,7 +441,7 @@ 'oldfieldtype': 'Select', 'options': '\nYes\nNo', 'permlevel': 1, - 'search_index': 1, + 'search_index': 0, 'width': '100px' } ] \ No newline at end of file diff --git a/stock/doctype/stock_reconciliation/stock_reconciliation.py b/stock/doctype/stock_reconciliation/stock_reconciliation.py index 69710f0eaba..f040df38392 100644 --- a/stock/doctype/stock_reconciliation/stock_reconciliation.py +++ b/stock/doctype/stock_reconciliation/stock_reconciliation.py @@ -118,7 +118,7 @@ class DocType: # ------------------ def get_current_stock(self, item_code, warehouse): bin = sql("select name from `tabBin` where item_code = '%s' and warehouse = '%s'" % (item_code, warehouse)) - prev_sle = bin and get_obj('Bin', bin[0][0]).get_prev_sle(self.doc.reconciliation_date,self.doc.reconciliation_time) or 0 + prev_sle = bin and get_obj('Bin', bin[0][0]).get_prev_sle(self.doc.reconciliation_date,self.doc.reconciliation_time) or {} stock_uom = sql("select stock_uom from `tabItem` where name = %s",item_code) return {'actual_qty': prev_sle.get('bin_aqat', 0), 'stock_uom': stock_uom[0][0]} diff --git a/stock/doctype/stock_reconciliation/stock_reconciliation.txt b/stock/doctype/stock_reconciliation/stock_reconciliation.txt index 1080a27e051..771068ddd1d 100644 --- a/stock/doctype/stock_reconciliation/stock_reconciliation.txt +++ b/stock/doctype/stock_reconciliation/stock_reconciliation.txt @@ -12,7 +12,7 @@ # These values are common for all DocType { - '_last_update': '1307707462', + '_last_update': '1309508840', 'allow_attach': 1, 'colour': 'White:FFF', 'doctype': 'DocType', @@ -131,7 +131,8 @@ 'oldfieldname': 'reconciliation_date', 'oldfieldtype': 'Date', 'permlevel': 0, - 'reqd': 1 + 'reqd': 1, + 'search_index': 1 }, # DocField @@ -185,7 +186,7 @@ 'oldfieldtype': 'Link', 'options': 'Company', 'permlevel': 0, - 'search_index': 1 + 'search_index': 0 }, # DocField @@ -200,7 +201,7 @@ 'oldfieldtype': 'Select', 'options': 'link:Fiscal Year', 'permlevel': 0, - 'search_index': 1 + 'search_index': 0 }, # DocField diff --git a/stock/doctype/warehouse/warehouse.txt b/stock/doctype/warehouse/warehouse.txt index 3d69b07e5f4..1363eef7014 100644 --- a/stock/doctype/warehouse/warehouse.txt +++ b/stock/doctype/warehouse/warehouse.txt @@ -244,7 +244,7 @@ 'oldfieldtype': 'Link', 'options': 'Company', 'permlevel': 0, - 'search_index': 1 + 'search_index': 0 }, # DocField diff --git a/support/doctype/customer_issue/customer_issue.txt b/support/doctype/customer_issue/customer_issue.txt index 93c274f1fe4..122f92df4d2 100644 --- a/support/doctype/customer_issue/customer_issue.txt +++ b/support/doctype/customer_issue/customer_issue.txt @@ -167,7 +167,7 @@ 'options': '\nOpen\nClosed\nWork In Progress\nCancelled', 'permlevel': 0, 'reqd': 1, - 'search_index': 1 + 'search_index': 0 }, # DocField @@ -340,7 +340,7 @@ 'permlevel': 0, 'print_hide': 1, 'reqd': 0, - 'search_index': 1 + 'search_index': 0 }, # DocField @@ -371,7 +371,7 @@ 'permlevel': 0, 'print_hide': 1, 'reqd': 1, - 'search_index': 1, + 'search_index': 0, 'trigger': 'Client' }, @@ -389,7 +389,7 @@ 'permlevel': 0, 'print_hide': 1, 'reqd': 1, - 'search_index': 1 + 'search_index': 0 }, # DocField @@ -563,7 +563,7 @@ 'oldfieldname': 'allocated_on', 'oldfieldtype': 'Date', 'permlevel': 0, - 'search_index': 1 + 'search_index': 0 }, # DocField @@ -578,7 +578,7 @@ 'oldfieldtype': 'Link', 'options': 'Sales Person', 'permlevel': 0, - 'search_index': 1 + 'search_index': 0 }, # DocField @@ -627,7 +627,7 @@ 'oldfieldname': 'resolution_date', 'oldfieldtype': 'Date', 'permlevel': 0, - 'search_index': 1 + 'search_index': 0 }, # DocField @@ -643,7 +643,7 @@ 'oldfieldtype': 'Link', 'options': 'Sales Person', 'permlevel': 0, - 'search_index': 1 + 'search_index': 0 }, # DocField diff --git a/support/doctype/item_maintenance_detail/item_maintenance_detail.txt b/support/doctype/item_maintenance_detail/item_maintenance_detail.txt index ff5d2116757..4d4e26ad209 100644 --- a/support/doctype/item_maintenance_detail/item_maintenance_detail.txt +++ b/support/doctype/item_maintenance_detail/item_maintenance_detail.txt @@ -150,7 +150,7 @@ 'options': 'Sales Person', 'permlevel': 0, 'reqd': 1, - 'search_index': 1 + 'search_index': 0 }, # DocField diff --git a/support/doctype/maintenance_schedule/maintenance_schedule.txt b/support/doctype/maintenance_schedule/maintenance_schedule.txt index 3881aa3cc3a..a053cf93b17 100644 --- a/support/doctype/maintenance_schedule/maintenance_schedule.txt +++ b/support/doctype/maintenance_schedule/maintenance_schedule.txt @@ -167,7 +167,7 @@ 'oldfieldtype': 'Data', 'permlevel': 1, 'reqd': 0, - 'search_index': 1 + 'search_index': 0 }, # DocField @@ -252,7 +252,7 @@ 'options': '\nDraft\nSubmitted\nCancelled', 'permlevel': 1, 'reqd': 1, - 'search_index': 1 + 'search_index': 0 }, # DocField @@ -297,7 +297,7 @@ 'options': 'Company', 'permlevel': 0, 'reqd': 1, - 'search_index': 1 + 'search_index': 0 }, # DocField @@ -313,7 +313,7 @@ 'options': 'Territory', 'permlevel': 0, 'reqd': 1, - 'search_index': 1 + 'search_index': 0 }, # DocField diff --git a/support/doctype/maintenance_schedule_detail/maintenance_schedule_detail.txt b/support/doctype/maintenance_schedule_detail/maintenance_schedule_detail.txt index 01cf7f093e5..edd8091f950 100644 --- a/support/doctype/maintenance_schedule_detail/maintenance_schedule_detail.txt +++ b/support/doctype/maintenance_schedule_detail/maintenance_schedule_detail.txt @@ -112,7 +112,7 @@ 'options': 'Sales Person', 'permlevel': 0, 'reqd': 1, - 'search_index': 1 + 'search_index': 0 }, # DocField diff --git a/support/doctype/maintenance_visit/maintenance_visit.txt b/support/doctype/maintenance_visit/maintenance_visit.txt index 2485f57b41e..76cf56f242c 100644 --- a/support/doctype/maintenance_visit/maintenance_visit.txt +++ b/support/doctype/maintenance_visit/maintenance_visit.txt @@ -241,7 +241,7 @@ 'permlevel': 0, 'print_hide': 1, 'reqd': 1, - 'search_index': 1 + 'search_index': 0 }, # DocField @@ -258,7 +258,7 @@ 'permlevel': 0, 'print_hide': 1, 'reqd': 1, - 'search_index': 1 + 'search_index': 0 }, # DocField @@ -410,7 +410,7 @@ 'options': '\nScheduled\nUnscheduled\nBreakdown', 'permlevel': 0, 'reqd': 1, - 'search_index': 1 + 'search_index': 0 }, # DocField diff --git a/support/doctype/support_ticket/support_ticket.txt b/support/doctype/support_ticket/support_ticket.txt index 1b11a724225..8164764efdb 100644 --- a/support/doctype/support_ticket/support_ticket.txt +++ b/support/doctype/support_ticket/support_ticket.txt @@ -251,7 +251,7 @@ 'oldfieldtype': 'Data', 'permlevel': 2, 'reqd': 0, - 'search_index': 1 + 'search_index': 0 }, # DocField @@ -376,7 +376,7 @@ 'oldfieldname': 'resolution_date', 'oldfieldtype': 'Date', 'permlevel': 1, - 'search_index': 1 + 'search_index': 0 }, # DocField diff --git a/utilities/doctype/address/address.txt b/utilities/doctype/address/address.txt index e7ff8cce1ed..4f44806cf5e 100644 --- a/utilities/doctype/address/address.txt +++ b/utilities/doctype/address/address.txt @@ -117,7 +117,7 @@ 'label': 'City/Town', 'permlevel': 0, 'reqd': 1, - 'search_index': 1 + 'search_index': 0 }, # DocField @@ -129,7 +129,7 @@ 'in_filter': 1, 'label': 'Pincode', 'permlevel': 0, - 'search_index': 1 + 'search_index': 0 }, # DocField @@ -144,7 +144,7 @@ 'options': 'link:Country', 'permlevel': 0, 'reqd': 1, - 'search_index': 1, + 'search_index': 0, 'trigger': 'Client' }, @@ -214,6 +214,7 @@ 'label': 'Customer', 'options': 'Customer', 'permlevel': 0, + 'search_index': 1, 'trigger': 'Client' }, @@ -240,6 +241,7 @@ 'label': 'Supplier', 'options': 'Supplier', 'permlevel': 0, + 'search_index': 1, 'trigger': 'Client' }, diff --git a/utilities/doctype/bulk_rename_tool/bulk_rename_tool.txt b/utilities/doctype/bulk_rename_tool/bulk_rename_tool.txt index f15d3a9dbdc..155d3da2caa 100644 --- a/utilities/doctype/bulk_rename_tool/bulk_rename_tool.txt +++ b/utilities/doctype/bulk_rename_tool/bulk_rename_tool.txt @@ -3,16 +3,16 @@ # These values are common in all dictionaries { - 'creation': '2011-07-08 13:30:05', + 'creation': '2011-07-07 17:47:52', 'docstatus': 0, - 'modified': '2011-07-08 13:30:05', + 'modified': '2011-07-27 13:19:22', 'modified_by': 'Administrator', 'owner': 'Administrator' }, # These values are common for all DocType { - '_last_update': '1310035501', + '_last_update': '1311622167', 'allow_attach': 1, 'autoname': 'field:rename_doctype', 'colour': 'White:FFF', @@ -21,7 +21,7 @@ 'name': '__common__', 'section_style': 'Simple', 'show_in_menu': 0, - 'version': 6 + 'version': 7 }, # These values are common for all DocField diff --git a/utilities/doctype/gl_mapper_detail/gl_mapper_detail.txt b/utilities/doctype/gl_mapper_detail/gl_mapper_detail.txt index 404e8fcb47b..bf77e7c84fa 100644 --- a/utilities/doctype/gl_mapper_detail/gl_mapper_detail.txt +++ b/utilities/doctype/gl_mapper_detail/gl_mapper_detail.txt @@ -173,7 +173,7 @@ 'label': 'Fiscal Year', 'oldfieldname': 'fiscal_year', 'reqd': 1, - 'search_index': 1 + 'search_index': 0 }, # DocField @@ -202,7 +202,7 @@ 'in_filter': 1, 'label': 'Company', 'oldfieldname': 'company', - 'search_index': 1 + 'search_index': 0 }, # DocField diff --git a/utilities/doctype/rename_tool/rename_tool.txt b/utilities/doctype/rename_tool/rename_tool.txt index 9269185da5d..3b8a5ddb64a 100755 --- a/utilities/doctype/rename_tool/rename_tool.txt +++ b/utilities/doctype/rename_tool/rename_tool.txt @@ -3,9 +3,9 @@ # These values are common in all dictionaries { - 'creation': '2011-06-23 11:03:25', + 'creation': '2011-06-27 10:52:02', 'docstatus': 0, - 'modified': '2011-07-01 17:46:42', + 'modified': '2011-07-26 00:59:27', 'modified_by': 'Administrator', 'owner': 'Administrator' }, @@ -70,7 +70,7 @@ 'fieldtype': 'Select', 'idx': 1, 'label': 'Select DocType', - 'options': 'link:DocType' + 'options': '\nAccount\nCompany\nCustomer\nSupplier\nEmployee\nWarehouse\nItem' }, # DocField