Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #8 from nabinhait/master

Browse Source 
Major changes:.txt file updated based on proper index
This commit is contained in:
Rushabh Mehta 2011-07-26 04:00:06 -07:00
commit a01ca6e732
94 changed files with 674 additions and 575 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
accounts/doctype/account/account.txt
View File

@ -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

2
accounts/doctype/account_balance/account_balance.txt
View File

@ -174,7 +174,7 @@
'oldfieldname': 'fiscal_year',
'oldfieldtype': 'Link',
'options': 'Fiscal Year',
'search_index': 1
'search_index': 0
},
# DocField

4
accounts/doctype/cost_center/cost_center.txt
View File

@ -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

2
accounts/doctype/fiscal_year/fiscal_year.txt
View File

@ -182,7 +182,7 @@
'oldfieldtype': 'Link',
'options': 'Company',
'permlevel': 0,
'search_index': 1
'search_index': 0
},
# DocField

14
accounts/doctype/gl_entry/gl_entry.txt
View File

@ -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
}
]

26
accounts/doctype/journal_voucher/journal_voucher.txt
View File

@ -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

2
accounts/doctype/journal_voucher_detail/journal_voucher_detail.txt
View File

@ -69,7 +69,7 @@
'oldfieldtype': 'Link',
'options': 'Cost Center',
'permlevel': 0,
'search_index': 1,
'search_index': 0,
'width': '180px'
},

19
accounts/doctype/payable_voucher/payable_voucher.txt
View File

@ -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

3
accounts/doctype/period_closing_voucher/period_closing_voucher.txt
View File

@ -147,7 +147,8 @@
'oldfieldtype': 'Select',
'options': 'link:Fiscal Year',
'permlevel': 0,
'reqd': 1
'reqd': 1,
'search_index': 1
},
# DocField

24
accounts/doctype/pos_setting/pos_setting.txt
View File

@ -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

1
accounts/doctype/purchase_tax_detail/purchase_tax_detail.txt
View File

@ -151,6 +151,7 @@
'oldfieldtype': 'Link',
'options': 'Cost Center',
'permlevel': 0,
'search_index': 0,
'trigger': 'Client'
},

2
accounts/doctype/pv_detail/pv_detail.txt
View File

@ -111,7 +111,7 @@
'options': 'Item Group',
'permlevel': 1,
'print_hide': 1,
'search_index': 1
'search_index': 0
},
# DocField

16
accounts/doctype/receivable_voucher/receivable_voucher.txt
View File

@ -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

2
accounts/doctype/rv_detail/rv_detail.txt
View File

@ -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'
},

3
accounts/doctype/rv_tax_detail/rv_tax_detail.txt
View File

@ -80,7 +80,8 @@
'oldfieldname': 'cost_center_other_charges',
'oldfieldtype': 'Link',
'options': 'Cost Center',
'permlevel': 0
'permlevel': 0,
'search_index': 0
},
# DocField

2
accounts/doctype/tds_category_account/tds_category_account.txt
View File

@ -51,7 +51,7 @@
'label': 'Company',
'oldfieldname': 'company',
'options': 'Company',
'search_index': 1
'search_index': 0
},
# DocField

4
accounts/doctype/tds_payment/tds_payment.txt
View File

@ -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'
},

37
accounts/search_criteria/accounts_payable/accounts_payable.py
View File

@ -66,32 +66,43 @@ if len(res) > 600 and from_export == 0:
# 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)
outstanding_amt, booking_amt, due_date, bill_no, bill_date, cond = 0,0, '','','', ''
# 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':
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]]
# 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
cond = " and against_voucher = '%s' and against_voucher is not null" % r[col_idx['Against Voucher']]
r += pv_dict.get(r[col_idx['Voucher No']], ['', '', ''])
cond = " and ifnull(against_voucher, '') = '%s'" % r[col_idx['Against Voucher']]
# 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)):
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 cond:
@ -104,7 +115,7 @@ for r in res:
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]
r += [booking_amt, outstanding_amt]
# split into date ranges
val_l1 = val_l2 = val_l3 = val_l4 = val_l5_above= 0

2
accounts/search_criteria/accounts_payable/accounts_payable.sql
View File

@ -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'

8
buying/doctype/indent/indent.txt
View File

@ -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

6
buying/doctype/indent_detail/indent_detail.txt
View File

@ -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'
},

10
buying/doctype/po_detail/po_detail.txt
View File

@ -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

8
buying/doctype/qa_inspection_report/qa_inspection_report.txt
View File

@ -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

