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/payable_voucher/payable_voucher.txt b/accounts/doctype/payable_voucher/payable_voucher.txt index c330e8d5087..c77db19dd23 100644 --- a/accounts/doctype/payable_voucher/payable_voucher.txt +++ b/accounts/doctype/payable_voucher/payable_voucher.txt @@ -12,7 +12,7 @@ # These values are common for all DocType { - '_last_update': '1308741898', + '_last_update': '1309508838', 'colour': 'White:FFF', 'doctype': 'DocType', 'module': 'Accounts', @@ -221,6 +221,7 @@ 'options': 'Supplier', 'permlevel': 0, 'print_hide': 1, + 'search_index': 1, 'trigger': 'Client' }, @@ -326,7 +327,7 @@ 'oldfieldtype': 'Date', 'permlevel': 0, 'reqd': 1, - 'search_index': 1 + 'search_index': 0 }, # DocField @@ -342,7 +343,7 @@ 'oldfieldtype': 'Date', 'permlevel': 0, 'print_hide': 0, - 'search_index': 1 + 'search_index': 0 }, # DocField @@ -378,7 +379,7 @@ 'permlevel': 0, 'print_hide': 1, 'reqd': 1, - 'search_index': 1 + 'search_index': 0 }, # DocField @@ -394,7 +395,7 @@ 'permlevel': 0, 'print_hide': 1, 'reqd': 0, - 'search_index': 1 + 'search_index': 0 }, # DocField @@ -690,7 +691,7 @@ 'options': 'No\nYes', 'permlevel': 0, 'print_hide': 1, - 'search_index': 1, + 'search_index': 0, 'trigger': 'Client' }, @@ -768,7 +769,7 @@ 'permlevel': 0, 'print_hide': 1, 'reqd': 1, - 'search_index': 1 + 'search_index': 0 }, # DocField @@ -785,7 +786,7 @@ 'permlevel': 0, 'print_hide': 1, 'reqd': 1, - 'search_index': 1 + 'search_index': 0 }, # DocField @@ -1084,7 +1085,7 @@ 'oldfieldtype': 'Currency', 'permlevel': 1, 'print_hide': 1, - 'search_index': 1 + 'search_index': 0 }, # DocField diff --git a/accounts/doctype/period_closing_voucher/period_closing_voucher.txt b/accounts/doctype/period_closing_voucher/period_closing_voucher.txt index e5bb1a274a4..58508871e7a 100644 --- a/accounts/doctype/period_closing_voucher/period_closing_voucher.txt +++ b/accounts/doctype/period_closing_voucher/period_closing_voucher.txt @@ -147,7 +147,8 @@ 'oldfieldtype': 'Select', 'options': 'link:Fiscal Year', 'permlevel': 0, - 'reqd': 1 + 'reqd': 1, + 'search_index': 1 }, # DocField diff --git a/accounts/doctype/pos_setting/pos_setting.txt b/accounts/doctype/pos_setting/pos_setting.txt index 7b1b9fa5a88..3809d67608c 100755 --- a/accounts/doctype/pos_setting/pos_setting.txt +++ b/accounts/doctype/pos_setting/pos_setting.txt @@ -172,7 +172,8 @@ 'oldfieldname': 'company', 'oldfieldtype': 'Link', 'options': 'Company', - 'reqd': 1 + 'reqd': 1, + 'search_index': 0 }, # DocField @@ -193,7 +194,8 @@ 'oldfieldname': 'customer_account', 'oldfieldtype': 'Link', 'options': 'Account', - 'reqd': 0 + 'reqd': 0, + 'search_index': 0 }, # DocField @@ -206,7 +208,8 @@ 'oldfieldname': 'cash_bank_account', 'oldfieldtype': 'Link', 'options': 'Account', - 'reqd': 1 + 'reqd': 1, + 'search_index': 0 }, # DocField @@ -219,7 +222,8 @@ 'oldfieldname': 'income_account', 'oldfieldtype': 'Link', 'options': 'Account', - 'reqd': 1 + 'reqd': 1, + 'search_index': 0 }, # DocField @@ -232,7 +236,8 @@ 'oldfieldname': 'warehouse', 'oldfieldtype': 'Link', 'options': 'Warehouse', - 'reqd': 1 + 'reqd': 1, + 'search_index': 0 }, # DocField @@ -245,7 +250,8 @@ 'oldfieldname': 'cost_center', 'oldfieldtype': 'Link', 'options': 'Cost Center', - 'reqd': 1 + 'reqd': 1, + 'search_index': 0 }, # DocField @@ -257,7 +263,8 @@ 'label': 'Charge', 'oldfieldname': 'charge', 'oldfieldtype': 'Link', - 'options': 'Other Charges' + 'options': 'Other Charges', + 'search_index': 0 }, # DocField @@ -282,7 +289,8 @@ 'label': 'Terms', 'oldfieldname': 'tc_name', 'oldfieldtype': 'Link', - 'options': 'Term' + 'options': 'Term', + 'search_index': 0 }, # DocField diff --git a/accounts/doctype/purchase_tax_detail/purchase_tax_detail.txt b/accounts/doctype/purchase_tax_detail/purchase_tax_detail.txt index 583a97f2606..ed67ba2f0bd 100644 --- a/accounts/doctype/purchase_tax_detail/purchase_tax_detail.txt +++ b/accounts/doctype/purchase_tax_detail/purchase_tax_detail.txt @@ -151,6 +151,7 @@ 'oldfieldtype': 'Link', 'options': 'Cost Center', 'permlevel': 0, + 'search_index': 0, 'trigger': 'Client' }, diff --git a/accounts/doctype/pv_detail/pv_detail.txt b/accounts/doctype/pv_detail/pv_detail.txt index 0243d71bbec..1e05160261b 100644 --- a/accounts/doctype/pv_detail/pv_detail.txt +++ b/accounts/doctype/pv_detail/pv_detail.txt @@ -111,7 +111,7 @@ 'options': 'Item Group', 'permlevel': 1, 'print_hide': 1, - 'search_index': 1 + 'search_index': 0 }, # DocField diff --git a/accounts/doctype/receivable_voucher/receivable_voucher.txt b/accounts/doctype/receivable_voucher/receivable_voucher.txt index bcad9cc31c5..f2f9eafb20b 100644 --- a/accounts/doctype/receivable_voucher/receivable_voucher.txt +++ b/accounts/doctype/receivable_voucher/receivable_voucher.txt @@ -12,7 +12,7 @@ # These values are common for all DocType { - '_last_update': '1308741898', + '_last_update': '1309508839', 'change_log': '1. Change in pull_details method dt.-26-06-2009', 'colour': 'White:FFF', 'doctype': 'DocType', @@ -323,7 +323,7 @@ 'oldfieldtype': 'Date', 'permlevel': 0, 'reqd': 1, - 'search_index': 1 + 'search_index': 0 }, # DocField @@ -342,7 +342,7 @@ 'oldfieldtype': 'Date', 'permlevel': 0, 'reqd': 1, - 'search_index': 1 + 'search_index': 0 }, # DocField @@ -433,7 +433,7 @@ 'permlevel': 0, 'print_hide': 1, 'reqd': 1, - 'search_index': 1 + 'search_index': 0 }, # DocField @@ -903,7 +903,7 @@ 'options': 'No\nYes', 'permlevel': 0, 'print_hide': 1, - 'search_index': 1, + 'search_index': 0, 'trigger': 'Client' }, @@ -1027,7 +1027,7 @@ 'permlevel': 0, 'print_hide': 1, 'reqd': 1, - 'search_index': 1 + 'search_index': 0 }, # DocField @@ -1045,7 +1045,7 @@ 'permlevel': 0, 'print_hide': 1, 'reqd': 1, - 'search_index': 1 + 'search_index': 0 }, # DocField @@ -1116,7 +1116,7 @@ 'permlevel': 1, 'print_hide': 1, 'reqd': 1, - 'search_index': 1 + 'search_index': 0 }, # DocField diff --git a/accounts/doctype/rv_detail/rv_detail.txt b/accounts/doctype/rv_detail/rv_detail.txt index 6950ca921a7..94a45837c1f 100644 --- a/accounts/doctype/rv_detail/rv_detail.txt +++ b/accounts/doctype/rv_detail/rv_detail.txt @@ -243,6 +243,7 @@ 'permlevel': 0, 'print_hide': 1, 'reqd': 1, + 'search_index': 1, 'trigger': 'Client', 'width': '120px' }, @@ -262,6 +263,7 @@ 'permlevel': 0, 'print_hide': 1, 'reqd': 0, + 'search_index': 1, 'trigger': 'Client', 'width': '120px' }, diff --git a/accounts/doctype/rv_tax_detail/rv_tax_detail.txt b/accounts/doctype/rv_tax_detail/rv_tax_detail.txt index 94846cb3c76..a9326a02861 100644 --- a/accounts/doctype/rv_tax_detail/rv_tax_detail.txt +++ b/accounts/doctype/rv_tax_detail/rv_tax_detail.txt @@ -80,7 +80,8 @@ 'oldfieldname': 'cost_center_other_charges', 'oldfieldtype': 'Link', 'options': 'Cost Center', - 'permlevel': 0 + 'permlevel': 0, + 'search_index': 0 }, # DocField diff --git a/accounts/doctype/tds_category_account/tds_category_account.txt b/accounts/doctype/tds_category_account/tds_category_account.txt index 88ee39a70d1..6f6022b243f 100644 --- a/accounts/doctype/tds_category_account/tds_category_account.txt +++ b/accounts/doctype/tds_category_account/tds_category_account.txt @@ -51,7 +51,7 @@ 'label': 'Company', 'oldfieldname': 'company', 'options': 'Company', - 'search_index': 1 + 'search_index': 0 }, # DocField diff --git a/accounts/doctype/tds_payment/tds_payment.txt b/accounts/doctype/tds_payment/tds_payment.txt index abd4b0cdc07..8d0edfb10da 100644 --- a/accounts/doctype/tds_payment/tds_payment.txt +++ b/accounts/doctype/tds_payment/tds_payment.txt @@ -207,7 +207,7 @@ 'options': 'link:Fiscal Year', 'permlevel': 0, 'reqd': 1, - 'search_index': 1 + 'search_index': 0 }, # DocField @@ -269,7 +269,7 @@ 'oldfieldtype': 'Link', 'options': 'Company', 'permlevel': 0, - 'search_index': 1, + 'search_index': 0, 'trigger': 'Client' }, diff --git a/accounts/search_criteria/accounts_payable/accounts_payable.py b/accounts/search_criteria/accounts_payable/accounts_payable.py index 53fff081ed4..8c07b68b45e 100644 --- a/accounts/search_criteria/accounts_payable/accounts_payable.py +++ b/accounts/search_criteria/accounts_payable/accounts_payable.py @@ -2,134 +2,145 @@ # ------------------------------------------------------------------ if not filter_values.get('posting_date') or not filter_values.get('posting_date1'): - msgprint("Please select From Posting Date and To Posting Date ") - raise Exception + msgprint("Please select From Posting Date and To Posting Date ") + raise Exception else: - from_date = filter_values.get('posting_date') - to_date = filter_values.get('posting_date1') + from_date = filter_values.get('posting_date') + to_date = filter_values.get('posting_date1') if not filter_values['range_1'] or not filter_values['range_2'] or not filter_values['range_3'] or not filter_values['range_4']: - msgprint("Please select aging ranges in no of days in 'More Filters' ") - raise Exception + msgprint("Please select aging ranges in no of days in 'More Filters' ") + raise Exception # validate Range range_list = ['range_1','range_2','range_3','range_4'] for r in range(len(range_list)-1): - if not cint(filter_values[range_list[r]]) < cint(filter_values[range_list[r + 1]]): - msgprint("Range %s should be less than Range %s." % (cstr(r+1),cstr(r+2))) - raise Exception + if not cint(filter_values[range_list[r]]) < cint(filter_values[range_list[r + 1]]): + msgprint("Range %s should be less than Range %s." % (cstr(r+1),cstr(r+2))) + raise Exception - + # Add columns # ------------------------------------------------------------------ data = [['Aging Date','Date','80px',''], - ['Transaction Date','Date','80px',''], - ['Account','Data','120px',''], - ['Against Voucher Type','Data','120px',''], - ['Against Voucher','Data','120px',''], - ['Voucher Type','Data','120px',''], - ['Voucher No','Data','120px',''], - ['Remarks','Data','160px',''], - ['Supplier Type', 'Data', '80px', ''], - ['Due Date', 'Data', '80px', ''], - ['Bill No','Data','80px',''], - ['Bill Date','Data','80px',''], - ['Opening Amt','Currency','120px',''], - ['Outstanding Amt','Currency','120px',''], - ['Age (Days)', 'Currency', '150px', ''], - ['0-'+cstr(filter_values['range_1']),'Currency','100px',''], - [cstr(cint(filter_values['range_1']) + 1)+ '-' +cstr(filter_values['range_2']),'Currency','100px',''], - [cstr(cint(filter_values['range_2']) + 1)+ '-' +cstr(filter_values['range_3']),'Currency','100px',''], - [cstr(cint(filter_values['range_3']) + 1)+ '-' +cstr(filter_values['range_4']),'Currency','100px',''], - [cstr(filter_values['range_4']) + '-Above','Currency','100px','']] - + ['Transaction Date','Date','80px',''], + ['Account','Data','120px',''], + ['Against Voucher Type','Data','120px',''], + ['Against Voucher','Data','120px',''], + ['Voucher Type','Data','120px',''], + ['Voucher No','Data','120px',''], + ['Remarks','Data','160px',''], + ['Supplier Type', 'Data', '80px', ''], + ['Due Date', 'Data', '80px', ''], + ['Bill No','Data','80px',''], + ['Bill Date','Data','80px',''], + ['Opening Amt','Currency','120px',''], + ['Outstanding Amt','Currency','120px',''], + ['Age (Days)', 'Currency', '150px', ''], + ['0-'+cstr(filter_values['range_1']),'Currency','100px',''], + [cstr(cint(filter_values['range_1']) + 1)+ '-' +cstr(filter_values['range_2']),'Currency','100px',''], + [cstr(cint(filter_values['range_2']) + 1)+ '-' +cstr(filter_values['range_3']),'Currency','100px',''], + [cstr(cint(filter_values['range_3']) + 1)+ '-' +cstr(filter_values['range_4']),'Currency','100px',''], + [cstr(filter_values['range_4']) + '-Above','Currency','100px','']] + for d in data: - colnames.append(d[0]) - coltypes.append(d[1]) - colwidths.append(d[2]) - coloptions.append(d[3]) - col_idx[d[0]] = len(colnames)-1 - + colnames.append(d[0]) + coltypes.append(d[1]) + colwidths.append(d[2]) + coloptions.append(d[3]) + col_idx[d[0]] = len(colnames)-1 + # ageing based on # ------------------------------------------------------------------ aging_based_on = 'Aging Date' if filter_values.has_key('aging_based_on') and filter_values['aging_based_on']: - aging_based_on = filter_values['aging_based_on'].split(NEWLINE)[-1] + aging_based_on = filter_values['aging_based_on'].split(NEWLINE)[-1] -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 +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/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/favicon.ico b/favicon.ico new file mode 100644 index 00000000000..8b2106b847e Binary files /dev/null and b/favicon.ico differ 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 deleted file mode 100644 index 2886e424b59..00000000000 --- a/hr/doctype/salary_slip/salary_slip.txt +++ /dev/null @@ -1,614 +0,0 @@ -# DocType, Salary Slip -[ - - # These values are common in all dictionaries - { - 'creation': '2010-08-08 17:09:20', - 'docstatus': 0, - 'modified': '2011-07-14 16:07:20', - 'modified_by': 'Administrator', - 'owner': 'Administrator' - }, - - # These values are common for all DocType - { - '_last_update': '1310019491', - 'colour': 'White:FFF', - 'doctype': 'DocType', - 'module': 'HR', - 'name': '__common__', - 'section_style': 'Simple', - 'server_code_error': ' ', - 'show_in_menu': 0, - 'subject': 'For %(employee_name)s, %(designation)s', - 'version': 392 - }, - - # These values are common for all DocField - { - 'doctype': 'DocField', - 'name': '__common__', - 'parent': 'Salary Slip', - 'parentfield': 'fields', - 'parenttype': 'DocType' - }, - - # These values are common for all DocPerm - { - 'doctype': 'DocPerm', - 'name': '__common__', - 'parent': 'Salary Slip', - 'parentfield': 'permissions', - 'parenttype': 'DocType', - 'read': 1 - }, - - # DocType, Salary Slip - { - 'doctype': 'DocType', - 'name': 'Salary Slip' - }, - - # DocPerm - { - 'amend': 0, - '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', - 'match': 'owner', - 'permlevel': 0, - 'role': 'Employee', - 'submit': 0, - 'write': 0 - }, - - # DocPerm - { - 'amend': 0, - 'create': 1, - '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 - }, - - # DocPerm - { - 'doctype': 'DocPerm', - 'idx': 5, - 'permlevel': 1, - 'role': 'HR User' - }, - - # DocPerm - { - 'doctype': 'DocPerm', - 'idx': 6, - 'permlevel': 1, - 'role': 'HR Manager' - }, - - # DocField - { - 'doctype': 'DocField', - 'fieldtype': 'Section Break', - 'idx': 1, - 'label': 'Basic Info', - 'oldfieldtype': 'Section Break', - 'permlevel': 0 - }, - - # DocField - { - 'doctype': 'DocField', - 'fieldtype': 'Column Break', - 'idx': 2, - 'oldfieldtype': 'Column Break', - 'permlevel': 0, - 'width': '50%' - }, - - # DocField - { - 'colour': 'White:FFF', - 'doctype': 'DocField', - 'fieldname': 'employee', - 'fieldtype': 'Link', - 'idx': 3, - 'in_filter': 1, - 'label': 'Employee', - 'oldfieldname': 'employee', - 'oldfieldtype': 'Link', - 'options': 'Employee', - 'permlevel': 0, - 'reqd': 1, - 'search_index': 0 - }, - - # DocField - { - 'doctype': 'DocField', - 'fieldname': 'employee_name', - 'fieldtype': 'Data', - 'idx': 4, - 'in_filter': 1, - 'label': 'Employee Name', - 'oldfieldname': 'employee_name', - 'oldfieldtype': 'Data', - 'permlevel': 1, - 'reqd': 1 - }, - - # DocField - { - 'doctype': 'DocField', - 'fieldname': 'department', - 'fieldtype': 'Link', - 'idx': 5, - 'in_filter': 1, - 'label': 'Department', - 'oldfieldname': 'department', - 'oldfieldtype': 'Link', - 'options': 'Department', - 'permlevel': 1, - 'reqd': 0, - 'search_index': 1 - }, - - # DocField - { - 'doctype': 'DocField', - 'fieldname': 'designation', - 'fieldtype': 'Link', - 'idx': 6, - 'in_filter': 1, - 'label': 'Designation', - 'oldfieldname': 'designation', - 'oldfieldtype': 'Link', - 'options': 'Designation', - 'permlevel': 1, - 'search_index': 1 - }, - - # DocField - { - 'doctype': 'DocField', - 'fieldname': 'branch', - 'fieldtype': 'Link', - 'idx': 7, - 'in_filter': 1, - 'label': 'Branch', - 'oldfieldname': 'branch', - 'oldfieldtype': 'Link', - 'options': 'Branch', - 'permlevel': 1, - 'search_index': 1 - }, - - # DocField - { - 'doctype': 'DocField', - 'fieldname': 'grade', - 'fieldtype': 'Link', - 'idx': 8, - 'in_filter': 1, - 'label': 'Grade', - 'oldfieldname': 'grade', - 'oldfieldtype': 'Link', - 'options': 'Grade', - 'permlevel': 1, - 'search_index': 1 - }, - - # DocField - { - 'doctype': 'DocField', - 'fieldname': 'pf_no', - 'fieldtype': 'Data', - 'idx': 9, - 'label': 'PF No.', - 'oldfieldname': 'pf_no', - 'oldfieldtype': 'Data', - 'permlevel': 1 - }, - - # DocField - { - 'doctype': 'DocField', - 'fieldname': 'esic_no', - 'fieldtype': 'Data', - 'idx': 10, - 'label': 'ESIC No.', - 'oldfieldname': 'esic_no', - 'oldfieldtype': 'Data', - 'permlevel': 1 - }, - - # DocField - { - 'doctype': 'DocField', - 'fieldname': 'letter_head', - 'fieldtype': 'Link', - 'idx': 11, - 'label': 'Letter Head', - 'options': 'Letter Head', - 'permlevel': 0 - }, - - # DocField - { - 'doctype': 'DocField', - 'fieldtype': 'Column Break', - 'idx': 12, - 'oldfieldtype': 'Column Break', - 'permlevel': 0, - 'width': '50%' - }, - - # DocField - { - 'colour': 'White:FFF', - 'doctype': 'DocField', - 'fieldname': 'fiscal_year', - 'fieldtype': 'Link', - 'idx': 13, - 'in_filter': 1, - 'label': 'Fiscal Year', - 'oldfieldname': 'fiscal_year', - 'oldfieldtype': 'Data', - 'options': 'Fiscal Year', - 'permlevel': 0, - 'reqd': 1, - 'search_index': 1 - }, - - # DocField - { - 'doctype': 'DocField', - 'fieldname': 'company', - 'fieldtype': 'Select', - 'idx': 14, - 'in_filter': 1, - 'label': 'Company', - 'options': 'link:Company', - 'permlevel': 0, - 'reqd': 1 - }, - - # DocField - { - 'colour': 'White:FFF', - 'doctype': 'DocField', - 'fieldname': 'month', - 'fieldtype': 'Select', - 'idx': 15, - 'in_filter': 1, - 'label': 'Month', - 'oldfieldname': 'month', - 'oldfieldtype': 'Select', - 'options': '\n01\n02\n03\n04\n05\n06\n07\n08\n09\n10\n11\n12', - 'permlevel': 0, - 'reqd': 1, - 'search_index': 1, - 'trigger': 'Client', - 'width': '37%' - }, - - # DocField - { - 'doctype': 'DocField', - 'fieldname': 'total_days_in_month', - 'fieldtype': 'Data', - 'idx': 16, - 'label': 'Total days in month', - 'oldfieldname': 'total_days_in_month', - 'oldfieldtype': 'Int', - 'permlevel': 1, - 'reqd': 1 - }, - - # DocField - { - 'colour': 'White:FFF', - 'doctype': 'DocField', - 'fieldname': 'leave_without_pay', - 'fieldtype': 'Currency', - 'idx': 17, - 'label': 'Leave Without Pay', - 'oldfieldname': 'leave_without_pay', - 'oldfieldtype': 'Currency', - 'permlevel': 0, - 'trigger': 'Client' - }, - - # DocField - { - 'doctype': 'DocField', - 'fieldname': 'payment_days', - 'fieldtype': 'Float', - 'idx': 18, - 'label': 'Payment days', - 'oldfieldname': 'payment_days', - 'oldfieldtype': 'Float', - 'permlevel': 1, - 'reqd': 1 - }, - - # DocField - { - 'doctype': 'DocField', - 'fieldname': 'bank_name', - 'fieldtype': 'Data', - 'idx': 19, - 'label': 'Bank Name', - 'oldfieldname': 'bank_name', - 'oldfieldtype': 'Data', - 'permlevel': 1 - }, - - # DocField - { - 'doctype': 'DocField', - 'fieldname': 'bank_account_no', - 'fieldtype': 'Data', - 'idx': 20, - 'label': 'Bank Account No.', - 'oldfieldname': 'bank_account_no', - 'oldfieldtype': 'Data', - 'permlevel': 1 - }, - - # DocField - { - 'colour': 'White:FFF', - 'doctype': 'DocField', - 'fieldname': 'email_check', - 'fieldtype': 'Check', - 'idx': 21, - 'label': 'Email', - 'no_copy': 1, - 'oldfieldname': 'email_check', - 'oldfieldtype': 'Check', - 'permlevel': 0, - 'print_hide': 1, - 'report_hide': 1 - }, - - # DocField - { - 'doctype': 'DocField', - 'fieldname': 'amended_from', - 'fieldtype': 'Data', - 'hidden': 0, - 'idx': 22, - 'label': 'Amended From', - 'no_copy': 1, - 'oldfieldname': 'amended_from', - 'oldfieldtype': 'Data', - 'permlevel': 0, - 'print_hide': 1, - 'report_hide': 0 - }, - - # DocField - { - 'doctype': 'DocField', - 'fieldname': 'amendment_date', - 'fieldtype': 'Date', - 'hidden': 0, - 'idx': 23, - 'label': 'Amendment Date', - 'no_copy': 1, - 'oldfieldname': 'amendment_date', - 'oldfieldtype': 'Date', - 'permlevel': 0, - 'print_hide': 1, - 'report_hide': 0 - }, - - # DocField - { - 'doctype': 'DocField', - 'fieldtype': 'Section Break', - 'idx': 24, - 'label': 'Earning & Deduction', - 'oldfieldtype': 'Section Break', - 'permlevel': 0 - }, - - # DocField - { - 'colour': 'White:FFF', - 'doctype': 'DocField', - 'fieldtype': 'Column Break', - 'idx': 25, - 'label': 'Earning', - 'oldfieldtype': 'Column Break', - 'permlevel': 0, - 'reqd': 0, - 'width': '50%' - }, - - # DocField - { - 'colour': 'White:FFF', - 'doctype': 'DocField', - 'fieldname': 'earning_details', - 'fieldtype': 'Table', - 'idx': 26, - 'label': 'Earning Details', - 'oldfieldname': 'earning_details', - 'oldfieldtype': 'Table', - 'options': 'SS Earning Detail', - 'permlevel': 0 - }, - - # DocField - { - 'colour': 'White:FFF', - 'doctype': 'DocField', - 'fieldtype': 'Column Break', - 'idx': 27, - 'label': 'Deduction', - 'oldfieldtype': 'Column Break', - 'permlevel': 0, - 'width': '50%' - }, - - # DocField - { - 'doctype': 'DocField', - 'fieldname': 'deduction_details', - 'fieldtype': 'Table', - 'idx': 28, - 'label': 'Deduction Details', - 'oldfieldname': 'deduction_details', - 'oldfieldtype': 'Table', - 'options': 'SS Deduction Detail', - 'permlevel': 0 - }, - - # DocField - { - 'doctype': 'DocField', - 'fieldtype': 'Section Break', - 'idx': 29, - 'label': 'Totals', - 'oldfieldtype': 'Section Break', - 'permlevel': 0 - }, - - # DocField - { - 'doctype': 'DocField', - 'fieldtype': 'Column Break', - 'idx': 30, - 'oldfieldtype': 'Column Break', - 'permlevel': 0, - 'width': '50%' - }, - - # DocField - { - 'doctype': 'DocField', - 'fieldname': 'arrear_amount', - 'fieldtype': 'Currency', - 'idx': 31, - 'label': 'Arrear Amount', - 'oldfieldname': 'arrear_amount', - 'oldfieldtype': 'Currency', - 'permlevel': 0 - }, - - # DocField - { - 'colour': 'White:FFF', - 'doctype': 'DocField', - 'fieldname': 'leave_encashment_amount', - 'fieldtype': 'Currency', - 'idx': 32, - 'label': 'Leave Encashment Amount', - 'oldfieldname': 'encashment_amount', - 'oldfieldtype': 'Currency', - 'permlevel': 0 - }, - - # DocField - { - 'doctype': 'DocField', - 'fieldname': 'gross_pay', - 'fieldtype': 'Currency', - 'idx': 33, - 'label': 'Gross Pay', - 'oldfieldname': 'gross_pay', - 'oldfieldtype': 'Currency', - 'permlevel': 1 - }, - - # DocField - { - 'doctype': 'DocField', - 'fieldname': 'total_deduction', - 'fieldtype': 'Currency', - 'idx': 34, - 'label': 'Total Deduction', - 'oldfieldname': 'total_deduction', - 'oldfieldtype': 'Currency', - 'permlevel': 1 - }, - - # DocField - { - 'doctype': 'DocField', - 'fieldtype': 'Column Break', - 'idx': 35, - 'oldfieldtype': 'Column Break', - 'permlevel': 0, - 'width': '50%' - }, - - # DocField - { - 'colour': 'White:FFF', - 'description': 'Gross Pay + Arrear Amount +Encashment Amount - Total Deduction', - 'doctype': 'DocField', - 'fieldname': 'net_pay', - 'fieldtype': 'Currency', - 'idx': 36, - 'label': 'Net Pay', - 'oldfieldname': 'net_pay', - 'oldfieldtype': 'Currency', - 'permlevel': 1 - }, - - # DocField - { - 'doctype': 'DocField', - 'fieldname': 'rounded_total', - 'fieldtype': 'Currency', - 'idx': 37, - 'label': 'Rounded Total', - 'permlevel': 1 - }, - - # DocField - { - 'description': 'Net Pay (in words) will be visible once you save the Salary Slip.', - 'doctype': 'DocField', - 'fieldname': 'total_in_words', - 'fieldtype': 'Data', - 'idx': 38, - 'label': 'Total in words', - 'oldfieldname': 'net_pay_in_words', - 'oldfieldtype': 'Data', - 'permlevel': 1 - } -] \ No newline at end of file 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/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 384ee2a0032..3f6c93e0c11 100644 --- a/patches/patch.py +++ b/patches/patch.py @@ -1,13 +1,12 @@ # REMEMBER to update this # ======================== -last_patch = 326 +last_patch = 330 #------------------------------------------- def execute(patch_no): import webnotes - from webnotes.modules.import_module import import_from_files from webnotes.modules.module_manager import reload_doc from webnotes.model.code import get_obj @@ -1298,3 +1297,37 @@ def execute(patch_no): # load the new billing page if cint(webnotes.conn.get_value('Control Panel',None,'sync_with_gateway')): reload_doc('server_tools','page','billing') + 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', + 'support_host':'host', + 'support_username': 'username', + 'support_password': 'password', + 'support_use_ssl': 'use_ssl', + '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'") + 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: + from index_patch import create_proper_index + create_proper_index() + elif patch_no == 330: + reload_doc('utilities', 'doctype', 'rename_tool') + reload_doc('utilities', 'doctype', 'bulk_rename_tool') 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/email_settings/email_settings.py b/setup/doctype/email_settings/email_settings.py index 12c24646e1a..37de7bcb18d 100644 --- a/setup/doctype/email_settings/email_settings.py +++ b/setup/doctype/email_settings/email_settings.py @@ -1,44 +1,42 @@ -# 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 -# ----------------------------------------------------------------------------------------- - +from webnotes.utils import cint, cstr class DocType: - def __init__(self,doc,doclist): - self.doc,self.doclist = doc,doclist + def __init__(self,doc,doclist): + self.doc,self.doclist = doc,doclist - def set_vals(self): - res = sql("select field, value from `tabSingles` where doctype = 'Control Panel' and field IN ('outgoing_mail_server','mail_login','mail_password','auto_email_id','mail_port','use_ssl')") - ret = {} - for r in res: - ret[cstr(r[0])]=r[1] and cstr(r[1]) or '' - - return str(ret) + def set_vals(self): + res = sql("select field, value from `tabSingles` where doctype = 'Control Panel' and field IN ('outgoing_mail_server','mail_login','mail_password','auto_email_id','mail_port','use_ssl')") + ret = {} + for r in res: + ret[cstr(r[0])]=r[1] and cstr(r[1]) or '' + + return str(ret) - def on_update(self): - if self.doc.outgoing_mail_server: - sql("update `tabSingles` set value ='%s' where doctype = 'Control Panel' and field = 'outgoing_mail_server'"%self.doc.outgoing_mail_server) - if self.doc.mail_login: - sql("update `tabSingles` set value ='%s' where doctype = 'Control Panel' and field = 'mail_login'"%self.doc.mail_login) - if self.doc.mail_password: - sql("update `tabSingles` set value ='%s' where doctype = 'Control Panel' and field = 'mail_password'"%self.doc.mail_password) - if self.doc.auto_email_id: - sql("update `tabSingles` set value ='%s' where doctype = 'Control Panel' and field = 'auto_email_id'"%self.doc.auto_email_id) - if self.doc.mail_port: - sql("update `tabSingles` set value ='%s' where doctype = 'Control Panel' and field = 'mail_port'"%self.doc.mail_port) - if self.doc.use_ssl: - sql("update `tabSingles` set value ='%s' where doctype = 'Control Panel' and field = 'use_ssl'"%self.doc.use_ssl) \ No newline at end of file + def set_cp_value(self, key): + """ + Update value in control panel + """ + if self.doc.fields.get(key): + webnotes.conn.set_value('Control Panel', None, key, self.doc.fields[key]) + + def on_update(self): + """ + Sets or cancels the event in the scheduler + """ + # update control panel + for f in ('outgoing_mail_server', 'mail_login', 'mail_password', 'auto_email_id', 'mail_port', 'use_ssl'): + self.set_cp_value(f) + + # setup scheduler for support emails + if cint(self.doc.sync_support_mails): + if not (self.doc.support_host and self.doc.support_username and self.doc.support_password): + webnotes.msgprint("You must give the incoming POP3 settings for support emails to activiate mailbox integration", raise_exception=1) + + from webnotes.utils.scheduler import set_event + set_event('support.doctype.support_ticket.get_support_mails', 60*5, 1) + else: + from webnotes.utils.scheduler import cancel_event + cancel_event('support.doctype.support_ticket.get_support_mails') \ No newline at end of file diff --git a/setup/doctype/email_settings/email_settings.txt b/setup/doctype/email_settings/email_settings.txt index 31bc93285f1..ef6efe609f7 100644 --- a/setup/doctype/email_settings/email_settings.txt +++ b/setup/doctype/email_settings/email_settings.txt @@ -5,14 +5,14 @@ { 'creation': '2010-08-08 17:08:59', 'docstatus': 0, - 'modified': '2011-01-04 11:21:25', - 'modified_by': 'umair@iwebnotes.com', + 'modified': '2011-07-25 15:03:51', + 'modified_by': 'Administrator', 'owner': 'harshada@webnotestech.com' }, # These values are common for all DocType { - '_last_update': '1307707462', + '_last_update': '1311586371', 'allow_copy': 1, 'allow_email': 1, 'allow_print': 1, @@ -24,7 +24,7 @@ 'name': '__common__', 'section_style': 'Simple', 'server_code_error': ' ', - 'version': 27 + 'version': 34 }, # These values are common for all DocField @@ -69,12 +69,29 @@ 'idx': 2 }, + # DocField + { + 'doctype': 'DocField', + 'fieldtype': 'Section Break', + 'idx': 1, + 'label': 'Outgoing Mails' + }, + + # DocField + { + 'doctype': 'DocField', + 'fieldtype': 'HTML', + 'idx': 2, + 'label': '1', + 'options': '
Set your outgoing mail settings here. All system generated notifications, emails will go from this mail server
' + }, + # DocField { 'doctype': 'DocField', 'fieldname': 'outgoing_mail_server', 'fieldtype': 'Data', - 'idx': 1, + 'idx': 3, 'label': 'Outgoing Mail Server' }, @@ -83,7 +100,7 @@ 'doctype': 'DocField', 'fieldname': 'mail_port', 'fieldtype': 'Data', - 'idx': 2, + 'idx': 4, 'label': 'Mail Port' }, @@ -92,7 +109,7 @@ 'doctype': 'DocField', 'fieldname': 'use_ssl', 'fieldtype': 'Check', - 'idx': 3, + 'idx': 5, 'label': 'Use SSL' }, @@ -101,7 +118,7 @@ 'doctype': 'DocField', 'fieldname': 'mail_login', 'fieldtype': 'Data', - 'idx': 4, + 'idx': 6, 'label': 'Login Id' }, @@ -110,7 +127,7 @@ 'doctype': 'DocField', 'fieldname': 'mail_password', 'fieldtype': 'Password', - 'idx': 5, + 'idx': 7, 'label': 'Mail Password' }, @@ -119,7 +136,122 @@ 'doctype': 'DocField', 'fieldname': 'auto_email_id', 'fieldtype': 'Data', - 'idx': 6, + 'idx': 8, 'label': 'Auto Email Id' + }, + + # DocField + { + 'description': 'Set the POP3 email settings to pull emails directly from a mailbox and create Support Tickets', + 'doctype': 'DocField', + 'fieldtype': 'Section Break', + 'idx': 9, + 'label': 'Support Ticket Mail Settings' + }, + + # DocField + { + 'doctype': 'DocField', + 'fieldtype': 'HTML', + 'idx': 10, + 'label': '2', + 'options': '
To automatically create Support Tickets from your incoming mail, set your pop3 settings here.
' + }, + + # DocField + { + 'doctype': 'DocField', + 'fieldtype': 'Section Break', + 'idx': 11, + 'options': 'Simple' + }, + + # DocField + { + 'colour': 'White:FFF', + 'description': 'Check this to pull emails from your mailbox', + 'doctype': 'DocField', + 'fieldname': 'sync_support_mails', + 'fieldtype': 'Check', + 'idx': 12, + 'label': 'Sync Support Mails' + }, + + # DocField + { + 'colour': 'White:FFF', + 'description': 'Your support email id - must be a valid email - this is where your emails will come!', + 'doctype': 'DocField', + 'fieldname': 'support_email', + 'fieldtype': 'Data', + 'idx': 13, + 'label': 'Support Email' + }, + + # DocField + { + 'colour': 'White:FFF', + 'description': 'POP3 mail server (e.g. pop.gmail.com)', + 'doctype': 'DocField', + 'fieldname': 'support_host', + 'fieldtype': 'Data', + 'idx': 14, + 'label': 'POP3 Mail Server' + }, + + # DocField + { + 'doctype': 'DocField', + 'fieldname': 'support_use_ssl', + 'fieldtype': 'Check', + 'idx': 15, + 'label': 'Use SSL' + }, + + # DocField + { + 'doctype': 'DocField', + 'fieldname': 'support_username', + 'fieldtype': 'Data', + 'idx': 16, + 'label': 'User Name' + }, + + # DocField + { + 'doctype': 'DocField', + 'fieldname': 'support_password', + 'fieldtype': 'Password', + 'idx': 17, + 'label': 'Support Password' + }, + + # DocField + { + 'doctype': 'DocField', + 'fieldtype': 'Column Break', + 'idx': 18 + }, + + # DocField + { + 'colour': 'White:FFF', + 'description': 'Signature to be appended at the end of every email', + 'doctype': 'DocField', + 'fieldname': 'support_signature', + 'fieldtype': 'Text', + 'idx': 19, + 'label': 'Signature' + }, + + # DocField + { + 'colour': 'White:FFF', + 'description': 'Autoreply when a new mail is received', + 'doctype': 'DocField', + 'fieldname': 'support_autoreply', + 'fieldtype': 'Text', + 'idx': 20, + 'label': 'Autoreply' } ] \ No newline at end of file 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/support_email_settings/__init__.py b/setup/doctype/support_email_settings/__init__.py deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/setup/doctype/support_email_settings/support_email_settings.py b/setup/doctype/support_email_settings/support_email_settings.py deleted file mode 100644 index 44d87350a48..00000000000 --- a/setup/doctype/support_email_settings/support_email_settings.py +++ /dev/null @@ -1,18 +0,0 @@ -import webnotes -from webnotes.utils import cint - -class DocType: - def __init__(self,dt,dn): - self.doc, self.doctype = dt,dn - - def on_update(self): - """ - Sets or cancels the event in the scheduler - """ - if cint(self.doc.integrate_incoming): - from webnotes.utils.scheduler import set_event - set_event('support.doctype.support_ticket.get_support_mails', 60*5, 1) - else: - from webnotes.utils.scheduler import cancel_event - cancel_event('support.doctype.support_ticket.get_support_mails') - diff --git a/setup/doctype/support_email_settings/support_email_settings.txt b/setup/doctype/support_email_settings/support_email_settings.txt deleted file mode 100644 index 6079567bfa8..00000000000 --- a/setup/doctype/support_email_settings/support_email_settings.txt +++ /dev/null @@ -1,144 +0,0 @@ -# DocType, Support Email Settings -[ - - # These values are common in all dictionaries - { - 'creation': '2011-05-23 14:50:45', - 'docstatus': 0, - 'modified': '2011-05-28 09:25:53', - 'modified_by': 'Administrator', - 'owner': 'Administrator' - }, - - # These values are common for all DocType - { - '_last_update': '1306554355', - 'colour': 'White:FFF', - 'doctype': 'DocType', - 'in_dialog': 1, - 'issingle': 1, - 'module': 'Setup', - 'name': '__common__', - 'read_only': 1, - 'section_style': 'Simple', - 'show_in_menu': 1, - 'version': 8 - }, - - # These values are common for all DocField - { - 'doctype': 'DocField', - 'name': '__common__', - 'parent': 'Support Email Settings', - 'parentfield': 'fields', - 'parenttype': 'DocType', - 'permlevel': 0 - }, - - # These values are common for all DocPerm - { - 'create': 1, - 'doctype': 'DocPerm', - 'idx': 1, - 'name': '__common__', - 'parent': 'Support Email Settings', - 'parentfield': 'permissions', - 'parenttype': 'DocType', - 'permlevel': 0, - 'read': 1, - 'role': 'System Manager', - 'write': 1 - }, - - # DocType, Support Email Settings - { - 'doctype': 'DocType', - 'name': 'Support Email Settings' - }, - - # DocPerm - { - 'doctype': 'DocPerm' - }, - - # DocField - { - 'colour': 'White:FFF', - 'description': 'The full email id of your incoming support emails', - 'doctype': 'DocField', - 'fieldname': 'email', - 'fieldtype': 'Data', - 'idx': 1, - 'label': 'Email', - 'options': 'Email' - }, - - # DocField - { - 'colour': 'White:FFF', - 'description': 'By checking this, your incoming mails will automatically be integrated with the Support Ticket', - 'doctype': 'DocField', - 'fieldname': 'integrate_incoming', - 'fieldtype': 'Check', - 'idx': 2, - 'label': 'Integrate Incoming' - }, - - # DocField - { - 'colour': 'White:FFF', - 'description': 'Signature appended to the outgoing email (Text / HTML)', - 'doctype': 'DocField', - 'fieldname': 'signature', - 'fieldtype': 'Text', - 'idx': 3, - 'label': 'Signature' - }, - - # DocField - { - 'doctype': 'DocField', - 'fieldtype': 'Column Break', - 'idx': 4 - }, - - # DocField - { - 'doctype': 'DocField', - 'fieldname': 'use_ssl', - 'fieldtype': 'Check', - 'idx': 5, - 'label': 'Use SSL' - }, - - # DocField - { - 'colour': 'White:FFF', - 'description': 'eg. pop.gmail.com', - 'doctype': 'DocField', - 'fieldname': 'host', - 'fieldtype': 'Data', - 'idx': 6, - 'label': 'Host' - }, - - # DocField - { - 'colour': 'White:FFF', - 'description': 'Support Email Id', - 'doctype': 'DocField', - 'fieldname': 'username', - 'fieldtype': 'Data', - 'idx': 7, - 'label': 'Username' - }, - - # DocField - { - 'doctype': 'DocField', - 'fieldname': 'password', - 'fieldtype': 'Password', - 'idx': 8, - 'label': 'Password' - } -] \ No newline at end of file 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/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/__init__.py b/support/doctype/support_ticket/__init__.py index 0ca33ec0b90..936233db7ca 100644 --- a/support/doctype/support_ticket/__init__.py +++ b/support/doctype/support_ticket/__init__.py @@ -6,14 +6,26 @@ class SupportMailbox(POP3Mailbox): def __init__(self): """ settings_doc must contain - is_ssl, host, username, password + use_ssl, host, username, password """ - POP3Mailbox.__init__(self, 'Support Email Settings') + from webnotes.model.doc import Document + + # extract email settings + self.email_settings = Document('Email Settings','Email Settings') + + s = Document('Support Email Settings') + s.use_ssl = self.email_settings.support_use_ssl + s.host = self.email_settings.support_host + s.username = self.email_settings.support_username + s.password = self.email_settings.support_password + + POP3Mailbox.__init__(self, s) def check_mails(self): """ returns true if there are active sessions """ + self.auto_close_tickets() return webnotes.conn.sql("select user from tabSessions where time_to_sec(timediff(now(), lastupdate)) < 1800") def process_message(self, mail): @@ -56,6 +68,39 @@ class SupportMailbox(POP3Mailbox): # update feed update_feed(d) + # send auto reply + self.send_auto_reply(d) + + def send_auto_reply(self, d): + """ + Send auto reply to emails + """ + signature = self.email_settings.support_signature + + response = self.email_settings.support_autoreply or (""" +A new Ticket has been raised for your query. If you have any additional information, please +reply back to this mail. + +We will get back to you as soon as possible + +[This is an automatic response] + + """ + signature) + + from webnotes.utils.email_lib import sendmail + + sendmail(\ + recipients = [d.raised_by], \ + sender = self.email_settings.support_email, \ + subject = '['+d.name+'] ' + d.subject, \ + msg = response) + + def auto_close_tickets(self): + """ + Auto Closes Waiting for Customer Support Ticket after 15 days + """ + webnotes.conn.sql("update `tabSupport Ticket` set status = 'Closed' where status = 'Waiting for Customer' and date_sub(curdate(),interval 15 Day) > modified") + def get_support_mails(): """ @@ -63,8 +108,3 @@ def get_support_mails(): """ SupportMailbox().get_messages() -def auto_close_tickets(): - """ - Auto Closes Waiting for Customer Support Ticket after 15 days - """ - webnotes.conn.sql("update `tabSupport Ticket` set status = 'Closed' where status = 'Waiting for Customer' and date_sub(curdate(),interval 15 Day) > modified") diff --git a/support/doctype/support_ticket/support_ticket.js b/support/doctype/support_ticket/support_ticket.js index 2c1e77faed5..914227b2226 100644 --- a/support/doctype/support_ticket/support_ticket.js +++ b/support/doctype/support_ticket/support_ticket.js @@ -20,9 +20,9 @@ $.extend(cur_frm.cscript, { items: [ { column: 0, - label:'Support Email Settings', + label:'Email Settings', description:'Integrate your incoming support emails to support ticket', - onclick: function() { loaddoc('Support Email Settings','Support Email Settings'); } + onclick: function() { loaddoc('Email Settings','Email Settings'); } }, ] }) diff --git a/support/doctype/support_ticket/support_ticket.py b/support/doctype/support_ticket/support_ticket.py index 75defbeb346..c71304a0f75 100644 --- a/support/doctype/support_ticket/support_ticket.py +++ b/support/doctype/support_ticket/support_ticket.py @@ -19,7 +19,7 @@ class DocType(TransactionBase): response = self.doc.new_response + '\n\n[Please do not change the subject while responding.]' - signature = webnotes.conn.get_value('Support Email Settings',None,'signature') + signature = webnotes.conn.get_value('Email Settings',None,'support_signature') if signature: response += '\n\n' + signature @@ -27,7 +27,7 @@ class DocType(TransactionBase): sendmail(\ recipients = [self.doc.raised_by], \ - sender=webnotes.conn.get_value('Support Email Settings',None,'email'), \ + sender=webnotes.conn.get_value('Email Settings',None,'support_email'), \ subject=subject, \ msg=response) diff --git a/support/doctype/support_ticket/support_ticket.txt b/support/doctype/support_ticket/support_ticket.txt index caeb801f9ad..8164764efdb 100644 --- a/support/doctype/support_ticket/support_ticket.txt +++ b/support/doctype/support_ticket/support_ticket.txt @@ -3,16 +3,16 @@ # These values are common in all dictionaries { - 'creation': '2011-05-23 14:50:46', + 'creation': '2011-05-23 09:01:10', 'docstatus': 0, - 'modified': '2011-07-06 09:25:53', + 'modified': '2011-07-25 14:45:28', 'modified_by': 'Administrator', 'owner': 'Administrator' }, # These values are common for all DocType { - '_last_update': '1309771514', + '_last_update': '1311584009', 'allow_trash': 1, 'autoname': 'SUP.######', 'colour': 'White:FFF', @@ -25,7 +25,7 @@ 'show_in_menu': 0, 'subject': '%(subject)s', 'tag_fields': 'status,allocated_to', - 'version': 150 + 'version': 144 }, # These values are common for all DocField @@ -131,7 +131,7 @@ { 'doctype': 'DocField', 'fieldname': 'subject', - 'fieldtype': 'Small Text', + 'fieldtype': 'Text', 'idx': 2, 'in_filter': 1, 'label': 'Subject', @@ -168,24 +168,12 @@ 'reqd': 0 }, - # DocField - { - 'doctype': 'DocField', - 'fieldname': 'problem_description', - 'fieldtype': 'Text', - 'idx': 5, - 'label': 'Problem Description', - 'oldfieldname': 'problem_description', - 'oldfieldtype': 'Text', - 'permlevel': 0 - }, - # DocField { 'depends_on': 'eval:!doc.__islocal', 'doctype': 'DocField', 'fieldtype': 'HTML', - 'idx': 6, + 'idx': 5, 'label': 'Thread HTML', 'permlevel': 1 }, @@ -196,7 +184,7 @@ 'doctype': 'DocField', 'fieldname': 'new_response', 'fieldtype': 'Text', - 'idx': 7, + 'idx': 6, 'label': 'New Response', 'permlevel': 0 }, @@ -206,9 +194,8 @@ 'depends_on': 'eval:!doc.__islocal', 'doctype': 'DocField', 'fieldtype': 'Button', - 'idx': 8, + 'idx': 7, 'label': 'Send', - 'options': 'send_response', 'permlevel': 0 }, @@ -217,7 +204,7 @@ 'colour': 'White:FFF', 'doctype': 'DocField', 'fieldtype': 'Section Break', - 'idx': 9, + 'idx': 8, 'label': 'Additional Info', 'permlevel': 1 }, @@ -227,7 +214,7 @@ 'depends_on': 'eval:!doc.__islocal', 'doctype': 'DocField', 'fieldtype': 'Column Break', - 'idx': 10, + 'idx': 9, 'oldfieldtype': 'Column Break', 'permlevel': 1, 'width': '50%' @@ -239,7 +226,7 @@ 'doctype': 'DocField', 'fieldname': 'customer', 'fieldtype': 'Link', - 'idx': 11, + 'idx': 10, 'in_filter': 1, 'label': 'Customer', 'oldfieldname': 'customer', @@ -257,14 +244,14 @@ 'doctype': 'DocField', 'fieldname': 'customer_name', 'fieldtype': 'Data', - 'idx': 12, + 'idx': 11, 'in_filter': 1, 'label': 'Customer Name', 'oldfieldname': 'customer_name', 'oldfieldtype': 'Data', 'permlevel': 2, 'reqd': 0, - 'search_index': 1 + 'search_index': 0 }, # DocField @@ -272,7 +259,7 @@ 'doctype': 'DocField', 'fieldname': 'address_display', 'fieldtype': 'Small Text', - 'idx': 13, + 'idx': 12, 'label': 'Address', 'permlevel': 2 }, @@ -282,7 +269,7 @@ 'doctype': 'DocField', 'fieldname': 'contact_display', 'fieldtype': 'Data', - 'idx': 14, + 'idx': 13, 'label': 'Contact Name', 'permlevel': 2 }, @@ -292,7 +279,7 @@ 'doctype': 'DocField', 'fieldname': 'contact_mobile', 'fieldtype': 'Data', - 'idx': 15, + 'idx': 14, 'label': 'Mobile No', 'permlevel': 2 }, @@ -302,7 +289,7 @@ 'doctype': 'DocField', 'fieldname': 'contact_email', 'fieldtype': 'Data', - 'idx': 16, + 'idx': 15, 'label': 'Contact Email', 'oldfieldname': 'contact_no', 'oldfieldtype': 'Data', @@ -315,7 +302,7 @@ 'doctype': 'DocField', 'fieldname': 'opening_date', 'fieldtype': 'Date', - 'idx': 17, + 'idx': 16, 'label': 'Opening Date', 'no_copy': 1, 'oldfieldname': 'opening_date', @@ -328,7 +315,7 @@ 'doctype': 'DocField', 'fieldname': 'opening_time', 'fieldtype': 'Time', - 'idx': 18, + 'idx': 17, 'label': 'Opening Time', 'no_copy': 1, 'oldfieldname': 'opening_time', @@ -341,19 +328,18 @@ 'depends_on': 'eval:!doc.__islocal', 'doctype': 'DocField', 'fieldtype': 'Column Break', - 'idx': 19, + 'idx': 18, 'oldfieldtype': 'Column Break', 'permlevel': 1 }, # DocField { - 'colour': 'White:FFF', 'depends_on': 'eval:!doc.__islocal', 'doctype': 'DocField', 'fieldname': 'allocated_to', 'fieldtype': 'Link', - 'idx': 20, + 'idx': 19, 'in_filter': 1, 'label': 'Allocated To', 'oldfieldname': 'allocated_to', @@ -368,8 +354,8 @@ 'depends_on': 'eval:!doc.__islocal', 'doctype': 'DocField', 'fieldname': 'resolution_details', - 'fieldtype': 'Small Text', - 'idx': 21, + 'fieldtype': 'Text', + 'idx': 20, 'label': 'Resolution Details', 'no_copy': 1, 'oldfieldname': 'resolution_details', @@ -379,19 +365,18 @@ # DocField { - 'colour': 'White:FFF', 'depends_on': 'eval:!doc.__islocal', 'doctype': 'DocField', 'fieldname': 'resolution_date', 'fieldtype': 'Date', - 'idx': 22, + 'idx': 21, 'in_filter': 0, 'label': 'Resolution Date', 'no_copy': 1, 'oldfieldname': 'resolution_date', 'oldfieldtype': 'Date', 'permlevel': 1, - 'search_index': 1 + 'search_index': 0 }, # DocField @@ -400,7 +385,7 @@ 'doctype': 'DocField', 'fieldname': 'resolution_time', 'fieldtype': 'Time', - 'idx': 23, + 'idx': 22, 'label': 'Resolution Time', 'oldfieldname': 'resolution_time', 'oldfieldtype': 'Time', @@ -414,7 +399,7 @@ 'fieldname': 'content_type', 'fieldtype': 'Data', 'hidden': 1, - 'idx': 24, + 'idx': 23, 'label': 'Content Type', 'permlevel': 0 } 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..fb998628a25 100644 --- a/utilities/doctype/bulk_rename_tool/bulk_rename_tool.txt +++ b/utilities/doctype/bulk_rename_tool/bulk_rename_tool.txt @@ -3,9 +3,9 @@ # These values are common in all dictionaries { - 'creation': '2011-07-08 13:30:05', + 'creation': '2011-07-08 11:14:15', 'docstatus': 0, - 'modified': '2011-07-08 13:30:05', + 'modified': '2011-07-26 00:59:27', 'modified_by': 'Administrator', 'owner': 'Administrator' }, 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