From e6526369f37015cc5e2d866518dec20353650882 Mon Sep 17 00:00:00 2001 From: nabinhait Date: Tue, 19 Jul 2011 18:09:26 +0530 Subject: [PATCH 01/11] Accounts Payable report improved: some query written outside the for-loop Supplier: supplier_status field has been deleted, not used by anyone except janak index patch modified --- .../accounts_payable/accounts_payable.py | 197 +++++++++--------- .../accounts_payable/accounts_payable.sql | 2 +- buying/doctype/supplier/supplier.txt | 47 ++--- patches/index_patch.py | 4 +- patches/patch.py | 5 +- 5 files changed, 128 insertions(+), 127 deletions(-) diff --git a/accounts/search_criteria/accounts_payable/accounts_payable.py b/accounts/search_criteria/accounts_payable/accounts_payable.py index 53fff081ed..8c07b68b45 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 d2dba06391..2054b1e7f0 100644 --- a/accounts/search_criteria/accounts_payable/accounts_payable.sql +++ b/accounts/search_criteria/accounts_payable/accounts_payable.sql @@ -1,4 +1,4 @@ -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 +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' diff --git a/buying/doctype/supplier/supplier.txt b/buying/doctype/supplier/supplier.txt index b7797e548f..3995c92fdc 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', @@ -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/patches/index_patch.py b/patches/index_patch.py index 8f6c4f2d81..9daf4fb96b 100644 --- a/patches/index_patch.py +++ b/patches/index_patch.py @@ -102,7 +102,7 @@ def create_proper_index(): 'File Group': ['parent_group'], 'Maintenance Visit Detail': ['item_code', 'service_person'], 'Support Ticket Response': [], - 'PV Detail': ['item_code', 'purchase_order', 'po_detail', 'purchase_receipt', 'pr_detail', 'expense_head', 'cost_center'], + 'PV Detail': ['item_code', 'purchase_order', 'purchase_receipt', 'expense_head', 'cost_center'], 'Timesheet Detail': ['project_name', 'task_id', 'customer_name'], 'Holiday List Detail': [], 'Workflow Rule Detail': [], @@ -125,7 +125,7 @@ def create_proper_index(): 'Declaration Detail': [], 'Holiday List': ['fiscal_year'], 'Sales Person': ['lft', 'rgt', 'parent_sales_person'], - 'RV Detail': ['item_code', 'sales_order', 'so_detail', 'delivery_note', 'dn_detail', 'cost_center', 'income_account'], + 'RV Detail': ['item_code', 'sales_order', 'delivery_note', 'cost_center', 'income_account'], 'Module Def Item': [], 'TDS Category': [], 'DocTrigger': [], diff --git a/patches/patch.py b/patches/patch.py index 384ee2a003..ad7eb7d623 100644 --- a/patches/patch.py +++ b/patches/patch.py @@ -1,7 +1,7 @@ # REMEMBER to update this # ======================== -last_patch = 326 +last_patch = 327 #------------------------------------------- @@ -1298,3 +1298,6 @@ 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: + if webnotes.conn.get_value('Control Panel', None, 'account_id') != 'axjanak2011': + sql("delete from `tabDocField` where fieldname = 'supplier_status' and parent = 'Supplier'") From 1458af06913711e3f688677d393c763541f3ba05 Mon Sep 17 00:00:00 2001 From: nabinhait Date: Wed, 20 Jul 2011 10:31:19 +0530 Subject: [PATCH 02/11] Index patch released and doctype updated based on index --- accounts/doctype/account/account.txt | 12 +- .../account_balance/account_balance.txt | 2 +- accounts/doctype/cost_center/cost_center.txt | 4 +- accounts/doctype/fiscal_year/fiscal_year.txt | 2 +- accounts/doctype/gl_entry/gl_entry.txt | 14 +- .../journal_voucher/journal_voucher.txt | 26 +-- .../journal_voucher_detail.txt | 2 +- .../payable_voucher/payable_voucher.txt | 19 +-- .../period_closing_voucher.txt | 3 +- accounts/doctype/pos_setting/pos_setting.txt | 24 ++- .../purchase_tax_detail.txt | 1 + accounts/doctype/pv_detail/pv_detail.txt | 2 +- .../receivable_voucher/receivable_voucher.txt | 16 +- accounts/doctype/rv_detail/rv_detail.txt | 2 + .../doctype/rv_tax_detail/rv_tax_detail.txt | 3 +- .../tds_category_account.txt | 2 +- accounts/doctype/tds_payment/tds_payment.txt | 4 +- buying/doctype/indent/indent.txt | 8 +- .../doctype/indent_detail/indent_detail.txt | 6 +- buying/doctype/po_detail/po_detail.txt | 10 +- .../qa_inspection_report.txt | 8 +- buying/doctype/supplier/supplier.txt | 2 +- hr/doctype/attendance/attendance.txt | 4 +- .../educational_qualifications.txt | 2 +- hr/doctype/employee/employee.txt | 8 +- .../expense_voucher/expense_voucher.txt | 2 +- .../leave_allocation/leave_allocation.txt | 2 +- .../leave_application/leave_application.txt | 61 ++++---- hr/doctype/salary_slip/salary_slip.txt | 138 ++++++++++++---- knowledge_base/doctype/question/question.txt | 9 +- patches/index_patch.py | 56 ++++--- patches/patch.py | 5 +- .../bill_of_materials/bill_of_materials.txt | 1 + .../doctype/bom_operation/bom_operation.txt | 1 + .../bom_replace_utility_detail.txt | 3 +- .../flat_bom_detail/flat_bom_detail.txt | 3 +- production/doctype/pp_detail/pp_detail.txt | 3 +- .../production_order/production_order.txt | 10 +- .../update_delivery_date_detail.txt | 6 +- projects/doctype/project/project.txt | 11 +- projects/doctype/timesheet/timesheet.txt | 3 +- .../timesheet_detail/timesheet_detail.txt | 1 + selling/doctype/customer/customer.txt | 6 +- selling/doctype/enquiry/enquiry.txt | 12 +- .../doctype/enquiry_detail/enquiry_detail.txt | 9 +- .../installation_note/installation_note.txt | 9 +- .../installed_item_details.txt | 2 +- selling/doctype/lead/lead.txt | 10 +- selling/doctype/quotation/quotation.txt | 14 +- .../quotation_detail/quotation_detail.txt | 6 +- .../doctype/return_detail/return_detail.txt | 3 +- .../sales_order_detail/sales_order_detail.txt | 4 +- .../authorization_rule/authorization_rule.txt | 9 +- setup/doctype/company/company.txt | 2 +- .../naming_series_options.txt | 3 +- setup/doctype/other_charges/other_charges.txt | 4 +- setup/doctype/sales_partner/sales_partner.txt | 2 +- setup/doctype/sales_person/sales_person.txt | 12 +- setup/doctype/term/term.txt | 2 +- setup/doctype/territory/territory.txt | 5 +- setup/doctype/workflow_rule/workflow_rule.txt | 2 +- stock/doctype/bin/bin.txt | 12 +- stock/doctype/delivery_note/delivery_note.txt | 16 +- .../delivery_note_detail.txt | 11 +- .../delivery_note_packing_detail.txt | 3 +- stock/doctype/item/item.txt | 39 ++--- .../landed_cost_detail/landed_cost_detail.txt | 3 +- .../landed_cost_master/landed_cost_master.txt | 1 + stock/doctype/lc_pr_detail/lc_pr_detail.txt | 3 +- .../purchase_receipt/purchase_receipt.txt | 8 +- .../purchase_receipt_detail.txt | 13 +- .../ref_rate_detail/ref_rate_detail.txt | 12 +- stock/doctype/sales_bom/sales_bom.txt | 3 +- .../sales_bom_detail/sales_bom_detail.txt | 3 +- stock/doctype/serial_no/serial_no.txt | 8 +- stock/doctype/stock_entry/stock_entry.txt | 148 +++++------------- .../stock_entry_detail/stock_entry_detail.txt | 4 +- .../stock_ledger_entry/stock_ledger_entry.txt | 20 +-- .../stock_reconciliation.txt | 9 +- stock/doctype/warehouse/warehouse.txt | 2 +- .../doctype/customer_issue/customer_issue.txt | 16 +- .../item_maintenance_detail.txt | 2 +- .../maintenance_schedule.txt | 8 +- .../maintenance_schedule_detail.txt | 2 +- .../maintenance_visit/maintenance_visit.txt | 6 +- .../doctype/support_ticket/support_ticket.txt | 4 +- utilities/doctype/address/address.txt | 8 +- .../gl_mapper_detail/gl_mapper_detail.txt | 4 +- 88 files changed, 542 insertions(+), 443 deletions(-) diff --git a/accounts/doctype/account/account.txt b/accounts/doctype/account/account.txt index 9ce509c178..b29c61782f 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 a53def25be..1d23bb2fa1 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 ce39929003..fab2dd5f4d 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 fe02b34310..4a7f49ac82 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 7278c4d13a..776cbb3dec 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 index 43ec61437a..1260ec94d1 100644 --- a/accounts/doctype/journal_voucher/journal_voucher.txt +++ b/accounts/doctype/journal_voucher/journal_voucher.txt @@ -21,7 +21,7 @@ # These values are common for all DocType { - '_last_update': '1305714002', + '_last_update': '1309508838', 'colour': 'White:FFF', 'doctype': 'DocType', 'module': 'Accounts', @@ -237,7 +237,7 @@ 'permlevel': 0, 'print_hide': 0, 'reqd': 1, - 'search_index': 1 + 'search_index': 0 }, # DocField @@ -297,7 +297,8 @@ 'oldfieldtype': 'Link', 'options': 'Journal Voucher', 'permlevel': 1, - 'print_hide': 1 + 'print_hide': 1, + 'search_index': 0 }, # DocField @@ -336,7 +337,7 @@ 'oldfieldname': 'cheque_no', 'oldfieldtype': 'Data', 'permlevel': 0, - 'search_index': 1 + 'search_index': 0 }, # DocField @@ -365,7 +366,7 @@ 'oldfieldtype': 'Date', 'permlevel': 1, 'print_hide': 0, - 'search_index': 1 + 'search_index': 0 }, # DocField @@ -536,7 +537,7 @@ 'options': 'No\nYes', 'permlevel': 0, 'print_hide': 1, - 'search_index': 1, + 'search_index': 0, 'trigger': 'Client' }, @@ -634,7 +635,7 @@ 'permlevel': 0, 'print_hide': 1, 'reqd': 1, - 'search_index': 1 + 'search_index': 0 }, # DocField @@ -651,7 +652,7 @@ 'permlevel': 0, 'print_hide': 1, 'reqd': 1, - 'search_index': 1 + 'search_index': 0 }, # DocField @@ -670,6 +671,7 @@ 'permlevel': 0, 'print_hide': 1, 'report_hide': 1, + 'search_index': 0, 'trigger': 'Client' }, @@ -722,7 +724,7 @@ 'options': '\nYes\nNo', 'permlevel': 0, 'print_hide': 1, - 'search_index': 1 + 'search_index': 0 }, # DocField @@ -741,7 +743,7 @@ 'options': 'link:TDS Category', 'permlevel': 0, 'print_hide': 1, - 'search_index': 1, + 'search_index': 0, 'trigger': 'Client' }, @@ -760,6 +762,7 @@ 'options': 'Account', 'permlevel': 0, 'print_hide': 1, + 'search_index': 0, 'trigger': 'Client' }, @@ -790,7 +793,8 @@ 'oldfieldtype': 'Link', 'options': 'Account', 'permlevel': 0, - 'print_hide': 1 + 'print_hide': 1, + 'search_index': 0 }, # DocField diff --git a/accounts/doctype/journal_voucher_detail/journal_voucher_detail.txt b/accounts/doctype/journal_voucher_detail/journal_voucher_detail.txt index 39da0841f7..4a350c21f4 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 c330e8d508..c77db19dd2 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 e5bb1a274a..58508871e7 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 7b1b9fa5a8..3809d67608 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 583a97f260..ed67ba2f0b 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 0243d71bbe..1e05160261 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 bcad9cc31c..f2f9eafb20 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 6950ca921a..94a45837c1 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 94846cb3c7..a9326a0286 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 88ee39a70d..6f6022b243 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 abd4b0cdc0..8d0edfb10d 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/buying/doctype/indent/indent.txt b/buying/doctype/indent/indent.txt index 93767a8d20..cd6c91296c 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 c81b9cf4b2..c207266bbb 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 9e4d790c0d..71d78df1f3 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 5febdec44e..10890dc846 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 3995c92fdc..a7a08c3a07 100644 --- a/buying/doctype/supplier/supplier.txt +++ b/buying/doctype/supplier/supplier.txt @@ -250,7 +250,7 @@ 'options': 'Company', 'permlevel': 0, 'reqd': 1, - 'search_index': 1 + 'search_index': 0 }, # DocField diff --git a/hr/doctype/attendance/attendance.txt b/hr/doctype/attendance/attendance.txt index a52225e7a5..4f189b1cdc 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 21f4a9adf1..d57139bdf8 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 cbe281d837..49a494b99b 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 0f7812e87c..596d4b5c50 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 0b0c96c25d..b147a7fb02 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 11d01e6ba1..06b4170eb4 100644 --- a/hr/doctype/leave_application/leave_application.txt +++ b/hr/doctype/leave_application/leave_application.txt @@ -3,9 +3,9 @@ # These values are common in all dictionaries { - 'creation': '2011-02-17 13:25:56', + 'creation': '2011-02-10 14:10:08', 'docstatus': 0, - 'modified': '2011-07-08 13:28:15', + 'modified': '2011-07-11 12:48:49', 'modified_by': 'Administrator', 'owner': 'Administrator' }, @@ -54,28 +54,28 @@ # DocPerm { - 'amend': 0, - 'cancel': 0, + 'amend': 1, + 'cancel': 1, 'create': 1, 'doctype': 'DocPerm', 'idx': 1, + 'match': 'owner', 'permlevel': 0, - 'role': 'Employee', - 'submit': 0, + 'submit': 1, 'write': 1 }, # DocPerm { - 'amend': 1, - 'cancel': 1, - 'create': 1, + 'amend': 0, + 'cancel': 0, + 'create': 0, 'doctype': 'DocPerm', 'idx': 2, + 'match': 'owner', 'permlevel': 0, - 'role': 'HR User', - 'submit': 1, - 'write': 1 + 'submit': 0, + 'write': 0 }, # DocPerm @@ -86,6 +86,19 @@ 'doctype': 'DocPerm', 'idx': 3, 'permlevel': 0, + 'role': 'HR User', + 'submit': 1, + 'write': 1 + }, + + # DocPerm + { + 'amend': 1, + 'cancel': 1, + 'create': 1, + 'doctype': 'DocPerm', + 'idx': 4, + 'permlevel': 0, 'role': 'HR Manager', 'submit': 1, 'write': 1 @@ -93,28 +106,18 @@ # DocPerm { - 'amend': 0, - 'cancel': 0, - 'create': 0, 'doctype': 'DocPerm', - 'idx': 4, + 'idx': 5, 'permlevel': 1, - 'role': 'HR User', - 'submit': 0, - 'write': 0 + 'role': 'HR User' }, # DocPerm { - 'amend': 0, - 'cancel': 0, - 'create': 0, 'doctype': 'DocPerm', - 'idx': 5, + 'idx': 6, 'permlevel': 1, - 'role': 'HR Manager', - 'submit': 0, - 'write': 0 + 'role': 'HR Manager' }, # DocField @@ -149,7 +152,7 @@ 'in_filter': 1, 'label': 'Employee Name', 'permlevel': 1, - 'search_index': 1 + 'search_index': 0 }, # DocField @@ -201,7 +204,7 @@ 'options': 'link:Fiscal Year', 'permlevel': 0, 'reqd': 1, - 'search_index': 1 + 'search_index': 0 }, # DocField @@ -234,6 +237,7 @@ 'idx': 10, 'label': 'From Date', 'permlevel': 0, + 'search_index': 1, 'trigger': 'Client' }, @@ -246,6 +250,7 @@ 'idx': 11, 'label': 'To Date', 'permlevel': 0, + 'search_index': 1, 'trigger': 'Client' }, diff --git a/hr/doctype/salary_slip/salary_slip.txt b/hr/doctype/salary_slip/salary_slip.txt index d2ce4e3fb3..d50499a676 100644 --- a/hr/doctype/salary_slip/salary_slip.txt +++ b/hr/doctype/salary_slip/salary_slip.txt @@ -5,7 +5,7 @@ { 'creation': '2010-08-08 17:09:20', 'docstatus': 0, - 'modified': '2011-07-13 17:38:55', + 'modified': '2011-07-18 15:30:04', 'modified_by': 'Administrator', 'owner': 'Administrator' }, @@ -51,38 +51,72 @@ # DocPerm { - 'amend': 1, - 'cancel': 1, - 'create': 1, + 'amend': 0, + 'cancel': 0, + 'create': 0, 'doctype': 'DocPerm', - 'idx': 1, + 'match': 'owner', 'permlevel': 0, - 'role': 'System Manager', - 'submit': 1, - 'write': 1 + 'submit': 0, + 'write': 0 }, # DocPerm { 'amend': 0, 'cancel': 0, - 'create': 1, + 'create': 0, 'doctype': 'DocPerm', - 'idx': 2, + 'match': 'owner', 'permlevel': 0, - 'role': 'HR User', - 'submit': 1, - 'write': 1 + 'submit': 0, + 'write': 0 }, # DocPerm { 'amend': 0, 'cancel': 0, + 'create': 0, + 'doctype': 'DocPerm', + 'match': 'owner', + 'permlevel': 0, + 'submit': 0, + 'write': 0 + }, + + # DocPerm + { + 'amend': 0, + 'cancel': 0, + 'create': 0, + 'doctype': 'DocPerm', + 'match': 'owner', + 'permlevel': 0, + '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 @@ -90,28 +124,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 @@ -148,7 +172,7 @@ 'options': 'Employee', 'permlevel': 0, 'reqd': 1, - 'search_index': 0 + 'search_index': 1 }, # DocField @@ -178,7 +202,7 @@ 'options': 'Department', 'permlevel': 1, 'reqd': 0, - 'search_index': 1 + 'search_index': 0 }, # DocField @@ -193,7 +217,7 @@ 'oldfieldtype': 'Link', 'options': 'Designation', 'permlevel': 1, - 'search_index': 1 + 'search_index': 0 }, # DocField @@ -208,7 +232,7 @@ 'oldfieldtype': 'Link', 'options': 'Branch', 'permlevel': 1, - 'search_index': 1 + 'search_index': 0 }, # DocField @@ -223,7 +247,7 @@ 'oldfieldtype': 'Link', 'options': 'Grade', 'permlevel': 1, - 'search_index': 1 + 'search_index': 0 }, # DocField @@ -261,6 +285,28 @@ 'permlevel': 0 }, + # DocField + { + 'doctype': 'DocField', + 'fieldname': 'letter_head', + 'fieldtype': 'Link', + 'idx': 11, + 'label': 'Letter Head', + 'options': 'Letter Head', + 'permlevel': 0 + }, + + # DocField + { + 'doctype': 'DocField', + 'fieldname': 'letter_head', + 'fieldtype': 'Link', + 'idx': 11, + 'label': 'Letter Head', + 'options': 'Letter Head', + 'permlevel': 0 + }, + # DocField { 'doctype': 'DocField', @@ -285,7 +331,33 @@ 'options': 'Fiscal Year', 'permlevel': 0, 'reqd': 1, - 'search_index': 1 + 'search_index': 0 + }, + + # DocField + { + 'doctype': 'DocField', + 'fieldname': 'company', + 'fieldtype': 'Select', + 'idx': 14, + 'in_filter': 1, + 'label': 'Company', + 'options': 'link:Company', + 'permlevel': 0, + 'reqd': 1 + }, + + # DocField + { + 'doctype': 'DocField', + 'fieldname': 'company', + 'fieldtype': 'Select', + 'idx': 14, + 'in_filter': 1, + 'label': 'Company', + 'options': 'link:Company', + 'permlevel': 0, + 'reqd': 1 }, # DocField diff --git a/knowledge_base/doctype/question/question.txt b/knowledge_base/doctype/question/question.txt index 428d269fe9..187789ce6f 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 9daf4fb96b..53989f40b1 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 @@ -102,7 +105,7 @@ def create_proper_index(): 'File Group': ['parent_group'], 'Maintenance Visit Detail': ['item_code', 'service_person'], 'Support Ticket Response': [], - 'PV Detail': ['item_code', 'purchase_order', 'purchase_receipt', 'expense_head', 'cost_center'], + 'PV Detail': ['item_code', 'purchase_order', 'po_detail', 'purchase_receipt', 'pr_detail', 'expense_head', 'cost_center'], 'Timesheet Detail': ['project_name', 'task_id', 'customer_name'], 'Holiday List Detail': [], 'Workflow Rule Detail': [], @@ -125,7 +128,7 @@ def create_proper_index(): 'Declaration Detail': [], 'Holiday List': ['fiscal_year'], 'Sales Person': ['lft', 'rgt', 'parent_sales_person'], - 'RV Detail': ['item_code', 'sales_order', 'delivery_note', 'cost_center', 'income_account'], + 'RV Detail': ['item_code', 'sales_order', 'so_detail', 'delivery_note', 'dn_detail', 'cost_center', 'income_account'], 'Module Def Item': [], 'TDS Category': [], 'DocTrigger': [], @@ -264,29 +267,34 @@ 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") + 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") + 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") - 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") + 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") + except: + continue diff --git a/patches/patch.py b/patches/patch.py index ad7eb7d623..83e85acf9a 100644 --- a/patches/patch.py +++ b/patches/patch.py @@ -1,7 +1,7 @@ # REMEMBER to update this # ======================== -last_patch = 327 +last_patch = 328 #------------------------------------------- @@ -1301,3 +1301,6 @@ def execute(patch_no): elif patch_no == 327: 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 == 328: + from index_patch import create_proper_index + create_proper_index() diff --git a/production/doctype/bill_of_materials/bill_of_materials.txt b/production/doctype/bill_of_materials/bill_of_materials.txt index 4e788d7cdb..37d8b69491 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 873faec352..9bc7f9e32f 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 ab18e44acc..d36f26ba0a 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 4b8812b44e..73393005fb 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 61a34bdf76..482fae23ca 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 7df63971d4..c927edfae1 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 f8499ce4a7..646a97ee0a 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 b144246889..3d57e12b91 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 462b64bc28..839da19ad1 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 a96c14b9ff..0098228ff1 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 364b148faf..e53a243bfa 100644 --- a/selling/doctype/customer/customer.txt +++ b/selling/doctype/customer/customer.txt @@ -12,7 +12,7 @@ # These values are common for all DocType { - '_last_update': '1306834669', + '_last_update': '1309508837', 'allow_print': 0, 'allow_trash': 1, 'colour': 'White:FFF', @@ -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 c13ad46956..260e077bae 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 bd9275b93b..284b43642c 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 adfce208b1..8feb2f5991 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 7971cb52d2..3b4632c56f 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 a476c66577..23873236a5 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 e198b86086..6763c2df25 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 074443bd26..23c86fab4f 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 7091b3f382..4c1e2f721c 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 e89768c6ec..7e46d74af1 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 ef20f3621a..a4364956ae 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 a7498d6e05..15ba781a67 100644 --- a/setup/doctype/company/company.txt +++ b/setup/doctype/company/company.txt @@ -5,7 +5,7 @@ { 'creation': '2010-08-08 17:08:55', 'docstatus': 0, - 'modified': '2011-07-06 11:42:34', + 'modified': '2011-07-01 17:43:29', 'modified_by': 'Administrator', 'owner': 'Administrator' }, diff --git a/setup/doctype/naming_series_options/naming_series_options.txt b/setup/doctype/naming_series_options/naming_series_options.txt index f30686daaa..b964556fdc 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 b9908fc3b0..ac9c6c58b1 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 a61a9fb2dc..18b3abb5b4 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 0ffcd7422a..0680c3886f 100644 --- a/setup/doctype/sales_person/sales_person.txt +++ b/setup/doctype/sales_person/sales_person.txt @@ -156,7 +156,7 @@ 'oldfieldtype': 'Data', 'permlevel': 0, 'reqd': 1, - 'search_index': 1 + 'search_index': 0 }, # DocField @@ -281,7 +281,7 @@ 'oldfieldtype': 'Select', 'options': 'link:Country', 'permlevel': 0, - 'search_index': 1, + 'search_index': 0, 'trigger': 'Client' }, @@ -297,7 +297,7 @@ 'oldfieldtype': 'Select', 'options': 'link:State', 'permlevel': 0, - 'search_index': 1 + 'search_index': 0 }, # DocField @@ -324,7 +324,8 @@ 'oldfieldname': 'territory', 'oldfieldtype': 'Link', 'options': 'Territory', - 'permlevel': 0 + 'permlevel': 0, + 'search_index': 0 }, # DocField @@ -397,7 +398,8 @@ 'oldfieldname': 'distribution_id', 'oldfieldtype': 'Link', 'options': 'Budget Distribution', - 'permlevel': 0 + 'permlevel': 0, + 'search_index': 0 }, # DocField diff --git a/setup/doctype/term/term.txt b/setup/doctype/term/term.txt index f169780b4d..fe3bd7576d 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 0bf94f3029..a4de2d6f2d 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 d95a481be0..7c358265ad 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/stock/doctype/bin/bin.txt b/stock/doctype/bin/bin.txt index 2ecbcf0d3c..6a402972fd 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 0c1cc52c36..97280e9983 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 f5dd8bf951..78aea3267f 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 10fdfdaa4e..3924c13a8f 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 a20c9687ac..ec42ff4a58 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 78efae544c..57c73703f4 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 e405274e5e..71374f870c 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 706af56586..d09285db92 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 9759630292..31f6cd6005 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 d030b9e4b7..a8e0d47060 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 078fadc75d..1774b08d3a 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 8863eb2d34..b97458aec3 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 31d2f1a47e..3b104e7b40 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 dd250ee7bd..9aa6119ffc 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 951986fea3..d7477c223b 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 b4fca09638..1d2408bf88 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 603f095aa3..823837a160 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.txt b/stock/doctype/stock_reconciliation/stock_reconciliation.txt index 1080a27e05..771068ddd1 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 3d69b07e5f..1363eef701 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 93c274f1fe..122f92df4d 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 ff5d211675..4d4e26ad20 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 3881aa3cc3..a053cf93b1 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 01cf7f093e..edd8091f95 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 2485f57b41..76cf56f242 100644 --- a/support/doctype/maintenance_visit/maintenance_visit.txt +++ b/support/doctype/maintenance_visit/maintenance_visit.txt @@ -241,7 +241,7 @@ 'permlevel': 0, 'print_hide': 1, 'reqd': 1, - 'search_index': 1 + 'search_index': 0 }, # DocField @@ -258,7 +258,7 @@ 'permlevel': 0, 'print_hide': 1, 'reqd': 1, - 'search_index': 1 + 'search_index': 0 }, # DocField @@ -410,7 +410,7 @@ 'options': '\nScheduled\nUnscheduled\nBreakdown', 'permlevel': 0, 'reqd': 1, - 'search_index': 1 + 'search_index': 0 }, # DocField diff --git a/support/doctype/support_ticket/support_ticket.txt b/support/doctype/support_ticket/support_ticket.txt index caeb801f9a..e1556ba011 100644 --- a/support/doctype/support_ticket/support_ticket.txt +++ b/support/doctype/support_ticket/support_ticket.txt @@ -264,7 +264,7 @@ 'oldfieldtype': 'Data', 'permlevel': 2, 'reqd': 0, - 'search_index': 1 + 'search_index': 0 }, # DocField @@ -391,7 +391,7 @@ 'oldfieldname': 'resolution_date', 'oldfieldtype': 'Date', 'permlevel': 1, - 'search_index': 1 + 'search_index': 0 }, # DocField diff --git a/utilities/doctype/address/address.txt b/utilities/doctype/address/address.txt index e7ff8cce1e..4f44806cf5 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/gl_mapper_detail/gl_mapper_detail.txt b/utilities/doctype/gl_mapper_detail/gl_mapper_detail.txt index 404e8fcb47..bf77e7c84f 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 From 23760e755d90750dfea2fa44dd212242a7150605 Mon Sep 17 00:00:00 2001 From: nabinhait Date: Wed, 20 Jul 2011 10:46:21 +0530 Subject: [PATCH 03/11] export_to_files function removed from index_patch, it was only for local --- patches/index_patch.py | 5 ----- selling/doctype/customer/customer.txt | 4 ++-- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/patches/index_patch.py b/patches/index_patch.py index 53989f40b1..415b534e54 100644 --- a/patches/index_patch.py +++ b/patches/index_patch.py @@ -291,10 +291,5 @@ def create_proper_index(): 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") except: continue diff --git a/selling/doctype/customer/customer.txt b/selling/doctype/customer/customer.txt index e53a243bfa..24271ee688 100644 --- a/selling/doctype/customer/customer.txt +++ b/selling/doctype/customer/customer.txt @@ -5,7 +5,7 @@ { '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' }, @@ -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 From de9826cba15dd8c8f0988ec7df5aa98baae0dddc Mon Sep 17 00:00:00 2001 From: nabinhait Date: Wed, 20 Jul 2011 18:02:59 +0530 Subject: [PATCH 04/11] Reload Rename and Bulk Rename Tool and link in setup module --- patches/index_patch.py | 2 +- patches/patch.py | 5 ++++- setup/page/setup/setup.js | 1 + 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/patches/index_patch.py b/patches/index_patch.py index 415b534e54..3ef8ec367a 100644 --- a/patches/index_patch.py +++ b/patches/index_patch.py @@ -267,7 +267,7 @@ def create_proper_index(): 'Print Heading': [], 'TDS Rate Detail': ['category'] } - sql("commit") + #sql("commit") # only required if run from login exist_dt = [cstr(d[0]) for d in sql("select name from `tabDocType`")] for dt in [d for d in dt_index_fields.keys() if d in exist_dt]: diff --git a/patches/patch.py b/patches/patch.py index 83e85acf9a..18272fced5 100644 --- a/patches/patch.py +++ b/patches/patch.py @@ -1,7 +1,7 @@ # REMEMBER to update this # ======================== -last_patch = 328 +last_patch = 329 #------------------------------------------- @@ -1304,3 +1304,6 @@ def execute(patch_no): elif patch_no == 328: from index_patch import create_proper_index create_proper_index() + elif patch_no == 329: + reload_doc('utilities', 'doctype', 'rename_tool') + reload_doc('utilities', 'doctype', 'bulk_rename_tool') diff --git a/setup/page/setup/setup.js b/setup/page/setup/setup.js index c0ba3d4dc0..b29e7ad9e0 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']]}; From 391aa028e6316f006217b8eae253a1c7576ea721 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Mon, 25 Jul 2011 14:07:50 +0530 Subject: [PATCH 05/11] cleanups to support email (dirty) --- favicon.ico | Bin 0 -> 1406 bytes patches/patch.py | 23 +++ .../doctype/email_settings/email_settings.py | 67 ++++---- .../doctype/email_settings/email_settings.txt | 115 ++++++++++++-- .../support_email_settings/__init__.py | 0 .../support_email_settings.py | 18 --- .../support_email_settings.txt | 144 ------------------ support/doctype/support_ticket/__init__.py | 51 ++++++- .../doctype/support_ticket/support_ticket.js | 4 +- .../doctype/support_ticket/support_ticket.py | 4 +- .../doctype/support_ticket/support_ticket.txt | 2 +- 11 files changed, 207 insertions(+), 221 deletions(-) create mode 100644 favicon.ico delete mode 100644 setup/doctype/support_email_settings/__init__.py delete mode 100644 setup/doctype/support_email_settings/support_email_settings.py delete mode 100644 setup/doctype/support_email_settings/support_email_settings.txt diff --git a/favicon.ico b/favicon.ico new file mode 100644 index 0000000000000000000000000000000000000000..8b2106b847e3a8bba936389cf3249605270ea5e5 GIT binary patch literal 1406 zcmeH{u};G<5QcvP39(z(NeC<~VJl4Z1(l9hIx;cjEZg_p{g!<<7!Wk#7~c8;utQ#(CWmsG0uim=DfeH#a}GDRZ#X`m zVen;f@c4qgVgh&HL+9iJb~?n-_za!yJKV!5hEEoG@r;2T;c!34ZZXB>>o+bwuVF`5 zaCbe@_m}t7UfqGZ1OK)IX4QZwYlNW=^hN?0gDlL*w2rmb#8HEY{*!gWATfq;tE?`e zi07(Uk{IK~i--=Gt2DrQrIsuubF&Jx modified") + def get_support_mails(): """ @@ -63,8 +105,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 2c1e77faed..914227b222 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 75defbeb34..c71304a0f7 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 caeb801f9a..211f51240e 100644 --- a/support/doctype/support_ticket/support_ticket.txt +++ b/support/doctype/support_ticket/support_ticket.txt @@ -24,7 +24,7 @@ 'server_code_error': ' ', 'show_in_menu': 0, 'subject': '%(subject)s', - 'tag_fields': 'status,allocated_to', + 'tag_fields': 'status', 'version': 150 }, From b7186d46d2d2c53861e6fdb0c09107517a271610 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Mon, 25 Jul 2011 14:37:48 +0530 Subject: [PATCH 06/11] support ticket patch --- patches/patch.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/patches/patch.py b/patches/patch.py index ade080503e..4d4fb5139a 100644 --- a/patches/patch.py +++ b/patches/patch.py @@ -1,7 +1,7 @@ # REMEMBER to update this # ======================== -last_patch = 326 +last_patch = 327 #------------------------------------------- @@ -1308,6 +1308,7 @@ def execute(patch_no): 'support_host':'host', 'support_username': 'username', 'support_password': 'password', + 'support_use_ssl': 'use_ssl', 'sync_support_mails': 'integrate_incoming', 'signature': 'support_signature' } @@ -1320,4 +1321,4 @@ def execute(patch_no): from webnotes.model import delete_doc delete_doc('DocType', 'Support Email Settings') - # delete description field \ No newline at end of file + reload_doc('support','doctype','support_ticket') \ No newline at end of file From 933893f20aacf68175de3e7871252ba86c78c6b9 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Mon, 25 Jul 2011 14:42:35 +0530 Subject: [PATCH 07/11] support ticket patch --- patches/patch.py | 1 - 1 file changed, 1 deletion(-) diff --git a/patches/patch.py b/patches/patch.py index 4d4fb5139a..e3d2f98d90 100644 --- a/patches/patch.py +++ b/patches/patch.py @@ -7,7 +7,6 @@ last_patch = 327 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 From 9b8fad2baa921c81e5c063e9c98b4d041592693c Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Mon, 25 Jul 2011 14:45:42 +0530 Subject: [PATCH 08/11] support ticket patch --- patches/patch.py | 3 +- .../doctype/support_ticket/support_ticket.txt | 67 +++++++------------ 2 files changed, 28 insertions(+), 42 deletions(-) diff --git a/patches/patch.py b/patches/patch.py index e3d2f98d90..47f39bf21d 100644 --- a/patches/patch.py +++ b/patches/patch.py @@ -1320,4 +1320,5 @@ def execute(patch_no): from webnotes.model import delete_doc delete_doc('DocType', 'Support Email Settings') - reload_doc('support','doctype','support_ticket') \ No newline at end of file + reload_doc('support','doctype','support_ticket') + sql("delete from tabDocField where fieldname='problem_description' and parent='Support Ticket'") \ No newline at end of file diff --git a/support/doctype/support_ticket/support_ticket.txt b/support/doctype/support_ticket/support_ticket.txt index 211f51240e..1b11a72422 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', @@ -24,8 +24,8 @@ 'server_code_error': ' ', 'show_in_menu': 0, 'subject': '%(subject)s', - 'tag_fields': 'status', - 'version': 150 + 'tag_fields': 'status,allocated_to', + '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,7 +244,7 @@ 'doctype': 'DocField', 'fieldname': 'customer_name', 'fieldtype': 'Data', - 'idx': 12, + 'idx': 11, 'in_filter': 1, 'label': 'Customer Name', 'oldfieldname': 'customer_name', @@ -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,12 +365,11 @@ # 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, @@ -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 } From a8ac7ae64666614ef1ca7bc10b733515a600038f Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Mon, 25 Jul 2011 14:49:21 +0530 Subject: [PATCH 09/11] support ticket fixes --- support/doctype/support_ticket/__init__.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/support/doctype/support_ticket/__init__.py b/support/doctype/support_ticket/__init__.py index d9c50652b1..4ffba4ea01 100644 --- a/support/doctype/support_ticket/__init__.py +++ b/support/doctype/support_ticket/__init__.py @@ -84,7 +84,10 @@ 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], \ From e7eacb7c415a765a28bbbc7eb479f03de07c44e3 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Mon, 25 Jul 2011 14:51:30 +0530 Subject: [PATCH 10/11] support ticket fixes --- support/doctype/support_ticket/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/support/doctype/support_ticket/__init__.py b/support/doctype/support_ticket/__init__.py index 4ffba4ea01..936233db7c 100644 --- a/support/doctype/support_ticket/__init__.py +++ b/support/doctype/support_ticket/__init__.py @@ -93,7 +93,7 @@ We will get back to you as soon as possible recipients = [d.raised_by], \ sender = self.email_settings.support_email, \ subject = '['+d.name+'] ' + d.subject, \ - msg= autoresponse) + msg = response) def auto_close_tickets(self): """ From a1c232ac16c88e66f412c66872838510669148f5 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Mon, 25 Jul 2011 15:08:11 +0530 Subject: [PATCH 11/11] fixes to support ticket --- .../doctype/email_settings/email_settings.py | 7 +- .../doctype/email_settings/email_settings.txt | 77 ++++++++++++++----- 2 files changed, 63 insertions(+), 21 deletions(-) diff --git a/setup/doctype/email_settings/email_settings.py b/setup/doctype/email_settings/email_settings.py index b19e4e2911..37de7bcb18 100644 --- a/setup/doctype/email_settings/email_settings.py +++ b/setup/doctype/email_settings/email_settings.py @@ -1,6 +1,7 @@ import webnotes sql = webnotes.conn.sql +from webnotes.utils import cint, cstr class DocType: def __init__(self,doc,doclist): @@ -26,10 +27,14 @@ class DocType: Sets or cancels the event in the scheduler """ # update control panel - map(self.set_cp_value, 'outgoing_mail_server', 'mail_login', 'mail_password', 'auto_email_id', 'mail_port', 'use_ssl') + 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: diff --git a/setup/doctype/email_settings/email_settings.txt b/setup/doctype/email_settings/email_settings.txt index 1b50694bf2..ef6efe609f 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-07-25 11:07:14', + 'modified': '2011-07-25 15:03:51', 'modified_by': 'Administrator', 'owner': 'harshada@webnotestech.com' }, # These values are common for all DocType { - '_last_update': '1300962303', + '_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': 30 + 'version': 34 }, # These values are common for all DocField @@ -77,12 +77,21 @@ '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': 2, + 'idx': 3, 'label': 'Outgoing Mail Server' }, @@ -91,7 +100,7 @@ 'doctype': 'DocField', 'fieldname': 'mail_port', 'fieldtype': 'Data', - 'idx': 3, + 'idx': 4, 'label': 'Mail Port' }, @@ -100,7 +109,7 @@ 'doctype': 'DocField', 'fieldname': 'use_ssl', 'fieldtype': 'Check', - 'idx': 4, + 'idx': 5, 'label': 'Use SSL' }, @@ -109,7 +118,7 @@ 'doctype': 'DocField', 'fieldname': 'mail_login', 'fieldtype': 'Data', - 'idx': 5, + 'idx': 6, 'label': 'Login Id' }, @@ -118,7 +127,7 @@ 'doctype': 'DocField', 'fieldname': 'mail_password', 'fieldtype': 'Password', - 'idx': 6, + 'idx': 7, 'label': 'Mail Password' }, @@ -127,43 +136,67 @@ 'doctype': 'DocField', 'fieldname': 'auto_email_id', 'fieldtype': 'Data', - 'idx': 7, + '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': 8, + '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': 9, + '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': 10, + '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': 11, - 'label': 'Mail Server' + 'idx': 14, + 'label': 'POP3 Mail Server' }, # DocField @@ -171,7 +204,7 @@ 'doctype': 'DocField', 'fieldname': 'support_use_ssl', 'fieldtype': 'Check', - 'idx': 12, + 'idx': 15, 'label': 'Use SSL' }, @@ -180,7 +213,7 @@ 'doctype': 'DocField', 'fieldname': 'support_username', 'fieldtype': 'Data', - 'idx': 13, + 'idx': 16, 'label': 'User Name' }, @@ -189,7 +222,7 @@ 'doctype': 'DocField', 'fieldname': 'support_password', 'fieldtype': 'Password', - 'idx': 14, + 'idx': 17, 'label': 'Support Password' }, @@ -197,24 +230,28 @@ { 'doctype': 'DocField', 'fieldtype': 'Column Break', - 'idx': 15 + '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': 16, + 'idx': 19, 'label': 'Signature' }, # DocField { + 'colour': 'White:FFF', + 'description': 'Autoreply when a new mail is received', 'doctype': 'DocField', 'fieldname': 'support_autoreply', 'fieldtype': 'Text', - 'idx': 17, + 'idx': 20, 'label': 'Autoreply' } ] \ No newline at end of file