49
buying/doctype/supplier/supplier.txt
View File

@ -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': '<em>Addresses will appear only when you save the supplier</em>',
'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': '<em>Contact Details will appear only when you save the supplier</em>',
'permlevel': 0
@ -233,7 +220,7 @@
{
'doctype': 'DocField',
'fieldtype': 'HTML',
'idx': 12,
'idx': 11,
'label': 'Contact HTML',
'permlevel': 1
},
@ -242,7 +229,7 @@
{
'doctype': 'DocField',
'fieldtype': 'Section Break',
'idx': 13,
'idx': 12,
'label': 'More Info',
'oldfieldtype': 'Section Break',
'permlevel': 0
@ -255,7 +242,7 @@
'doctype': 'DocField',
'fieldname': 'company',
'fieldtype': 'Link',
'idx': 14,
'idx': 13,
'in_filter': 1,
'label': 'Company',
'oldfieldname': 'company',
@ -263,7 +250,7 @@
'options': 'Company',
'permlevel': 0,
'reqd': 1,
'search_index': 1
'search_index': 0
},
# DocField
@ -273,7 +260,7 @@
'doctype': 'DocField',
'fieldname': 'supplier_details',
'fieldtype': 'Text',
'idx': 15,
'idx': 14,
'label': 'Supplier Details',
'oldfieldname': 'supplier_details',
'oldfieldtype': 'Code',
@ -284,7 +271,7 @@
{
'doctype': 'DocField',
'fieldtype': 'Column Break',
'idx': 16,
'idx': 15,
'permlevel': 0,
'width': '50%'
},
@ -294,7 +281,7 @@
'doctype': 'DocField',
'fieldname': 'credit_days',
'fieldtype': 'Int',
'idx': 17,
'idx': 16,
'label': 'Credit Days',
'permlevel': 0
},
@ -304,7 +291,7 @@
'doctype': 'DocField',
'fieldname': 'website',
'fieldtype': 'Data',
'idx': 18,
'idx': 17,
'label': 'Website',
'oldfieldname': 'website',
'oldfieldtype': 'Data',
@ -317,7 +304,7 @@
'depends_on': 'eval:!doc.__islocal',
'doctype': 'DocField',
'fieldtype': 'Section Break',
'idx': 19,
'idx': 18,
'label': 'Transaction History',
'oldfieldtype': 'Section Break',
'permlevel': 0
@ -329,7 +316,7 @@
'depends_on': 'eval:!doc.__islocal',
'doctype': 'DocField',
'fieldtype': 'HTML',
'idx': 20,
'idx': 19,
'label': 'History HTML',
'oldfieldtype': 'HTML',
'permlevel': 0
@ -340,7 +327,7 @@
'doctype': 'DocField',
'fieldname': 'trash_reason',
'fieldtype': 'Small Text',
'idx': 21,
'idx': 20,
'label': 'Trash Reason',
'oldfieldname': 'trash_reason',
'oldfieldtype': 'Small Text',

4
hr/doctype/attendance/attendance.txt
View File

@ -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

2
hr/doctype/educational_qualifications/educational_qualifications.txt
View File

@ -75,7 +75,7 @@
'oldfieldtype': 'Select',
'options': '\nGraduate\nPost Graduate\nUnder Graduate',
'reqd': 0,
'search_index': 1
'search_index': 0
},
# DocField

8
hr/doctype/employee/employee.txt
View File

@ -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

2
hr/doctype/expense_voucher/expense_voucher.txt
View File

@ -189,7 +189,7 @@
'oldfieldname': 'employee_name',
'oldfieldtype': 'Data',
'permlevel': 1,
'search_index': 1,
'search_index': 0,
'width': '150px'
},

2
hr/doctype/leave_allocation/leave_allocation.txt
View File

@ -136,7 +136,7 @@
'in_filter': 1,
'label': 'Employee Name',
'permlevel': 1,
'search_index': 1
'search_index': 0
},
# DocField

61
hr/doctype/leave_application/leave_application.txt
View File

@ -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'
},

138
hr/doctype/salary_slip/salary_slip.txt
View File

@ -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

9
knowledge_base/doctype/question/question.txt
View File

@ -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

15
patches/index_patch.py
View File

@ -2,6 +2,9 @@
This patch removes wrong indexs and add proper indexes in tables
"""
import webnotes
sql = webnotes.conn.sql
from webnotes.utils import cint, cstr
def create_proper_index():
from webnotes.modules.export_module import export_to_files
@ -264,8 +267,11 @@ def create_proper_index():
'Print Heading': [],
'TDS Rate Detail': ['category']
}
#sql("commit") # only required if run from login
exist_dt = [cstr(d[0]) for d in sql("select name from `tabDocType`")]
for dt in dt_index_fields.keys():
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)
proper_index = dt_index_fields[dt]
@ -285,8 +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

11
patches/patch.py
View File

@ -1,7 +1,7 @@
# REMEMBER to update this
# ========================
last_patch = 327
last_patch = 330
#-------------------------------------------
@ -1322,3 +1322,12 @@ def execute(patch_no):
reload_doc('support','doctype','support_ticket')
sql("delete from tabDocField where fieldname='problem_description' and parent='Support Ticket'")
elif patch_no == 328:
if webnotes.conn.get_value('Control Panel', None, 'account_id') != 'axjanak2011':
sql("delete from `tabDocField` where fieldname = 'supplier_status' and parent = 'Supplier'")
elif patch_no == 329:
from index_patch import create_proper_index
create_proper_index()
elif patch_no == 330:
reload_doc('utilities', 'doctype', 'rename_tool')
reload_doc('utilities', 'doctype', 'bulk_rename_tool')

1
production/doctype/bill_of_materials/bill_of_materials.txt
View File

@ -12,6 +12,7 @@
# These values are common for all DocType
{
'_last_update': '1309508837',
'allow_attach': 0,
'allow_copy': 0,
'allow_email': 0,

1
production/doctype/bom_operation/bom_operation.txt
View File

@ -114,6 +114,7 @@
'options': 'Workstation',
'permlevel': 0,
'reqd': 1,
'search_index': 0,
'trigger': 'Client'
},

3
production/doctype/bom_replace_utility_detail/bom_replace_utility_detail.txt
View File

@ -99,6 +99,7 @@
'oldfieldname': 'bom_created',
'oldfieldtype': 'Link',
'options': 'Bill Of Materials',
'permlevel': 1
'permlevel': 1,
'search_index': 0
}
]

3
production/doctype/flat_bom_detail/flat_bom_detail.txt
View File

@ -162,7 +162,8 @@
'label': 'Stock UOM',
'oldfieldname': 'stock_uom',
'oldfieldtype': 'Link',
'options': 'UOM'
'options': 'UOM',
'search_index': 0
},
# DocField

3
production/doctype/pp_detail/pp_detail.txt
View File

@ -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'
},

10
production/doctype/production_order/production_order.txt
View File

@ -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

6
production/doctype/update_delivery_date_detail/update_delivery_date_detail.txt
View File

@ -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

11
projects/doctype/project/project.txt
View File

@ -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

3
projects/doctype/timesheet/timesheet.txt
View File

@ -145,7 +145,8 @@
'oldfieldtype': 'Link',
'options': 'Profile',
'permlevel': 0,
'reqd': 1
'reqd': 1,
'search_index': 0
},
# DocField

1
projects/doctype/timesheet_detail/timesheet_detail.txt
View File

@ -75,6 +75,7 @@
'options': 'Activity Type',
'permlevel': 0,
'reqd': 1,
'search_index': 0,
'width': '200px'
},

10
selling/doctype/customer/customer.txt
View File

@ -5,14 +5,14 @@
{
'creation': '2010-08-08 17:08:56',
'docstatus': 0,
'modified': '2011-05-26 17:31:31',
'modified': '2011-07-20 10:42:05',
'modified_by': 'Administrator',
'owner': 'Administrator'
},
# These values are common for all DocType
{
'_last_update': '1306834669',
'_last_update': '1309508837',
'allow_print': 0,
'allow_trash': 1,
'colour': 'White:FFF',
@ -26,7 +26,7 @@
'show_in_menu': 0,
'subject': "eval:'%(customer_name)s'=='%(name)s' ? ' ' : '%(customer_name)s'",
'tag_fields': 'customer_group,customer_type',
'version': 431
'version': 433
},
# These values are common for all DocField
@ -176,7 +176,7 @@
'idx': 4,
'label': 'Series',
'no_copy': 1,
'options': '\nCUST\nCUSTMUM',
'options': '\nCUST\nCUSTMUM\nCUSTOM',
'permlevel': 0,
'print_hide': 0
},
@ -340,7 +340,7 @@
'options': 'Company',
'permlevel': 0,
'reqd': 1,
'search_index': 1
'search_index': 0
},
# DocField

12
selling/doctype/enquiry/enquiry.txt
View File

@ -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

9
selling/doctype/enquiry_detail/enquiry_detail.txt
View File

@ -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
}
]

9
selling/doctype/installation_note/installation_note.txt
View File

@ -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'
},

2
selling/doctype/installed_item_details/installed_item_details.txt
View File

@ -140,7 +140,7 @@
'oldfieldtype': 'Data',
'permlevel': 1,
'print_hide': 1,
'search_index': 1,
'search_index': 0,
'width': '150px'
},

10
selling/doctype/lead/lead.txt
View File

@ -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

14
selling/doctype/quotation/quotation.txt
View File

@ -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

6
selling/doctype/quotation_detail/quotation_detail.txt
View File

@ -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'
},

3
selling/doctype/return_detail/return_detail.txt
View File

@ -75,7 +75,8 @@
'oldfieldname': 'uom',
'oldfieldtype': 'Link',
'options': 'UOM',
'permlevel': 1
'permlevel': 1,
'search_index': 0
},
# DocField

4
selling/doctype/sales_order_detail/sales_order_detail.txt
View File

@ -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

9
setup/doctype/authorization_rule/authorization_rule.txt
View File

@ -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

2
setup/doctype/company/company.txt
View File

@ -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'
},

3
setup/doctype/naming_series_options/naming_series_options.txt
View File

@ -66,7 +66,8 @@
'idx': 1,
'label': 'Doc Type',
'oldfieldname': 'doc_type',
'oldfieldtype': 'Data'
'oldfieldtype': 'Data',
'search_index': 1
},
# DocField

4
setup/doctype/other_charges/other_charges.txt
View File

@ -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

2
setup/doctype/sales_partner/sales_partner.txt
View File

@ -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

12
setup/doctype/sales_person/sales_person.txt
View File

@ -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

2
setup/doctype/term/term.txt
View File

@ -155,7 +155,7 @@
'oldfieldtype': 'Data',
'permlevel': 0,
'reqd': 1,
'search_index': 1
'search_index': 0
},
# DocField

5
setup/doctype/territory/territory.txt
View File

@ -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

2
setup/doctype/workflow_rule/workflow_rule.txt
View File

@ -106,7 +106,7 @@
'oldfieldtype': 'Select',
'options': '\nActive\nInactive',
'reqd': 1,
'search_index': 1
'search_index': 0
},
# DocField

1
setup/page/setup/setup.js
View File

@ -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']]};

12
stock/doctype/bin/bin.txt
View File

@ -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

16
stock/doctype/delivery_note/delivery_note.txt
View File

@ -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'
},

11
stock/doctype/delivery_note_detail/delivery_note_detail.txt
View File

@ -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'
},

3
stock/doctype/delivery_note_packing_detail/delivery_note_packing_detail.txt
View File

@ -178,7 +178,8 @@
'oldfieldname': 'uom',
'oldfieldtype': 'Link',
'options': 'UOM',
'permlevel': 1
'permlevel': 1,
'search_index': 0
},
# DocField

39
stock/doctype/item/item.txt
View File

@ -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',

3
stock/doctype/landed_cost_detail/landed_cost_detail.txt
View File

@ -49,7 +49,8 @@
'label': 'Account Head',
'oldfieldname': 'account_head',
'oldfieldtype': 'Link',
'options': 'Account'
'options': 'Account',
'search_index': 1
},
# DocField

1
stock/doctype/landed_cost_master/landed_cost_master.txt
View File

@ -12,6 +12,7 @@
# These values are common for all DocType
{
'_last_update': '1309508838',
'autoname': 'field:title',
'colour': 'White:FFF',
'doctype': 'DocType',

3
stock/doctype/lc_pr_detail/lc_pr_detail.txt
View File

@ -48,7 +48,8 @@
'label': 'Purchase Receipt No',
'oldfieldname': 'purchase_receipt_no',
'oldfieldtype': 'Link',
'options': 'Purchase Receipt'
'options': 'Purchase Receipt',
'search_index': 1
},
# DocField

8
stock/doctype/purchase_receipt/purchase_receipt.txt
View File

@ -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'
},

13
stock/doctype/purchase_receipt_detail/purchase_receipt_detail.txt
View File

@ -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'
},

12
stock/doctype/ref_rate_detail/ref_rate_detail.txt
View File

@ -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
}
]

3
stock/doctype/sales_bom/sales_bom.txt
View File

@ -268,6 +268,7 @@
'oldfieldname': 'stock_uom',
'oldfieldtype': 'Link',
'options': 'UOM',
'permlevel': 0
'permlevel': 0,
'search_index': 0
}
]

3
stock/doctype/sales_bom_detail/sales_bom_detail.txt
View File

@ -114,6 +114,7 @@
'oldfieldname': 'uom',
'oldfieldtype': 'Link',
'options': 'UOM',
'permlevel': 1
'permlevel': 1,
'search_index': 0
}
]

8
stock/doctype/serial_no/serial_no.txt
View File

@ -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

148
stock/doctype/stock_entry/stock_entry.txt
View File

@ -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': "<div class='columnHeading'>Warehouse</div>",
'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
}
]

4
stock/doctype/stock_entry_detail/stock_entry_detail.txt
View File

@ -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'
},

20
stock/doctype/stock_ledger_entry/stock_ledger_entry.txt
View File

@ -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'
}
]

2
stock/doctype/stock_reconciliation/stock_reconciliation.py
View File

@ -118,7 +118,7 @@ class DocType:
# ------------------
def get_current_stock(self, item_code, warehouse):
bin = sql("select name from `tabBin` where item_code = '%s' and warehouse = '%s'" % (item_code, warehouse))
prev_sle = bin and get_obj('Bin', bin[0][0]).get_prev_sle(self.doc.reconciliation_date,self.doc.reconciliation_time) or 0
prev_sle = bin and get_obj('Bin', bin[0][0]).get_prev_sle(self.doc.reconciliation_date,self.doc.reconciliation_time) or {}
stock_uom = sql("select stock_uom from `tabItem` where name = %s",item_code)
return {'actual_qty': prev_sle.get('bin_aqat', 0), 'stock_uom': stock_uom[0][0]}

9
stock/doctype/stock_reconciliation/stock_reconciliation.txt
View File

@ -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

2
stock/doctype/warehouse/warehouse.txt
View File

@ -244,7 +244,7 @@
'oldfieldtype': 'Link',
'options': 'Company',
'permlevel': 0,
'search_index': 1
'search_index': 0
},
# DocField

16
support/doctype/customer_issue/customer_issue.txt
View File

@ -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

2
support/doctype/item_maintenance_detail/item_maintenance_detail.txt
View File

@ -150,7 +150,7 @@
'options': 'Sales Person',
'permlevel': 0,
'reqd': 1,
'search_index': 1
'search_index': 0
},
# DocField

8
support/doctype/maintenance_schedule/maintenance_schedule.txt
View File

@ -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

2
support/doctype/maintenance_schedule_detail/maintenance_schedule_detail.txt
View File

@ -112,7 +112,7 @@
'options': 'Sales Person',
'permlevel': 0,
'reqd': 1,
'search_index': 1
'search_index': 0
},
# DocField

6
support/doctype/maintenance_visit/maintenance_visit.txt
View File

@ -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

4
support/doctype/support_ticket/support_ticket.txt
View File

@ -251,7 +251,7 @@
'oldfieldtype': 'Data',
'permlevel': 2,
'reqd': 0,
'search_index': 1
'search_index': 0
},
# DocField
@ -376,7 +376,7 @@
'oldfieldname': 'resolution_date',
'oldfieldtype': 'Date',
'permlevel': 1,
'search_index': 1
'search_index': 0
},
# DocField

8
utilities/doctype/address/address.txt
View File

@ -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'
},

4
utilities/doctype/bulk_rename_tool/bulk_rename_tool.txt
View File

@ -3,9 +3,9 @@
# These values are common in all dictionaries
{
'creation': '2011-07-08 13:30:05',
'creation': '2011-07-08 11:14:15',
'docstatus': 0,
'modified': '2011-07-08 13:30:05',
'modified': '2011-07-26 00:59:27',
'modified_by': 'Administrator',
'owner': 'Administrator'
},

4
utilities/doctype/gl_mapper_detail/gl_mapper_detail.txt
View File

@ -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

6
utilities/doctype/rename_tool/rename_tool.txt
View File

@ -3,9 +3,9 @@
# These values are common in all dictionaries
{
'creation': '2011-06-23 11:03:25',
'creation': '2011-06-27 10:52:02',
'docstatus': 0,
'modified': '2011-07-01 17:46:42',
'modified': '2011-07-26 00:59:27',
'modified_by': 'Administrator',
'owner': 'Administrator'
},
@ -70,7 +70,7 @@
'fieldtype': 'Select',
'idx': 1,
'label': 'Select DocType',
'options': 'link:DocType'
'options': '\nAccount\nCompany\nCustomer\nSupplier\nEmployee\nWarehouse\nItem'
},
# DocField