nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-26 16:34:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixed conflict

Browse Source
This commit is contained in:
Brahma K
2011-07-27 10:54:11 +05:30
parent d7db2ea20f a01ca6e732
commit 790a78785b
103 changed files with 841 additions and 2232 deletions
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 # These values are common for all DocType
{ {
'_last_update': '1308829300', '_last_update': '1309508836',
'allow_copy': 1, 'allow_copy': 1,
'allow_trash': 1, 'allow_trash': 1,
'colour': 'White:FFF', 'colour': 'White:FFF',
@@ -179,7 +179,7 @@
'oldfieldtype': 'Data', 'oldfieldtype': 'Data',
'permlevel': 1, 'permlevel': 1,
'reqd': 1, 'reqd': 1,
'search_index': 1 'search_index': 0
}, },
# DocField # DocField
@@ -225,7 +225,7 @@
'options': '\nLedger\nGroup', 'options': '\nLedger\nGroup',
'permlevel': 1, 'permlevel': 1,
'reqd': 1, 'reqd': 1,
'search_index': 1 'search_index': 0
}, },
# DocField # DocField
@@ -259,7 +259,7 @@
'oldfieldname': 'debit_or_credit', 'oldfieldname': 'debit_or_credit',
'oldfieldtype': 'Data', 'oldfieldtype': 'Data',
'permlevel': 1, 'permlevel': 1,
'search_index': 1 'search_index': 0
}, },
# DocField # DocField
@@ -274,7 +274,7 @@
'oldfieldtype': 'Select', 'oldfieldtype': 'Select',
'options': 'Yes\nNo', 'options': 'Yes\nNo',
'permlevel': 1, 'permlevel': 1,
'search_index': 1 'search_index': 0
}, },
# DocField # DocField
@@ -344,7 +344,7 @@
'options': 'Company', 'options': 'Company',
'permlevel': 1, 'permlevel': 1,
'reqd': 1, 'reqd': 1,
'search_index': 1 'search_index': 0
}, },
# DocField # DocField

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

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

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

@@ -182,6 +182,7 @@
'options': 'Company', 'options': 'Company',
'permlevel': 0, 'permlevel': 0,
'reqd': 1, 'reqd': 1,
'search_index': 0,
'trigger': 'Client' 'trigger': 'Client'
}, },
@@ -227,7 +228,8 @@
'oldfieldname': 'distribution_id', 'oldfieldname': 'distribution_id',
'oldfieldtype': 'Link', 'oldfieldtype': 'Link',
'options': 'Budget Distribution', 'options': 'Budget Distribution',
'permlevel': 0 'permlevel': 0,
'search_index': 0
}, },
# DocField # DocField

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

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

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

@@ -12,7 +12,7 @@
# These values are common for all DocType # These values are common for all DocType
{ {
'_last_update': '1294312170', '_last_update': '1309508838',
'autoname': 'GL.#######', 'autoname': 'GL.#######',
'colour': 'White:FFF', 'colour': 'White:FFF',
'doctype': 'DocType', 'doctype': 'DocType',
@@ -119,7 +119,7 @@
'label': 'Aging Date', 'label': 'Aging Date',
'oldfieldname': 'aging_date', 'oldfieldname': 'aging_date',
'oldfieldtype': 'Date', 'oldfieldtype': 'Date',
'search_index': 1 'search_index': 0
}, },
# DocField # DocField
@@ -221,7 +221,7 @@
'oldfieldname': 'voucher_type', 'oldfieldname': 'voucher_type',
'oldfieldtype': 'Select', 'oldfieldtype': 'Select',
'options': 'Journal Voucher\nReceivable Voucher\nPayable Voucher', 'options': 'Journal Voucher\nReceivable Voucher\nPayable Voucher',
'search_index': 1 'search_index': 0
}, },
# DocField # DocField
@@ -262,7 +262,7 @@
'oldfieldname': 'is_cancelled', 'oldfieldname': 'is_cancelled',
'oldfieldtype': 'Select', 'oldfieldtype': 'Select',
'options': 'No\nYes', 'options': 'No\nYes',
'search_index': 1 'search_index': 0
}, },
# DocField # DocField
@@ -276,7 +276,7 @@
'oldfieldname': 'is_opening', 'oldfieldname': 'is_opening',
'oldfieldtype': 'Select', 'oldfieldtype': 'Select',
'options': 'No\nYes', 'options': 'No\nYes',
'search_index': 1 'search_index': 0
}, },
# DocField # DocField
@@ -304,7 +304,7 @@
'oldfieldname': 'fiscal_year', 'oldfieldname': 'fiscal_year',
'oldfieldtype': 'Select', 'oldfieldtype': 'Select',
'options': 'link:Fiscal Year', 'options': 'link:Fiscal Year',
'search_index': 1 'search_index': 0
}, },
# DocField # DocField
@@ -318,6 +318,6 @@
'oldfieldname': 'company', 'oldfieldname': 'company',
'oldfieldtype': 'Link', 'oldfieldtype': 'Link',
'options': 'Company', 'options': 'Company',
'search_index': 1 'search_index': 0
} }
] ]

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

@@ -1,802 +0,0 @@
# DocType, Journal Voucher
[
# These values are common in all dictionaries
{
'creation': '2010-08-08 17:09:06',
'docstatus': 0,
'modified': '2011-07-15 14:37:05',
'modified_by': 'Administrator',
'owner': 'Administrator'
},
# These values are common for all DocType
{
'_last_update': '1310533805',
'colour': 'White:FFF',
'doctype': 'DocType',
'module': 'Accounts',
'name': '__common__',
'search_fields': 'voucher_type,posting_date, due_date, cheque_no',
'section_style': 'Tabbed',
'server_code_error': ' ',
'show_in_menu': 0,
'subject': ' ',
'tag_fields': 'voucher_type',
'version': 308
},
# These values are common for all DocField
{
'doctype': 'DocField',
'name': '__common__',
'parent': 'Journal Voucher',
'parentfield': 'fields',
'parenttype': 'DocType'
},
# These values are common for all DocPerm
{
'doctype': 'DocPerm',
'name': '__common__',
'parent': 'Journal Voucher',
'parentfield': 'permissions',
'parenttype': 'DocType',
'read': 1
},
# DocType, Journal Voucher
{
'doctype': 'DocType',
'name': 'Journal Voucher'
},
# DocPerm
{
'amend': 0,
'cancel': 0,
'create': 0,
'doctype': 'DocPerm',
'idx': 1,
'permlevel': 1,
'role': 'Accounts Manager',
'submit': 0,
'write': 0
},
# DocPerm
{
'amend': 1,
'cancel': 1,
'create': 1,
'doctype': 'DocPerm',
'idx': 2,
'permlevel': 0,
'role': 'Accounts Manager',
'submit': 1,
'write': 1
},
# DocPerm
{
'amend': 1,
'cancel': 1,
'create': 1,
'doctype': 'DocPerm',
'idx': 3,
'permlevel': 0,
'role': 'Accounts User',
'submit': 1,
'write': 1
},
# DocPerm
{
'amend': 0,
'cancel': 0,
'create': 0,
'doctype': 'DocPerm',
'idx': 4,
'permlevel': 1,
'role': 'Accounts User',
'submit': 0,
'write': 0
},
# DocField
{
'doctype': 'DocField',
'fieldtype': 'Section Break',
'idx': 1,
'label': 'Basic Info',
'oldfieldtype': 'Section Break',
'permlevel': 0
},
# DocField
{
'doctype': 'DocField',
'fieldtype': 'Section Break',
'idx': 2,
'label': '1. Select Series and Dates',
'oldfieldtype': 'Section Break',
'options': 'Simple',
'permlevel': 0
},
# DocField
{
'doctype': 'DocField',
'fieldtype': 'Column Break',
'idx': 3,
'oldfieldtype': 'Column Break',
'permlevel': 0,
'width': '50%'
},
# DocField
{
'doctype': 'DocField',
'fieldname': 'voucher_type',
'fieldtype': 'Select',
'idx': 4,
'in_filter': 1,
'label': 'Voucher Type',
'oldfieldname': 'voucher_type',
'oldfieldtype': 'Select',
'options': '\nJournal Entry\nBank Voucher\nCash Voucher\nCredit Card Voucher\nDebit Note\nCredit Note\nContra Voucher\nExcise Voucher\nWrite Off Voucher\nLoan Receipt',
'permlevel': 0,
'print_hide': 0,
'search_index': 1
},
# DocField
{
'colour': 'White:FFF',
'depends_on': "eval:doc.voucher_type == 'Write Off Voucher'",
'doctype': 'DocField',
'fieldname': 'write_off_amount',
'fieldtype': 'Currency',
'idx': 5,
'label': 'Write Off Amount <=',
'permlevel': 0,
'print_hide': 1,
'report_hide': 1
},
# DocField
{
'colour': 'White:FFF',
'default': 'Accounts Receivable',
'depends_on': "eval:doc.voucher_type == 'Write Off Voucher'",
'doctype': 'DocField',
'fieldname': 'write_off_based_on',
'fieldtype': 'Select',
'idx': 6,
'label': 'Write Off Based On',
'options': 'Accounts Receivable\nAccounts Payable',
'permlevel': 0,
'print_hide': 1,
'report_hide': 1
},
# DocField
{
'colour': 'White:FFF',
'description': 'To manage multiple series please go to Setup > Manage Series',
'doctype': 'DocField',
'fieldname': 'naming_series',
'fieldtype': 'Select',
'idx': 7,
'label': 'Series',
'no_copy': 1,
'oldfieldname': 'naming_series',
'oldfieldtype': 'Select',
'options': 'JV',
'permlevel': 0,
'print_hide': 1,
'reqd': 1
},
# DocField
{
'colour': 'White:FFF',
'default': 'Today',
'doctype': 'DocField',
'fieldname': 'voucher_date',
'fieldtype': 'Date',
'idx': 8,
'in_filter': 1,
'label': 'Voucher Date',
'no_copy': 1,
'oldfieldname': 'voucher_date',
'oldfieldtype': 'Date',
'permlevel': 0,
'print_hide': 0,
'reqd': 1,
'search_index': 1
},
# DocField
{
'description': 'The date at which current entry will get or has actually executed.',
'doctype': 'DocField',
'fieldname': 'posting_date',
'fieldtype': 'Date',
'idx': 9,
'in_filter': 1,
'label': 'Posting Date',
'no_copy': 1,
'oldfieldname': 'posting_date',
'oldfieldtype': 'Date',
'permlevel': 0,
'reqd': 1,
'search_index': 1
},
# DocField
{
'doctype': 'DocField',
'fieldname': 'due_date',
'fieldtype': 'Date',
'idx': 10,
'label': 'Due Date',
'oldfieldname': 'due_date',
'oldfieldtype': 'Date',
'permlevel': 0,
'print_hide': 0
},
# DocField
{
'description': 'The date at which current entry is corrected in the system.',
'doctype': 'DocField',
'fieldname': 'amendment_date',
'fieldtype': 'Date',
'idx': 11,
'label': 'Amendment Date',
'no_copy': 1,
'oldfieldname': 'amendment_date',
'oldfieldtype': 'Date',
'permlevel': 0,
'print_hide': 1
},
# DocField
{
'doctype': 'DocField',
'fieldname': 'amended_from',
'fieldtype': 'Link',
'idx': 12,
'label': 'Amended From',
'no_copy': 1,
'oldfieldname': 'amended_from',
'oldfieldtype': 'Link',
'options': 'Journal Voucher',
'permlevel': 1,
'print_hide': 1
},
# DocField
{
'colour': 'White:FFF',
'depends_on': "eval:doc.voucher_type == 'Write Off Voucher'",
'doctype': 'DocField',
'fieldtype': 'Button',
'idx': 13,
'label': 'Get Outstanding Invoices',
'options': 'get_outstanding_invoices',
'permlevel': 0,
'print_hide': 1,
'trigger': 'Server'
},
# DocField
{
'doctype': 'DocField',
'fieldtype': 'Column Break',
'idx': 14,
'oldfieldtype': 'Column Break',
'permlevel': 0,
'width': '50%'
},
# DocField
{
'doctype': 'DocField',
'fieldname': 'cheque_no',
'fieldtype': 'Data',
'idx': 15,
'in_filter': 1,
'label': 'Cheque No',
'no_copy': 1,
'oldfieldname': 'cheque_no',
'oldfieldtype': 'Data',
'permlevel': 0,
'search_index': 1
},
# DocField
{
'doctype': 'DocField',
'fieldname': 'cheque_date',
'fieldtype': 'Date',
'idx': 16,
'label': 'Cheque Date',
'no_copy': 1,
'oldfieldname': 'cheque_date',
'oldfieldtype': 'Date',
'permlevel': 0
},
# DocField
{
'doctype': 'DocField',
'fieldname': 'clearance_date',
'fieldtype': 'Date',
'idx': 17,
'in_filter': 1,
'label': 'Clearance Date',
'no_copy': 1,
'oldfieldname': 'clearance_date',
'oldfieldtype': 'Date',
'permlevel': 1,
'print_hide': 0,
'search_index': 1
},
# DocField
{
'doctype': 'DocField',
'fieldname': 'user_remark',
'fieldtype': 'Small Text',
'idx': 18,
'in_filter': 1,
'label': 'User Remark',
'no_copy': 1,
'oldfieldname': 'user_remark',
'oldfieldtype': 'Small Text',
'permlevel': 0
},
# DocField
{
'description': 'User Remark will be added to Auto Remark',
'doctype': 'DocField',
'fieldname': 'remark',
'fieldtype': 'Small Text',
'idx': 19,
'label': 'Remark',
'no_copy': 1,
'oldfieldname': 'remark',
'oldfieldtype': 'Small Text',
'permlevel': 1,
'reqd': 0
},
# DocField
{
'doctype': 'DocField',
'fieldtype': 'Section Break',
'idx': 20,
'label': '2. Add / Edit GL Entries',
'oldfieldtype': 'Section Break',
'options': 'Simple',
'permlevel': 0
},
# DocField
{
'doctype': 'DocField',
'fieldname': 'entries',
'fieldtype': 'Table',
'idx': 21,
'label': 'Entries',
'oldfieldname': 'entries',
'oldfieldtype': 'Table',
'options': 'Journal Voucher Detail',
'permlevel': 0,
'print_hide': 0
},
# DocField
{
'doctype': 'DocField',
'fieldtype': 'Button',
'idx': 22,
'label': 'Get Balance',
'oldfieldtype': 'Button',
'permlevel': 0,
'trigger': 'Client'
},
# DocField
{
'doctype': 'DocField',
'fieldname': 'total_debit',
'fieldtype': 'Currency',
'idx': 23,
'in_filter': 1,
'label': 'Total Debit',
'no_copy': 1,
'oldfieldname': 'total_debit',
'oldfieldtype': 'Currency',
'permlevel': 1
},
# DocField
{
'doctype': 'DocField',
'fieldname': 'total_credit',
'fieldtype': 'Currency',
'idx': 24,
'in_filter': 1,
'label': 'Total Credit',
'no_copy': 1,
'oldfieldname': 'total_credit',
'oldfieldtype': 'Currency',
'permlevel': 1
},
# DocField
{
'doctype': 'DocField',
'fieldname': 'difference',
'fieldtype': 'Currency',
'idx': 25,
'label': 'Difference',
'no_copy': 1,
'oldfieldname': 'difference',
'oldfieldtype': 'Currency',
'permlevel': 1,
'print_hide': 1
},
# DocField
{
'doctype': 'DocField',
'fieldtype': 'Section Break',
'idx': 26,
'label': 'Addtional Info',
'oldfieldtype': 'Section Break',
'permlevel': 0
},
# DocField
{
'doctype': 'DocField',
'fieldtype': 'Column Break',
'idx': 27,
'oldfieldtype': 'Column Break',
'permlevel': 0,
'width': '50%'
},
# DocField
{
'doctype': 'DocField',
'fieldname': 'bill_no',
'fieldtype': 'Data',
'idx': 28,
'label': 'Bill No',
'oldfieldname': 'bill_no',
'oldfieldtype': 'Data',
'permlevel': 0,
'print_hide': 1
},
# DocField
{
'doctype': 'DocField',
'fieldname': 'bill_date',
'fieldtype': 'Date',
'idx': 29,
'label': 'Bill Date',
'oldfieldname': 'bill_date',
'oldfieldtype': 'Date',
'permlevel': 0,
'print_hide': 1
},
# DocField
{
'colour': 'White:FFF',
'default': 'No',
'doctype': 'DocField',
'fieldname': 'is_opening',
'fieldtype': 'Select',
'idx': 30,
'in_filter': 1,
'label': 'Is Opening',
'oldfieldname': 'is_opening',
'oldfieldtype': 'Select',
'options': 'No\nYes',
'permlevel': 0,
'print_hide': 1,
'search_index': 1,
'trigger': 'Client'
},
# DocField
{
'doctype': 'DocField',
'fieldname': 'aging_date',
'fieldtype': 'Date',
'idx': 31,
'label': 'Aging Date',
'no_copy': 0,
'oldfieldname': 'aging_date',
'oldfieldtype': 'Date',
'permlevel': 0,
'print_hide': 1
},
# DocField
{
'doctype': 'DocField',
'fieldname': 'cancel_reason',
'fieldtype': 'Data',
'idx': 32,
'label': 'Cancel Reason',
'no_copy': 1,
'oldfieldname': 'cancel_reason',
'oldfieldtype': 'Data',
'permlevel': 1,
'print_hide': 1
},
# DocField
{
'doctype': 'DocField',
'fieldname': 'pay_to_recd_from',
'fieldtype': 'Data',
'hidden': 0,
'idx': 33,
'label': 'Pay To / Recd From',
'no_copy': 1,
'permlevel': 0,
'print_hide': 1,
'report_hide': 1
},
# DocField
{
'doctype': 'DocField',
'fieldname': 'total_amount',
'fieldtype': 'Data',
'hidden': 0,
'idx': 34,
'label': 'Total Amount',
'no_copy': 1,
'permlevel': 1,
'print_hide': 1,
'report_hide': 1
},
# DocField
{
'doctype': 'DocField',
'fieldname': 'total_amount_in_words',
'fieldtype': 'Data',
'hidden': 0,
'idx': 35,
'label': 'Total Amount in Words',
'no_copy': 1,
'permlevel': 1,
'print_hide': 1,
'report_hide': 1
},
# DocField
{
'doctype': 'DocField',
'fieldtype': 'Column Break',
'idx': 36,
'oldfieldtype': 'Column Break',
'permlevel': 0,
'width': '50%'
},
# DocField
{
'doctype': 'DocField',
'fieldname': 'fiscal_year',
'fieldtype': 'Select',
'idx': 37,
'in_filter': 1,
'label': 'Fiscal Year',
'oldfieldname': 'fiscal_year',
'oldfieldtype': 'Select',
'options': 'link:Fiscal Year',
'permlevel': 0,
'print_hide': 1,
'reqd': 1,
'search_index': 1
},
# DocField
{
'doctype': 'DocField',
'fieldname': 'company',
'fieldtype': 'Link',
'idx': 38,
'in_filter': 1,
'label': 'Company',
'oldfieldname': 'company',
'oldfieldtype': 'Link',
'options': 'Company',
'permlevel': 0,
'print_hide': 1,
'reqd': 1,
'search_index': 1
},
# DocField
{
'allow_on_submit': 1,
'colour': 'White:FFF',
'doctype': 'DocField',
'fieldname': 'select_print_heading',
'fieldtype': 'Link',
'idx': 39,
'label': 'Select Print Heading',
'no_copy': 1,
'oldfieldname': 'select_print_heading',
'oldfieldtype': 'Link',
'options': 'Print Heading',
'permlevel': 0,
'print_hide': 1,
'report_hide': 1,
'trigger': 'Client'
},
# DocField
{
'doctype': 'DocField',
'fieldtype': 'Section Break',
'idx': 40,
'oldfieldtype': 'Section Break',
'options': 'Simple',
'permlevel': 0
},
# DocField
{
'allow_on_submit': 1,
'doctype': 'DocField',
'fieldtype': 'Button',
'idx': 41,
'label': 'View Ledger Entry',
'oldfieldtype': 'Button',
'permlevel': 0,
'print_hide': 1,
'trigger': 'Client'
},
# DocField
{
'doctype': 'DocField',
'fieldtype': 'Section Break',
'idx': 42,
'label': 'TDS',
'oldfieldtype': 'Section Break',
'permlevel': 0,
'print_hide': 0
},
# DocField
{
'default': 'No',
'doctype': 'DocField',
'fieldname': 'tds_applicable',
'fieldtype': 'Select',
'idx': 43,
'in_filter': 1,
'label': 'TDS Applicable',
'no_copy': 1,
'oldfieldname': 'tds_applicable',
'oldfieldtype': 'Select',
'options': '\nYes\nNo',
'permlevel': 0,
'print_hide': 1,
'search_index': 1
},
# DocField
{
'colour': 'White:FFF',
'doctype': 'DocField',
'fieldname': 'tds_category',
'fieldtype': 'Select',
'hidden': 0,
'idx': 44,
'in_filter': 1,
'label': 'TDS Category',
'no_copy': 1,
'oldfieldname': 'tds_category',
'oldfieldtype': 'Select',
'options': 'link:TDS Category',
'permlevel': 0,
'print_hide': 1,
'search_index': 1,
'trigger': 'Client'
},
# DocField
{
'colour': 'White:FFF',
'doctype': 'DocField',
'fieldname': 'supplier_account',
'fieldtype': 'Link',
'hidden': 0,
'idx': 45,
'label': 'Supplier Account',
'no_copy': 1,
'oldfieldname': 'supplier_account',
'oldfieldtype': 'Link',
'options': 'Account',
'permlevel': 0,
'print_hide': 1,
'trigger': 'Client'
},
# DocField
{
'colour': 'White:FFF',
'doctype': 'DocField',
'fieldtype': 'Button',
'idx': 46,
'label': 'Get TDS',
'no_copy': 0,
'oldfieldtype': 'Button',
'permlevel': 0,
'trigger': 'Client'
},
# DocField
{
'colour': 'White:FFF',
'description': 'Tax Code will be populated based on account head mentioned in TDS Category master',
'doctype': 'DocField',
'fieldname': 'tax_code',
'fieldtype': 'Link',
'idx': 47,
'label': 'TDS Account Head',
'no_copy': 1,
'oldfieldname': 'tax_code',
'oldfieldtype': 'Link',
'options': 'Account',
'permlevel': 0,
'print_hide': 1
},
# DocField
{
'doctype': 'DocField',
'fieldname': 'rate',
'fieldtype': 'Currency',
'idx': 48,
'label': 'Rate',
'no_copy': 1,
'oldfieldname': 'rate',
'oldfieldtype': 'Currency',
'permlevel': 0,
'print_hide': 1,
'trigger': 'Client'
},
# DocField
{
'doctype': 'DocField',
'fieldname': 'ded_amount',
'fieldtype': 'Currency',
'idx': 49,
'label': 'Amount',
'no_copy': 1,
'oldfieldname': 'ded_amount',
'oldfieldtype': 'Currency',
'permlevel': 0,
'print_hide': 1,
'trigger': 'Client'
}
]

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

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

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

@@ -12,7 +12,7 @@
# These values are common for all DocType # These values are common for all DocType
{ {
'_last_update': '1308741898', '_last_update': '1309508838',
'colour': 'White:FFF', 'colour': 'White:FFF',
'doctype': 'DocType', 'doctype': 'DocType',
'module': 'Accounts', 'module': 'Accounts',
@@ -221,6 +221,7 @@
'options': 'Supplier', 'options': 'Supplier',
'permlevel': 0, 'permlevel': 0,
'print_hide': 1, 'print_hide': 1,
'search_index': 1,
'trigger': 'Client' 'trigger': 'Client'
}, },
@@ -326,7 +327,7 @@
'oldfieldtype': 'Date', 'oldfieldtype': 'Date',
'permlevel': 0, 'permlevel': 0,
'reqd': 1, 'reqd': 1,
'search_index': 1 'search_index': 0
}, },
# DocField # DocField
@@ -342,7 +343,7 @@
'oldfieldtype': 'Date', 'oldfieldtype': 'Date',
'permlevel': 0, 'permlevel': 0,
'print_hide': 0, 'print_hide': 0,
'search_index': 1 'search_index': 0
}, },
# DocField # DocField
@@ -378,7 +379,7 @@
'permlevel': 0, 'permlevel': 0,
'print_hide': 1, 'print_hide': 1,
'reqd': 1, 'reqd': 1,
'search_index': 1 'search_index': 0
}, },
# DocField # DocField
@@ -394,7 +395,7 @@
'permlevel': 0, 'permlevel': 0,
'print_hide': 1, 'print_hide': 1,
'reqd': 0, 'reqd': 0,
'search_index': 1 'search_index': 0
}, },
# DocField # DocField
@@ -690,7 +691,7 @@
'options': 'No\nYes', 'options': 'No\nYes',
'permlevel': 0, 'permlevel': 0,
'print_hide': 1, 'print_hide': 1,
'search_index': 1, 'search_index': 0,
'trigger': 'Client' 'trigger': 'Client'
}, },
@@ -768,7 +769,7 @@
'permlevel': 0, 'permlevel': 0,
'print_hide': 1, 'print_hide': 1,
'reqd': 1, 'reqd': 1,
'search_index': 1 'search_index': 0
}, },
# DocField # DocField
@@ -785,7 +786,7 @@
'permlevel': 0, 'permlevel': 0,
'print_hide': 1, 'print_hide': 1,
'reqd': 1, 'reqd': 1,
'search_index': 1 'search_index': 0
}, },
# DocField # DocField
@@ -1084,7 +1085,7 @@
'oldfieldtype': 'Currency', 'oldfieldtype': 'Currency',
'permlevel': 1, 'permlevel': 1,
'print_hide': 1, 'print_hide': 1,
'search_index': 1 'search_index': 0
}, },
# DocField # DocField

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

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

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

@@ -172,7 +172,8 @@
'oldfieldname': 'company', 'oldfieldname': 'company',
'oldfieldtype': 'Link', 'oldfieldtype': 'Link',
'options': 'Company', 'options': 'Company',
'reqd': 1 'reqd': 1,
'search_index': 0
}, },
# DocField # DocField
@@ -193,7 +194,8 @@
'oldfieldname': 'customer_account', 'oldfieldname': 'customer_account',
'oldfieldtype': 'Link', 'oldfieldtype': 'Link',
'options': 'Account', 'options': 'Account',
'reqd': 0 'reqd': 0,
'search_index': 0
}, },
# DocField # DocField
@@ -206,7 +208,8 @@
'oldfieldname': 'cash_bank_account', 'oldfieldname': 'cash_bank_account',
'oldfieldtype': 'Link', 'oldfieldtype': 'Link',
'options': 'Account', 'options': 'Account',
'reqd': 1 'reqd': 1,
'search_index': 0
}, },
# DocField # DocField
@@ -219,7 +222,8 @@
'oldfieldname': 'income_account', 'oldfieldname': 'income_account',
'oldfieldtype': 'Link', 'oldfieldtype': 'Link',
'options': 'Account', 'options': 'Account',
'reqd': 1 'reqd': 1,
'search_index': 0
}, },
# DocField # DocField
@@ -232,7 +236,8 @@
'oldfieldname': 'warehouse', 'oldfieldname': 'warehouse',
'oldfieldtype': 'Link', 'oldfieldtype': 'Link',
'options': 'Warehouse', 'options': 'Warehouse',
'reqd': 1 'reqd': 1,
'search_index': 0
}, },
# DocField # DocField
@@ -245,7 +250,8 @@
'oldfieldname': 'cost_center', 'oldfieldname': 'cost_center',
'oldfieldtype': 'Link', 'oldfieldtype': 'Link',
'options': 'Cost Center', 'options': 'Cost Center',
'reqd': 1 'reqd': 1,
'search_index': 0
}, },
# DocField # DocField
@@ -257,7 +263,8 @@
'label': 'Charge', 'label': 'Charge',
'oldfieldname': 'charge', 'oldfieldname': 'charge',
'oldfieldtype': 'Link', 'oldfieldtype': 'Link',
'options': 'Other Charges' 'options': 'Other Charges',
'search_index': 0
}, },
# DocField # DocField
@@ -282,7 +289,8 @@
'label': 'Terms', 'label': 'Terms',
'oldfieldname': 'tc_name', 'oldfieldname': 'tc_name',
'oldfieldtype': 'Link', 'oldfieldtype': 'Link',
'options': 'Term' 'options': 'Term',
'search_index': 0
}, },
# DocField # DocField

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

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

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

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

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

@@ -12,7 +12,7 @@
# These values are common for all DocType # 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', 'change_log': '1. Change in pull_details method dt.-26-06-2009',
'colour': 'White:FFF', 'colour': 'White:FFF',
'doctype': 'DocType', 'doctype': 'DocType',
@@ -323,7 +323,7 @@
'oldfieldtype': 'Date', 'oldfieldtype': 'Date',
'permlevel': 0, 'permlevel': 0,
'reqd': 1, 'reqd': 1,
'search_index': 1 'search_index': 0
}, },
# DocField # DocField
@@ -342,7 +342,7 @@
'oldfieldtype': 'Date', 'oldfieldtype': 'Date',
'permlevel': 0, 'permlevel': 0,
'reqd': 1, 'reqd': 1,
'search_index': 1 'search_index': 0
}, },
# DocField # DocField
@@ -433,7 +433,7 @@
'permlevel': 0, 'permlevel': 0,
'print_hide': 1, 'print_hide': 1,
'reqd': 1, 'reqd': 1,
'search_index': 1 'search_index': 0
}, },
# DocField # DocField
@@ -903,7 +903,7 @@
'options': 'No\nYes', 'options': 'No\nYes',
'permlevel': 0, 'permlevel': 0,
'print_hide': 1, 'print_hide': 1,
'search_index': 1, 'search_index': 0,
'trigger': 'Client' 'trigger': 'Client'
}, },
@@ -1027,7 +1027,7 @@
'permlevel': 0, 'permlevel': 0,
'print_hide': 1, 'print_hide': 1,
'reqd': 1, 'reqd': 1,
'search_index': 1 'search_index': 0
}, },
# DocField # DocField
@@ -1045,7 +1045,7 @@
'permlevel': 0, 'permlevel': 0,
'print_hide': 1, 'print_hide': 1,
'reqd': 1, 'reqd': 1,
'search_index': 1 'search_index': 0
}, },
# DocField # DocField
@@ -1116,7 +1116,7 @@
'permlevel': 1, 'permlevel': 1,
'print_hide': 1, 'print_hide': 1,
'reqd': 1, 'reqd': 1,
'search_index': 1 'search_index': 0
}, },
# DocField # DocField

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

@@ -243,6 +243,7 @@
'permlevel': 0, 'permlevel': 0,
'print_hide': 1, 'print_hide': 1,
'reqd': 1, 'reqd': 1,
'search_index': 1,
'trigger': 'Client', 'trigger': 'Client',
'width': '120px' 'width': '120px'
}, },
@@ -262,6 +263,7 @@
'permlevel': 0, 'permlevel': 0,
'print_hide': 1, 'print_hide': 1,
'reqd': 0, 'reqd': 0,
'search_index': 1,
'trigger': 'Client', 'trigger': 'Client',
'width': '120px' 'width': '120px'
}, },

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

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

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

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

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

@@ -207,7 +207,7 @@
'options': 'link:Fiscal Year', 'options': 'link:Fiscal Year',
'permlevel': 0, 'permlevel': 0,
'reqd': 1, 'reqd': 1,
'search_index': 1 'search_index': 0
}, },
# DocField # DocField
@@ -269,7 +269,7 @@
'oldfieldtype': 'Link', 'oldfieldtype': 'Link',
'options': 'Company', 'options': 'Company',
'permlevel': 0, 'permlevel': 0,
'search_index': 1, 'search_index': 0,
'trigger': 'Client' 'trigger': 'Client'
}, },

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

@@ -2,134 +2,145 @@
# ------------------------------------------------------------------ # ------------------------------------------------------------------
if not filter_values.get('posting_date') or not filter_values.get('posting_date1'): if not filter_values.get('posting_date') or not filter_values.get('posting_date1'):
msgprint("Please select From Posting Date and To Posting Date ") msgprint("Please select From Posting Date and To Posting Date ")
raise Exception raise Exception
else: else:
from_date = filter_values.get('posting_date') from_date = filter_values.get('posting_date')
to_date = filter_values.get('posting_date1') 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']: 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' ") msgprint("Please select aging ranges in no of days in 'More Filters' ")
raise Exception raise Exception
# validate Range # validate Range
range_list = ['range_1','range_2','range_3','range_4'] range_list = ['range_1','range_2','range_3','range_4']
for r in range(len(range_list)-1): for r in range(len(range_list)-1):
if not cint(filter_values[range_list[r]]) < cint(filter_values[range_list[r + 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))) msgprint("Range %s should be less than Range %s." % (cstr(r+1),cstr(r+2)))
raise Exception raise Exception
# Add columns # Add columns
# ------------------------------------------------------------------ # ------------------------------------------------------------------
data = [['Aging Date','Date','80px',''], data = [['Aging Date','Date','80px',''],
['Transaction Date','Date','80px',''], ['Transaction Date','Date','80px',''],
['Account','Data','120px',''], ['Account','Data','120px',''],
['Against Voucher Type','Data','120px',''], ['Against Voucher Type','Data','120px',''],
['Against Voucher','Data','120px',''], ['Against Voucher','Data','120px',''],
['Voucher Type','Data','120px',''], ['Voucher Type','Data','120px',''],
['Voucher No','Data','120px',''], ['Voucher No','Data','120px',''],
['Remarks','Data','160px',''], ['Remarks','Data','160px',''],
['Supplier Type', 'Data', '80px', ''], ['Supplier Type', 'Data', '80px', ''],
['Due Date', 'Data', '80px', ''], ['Due Date', 'Data', '80px', ''],
['Bill No','Data','80px',''], ['Bill No','Data','80px',''],
['Bill Date','Data','80px',''], ['Bill Date','Data','80px',''],
['Opening Amt','Currency','120px',''], ['Opening Amt','Currency','120px',''],
['Outstanding Amt','Currency','120px',''], ['Outstanding Amt','Currency','120px',''],
['Age (Days)', 'Currency', '150px', ''], ['Age (Days)', 'Currency', '150px', ''],
['0-'+cstr(filter_values['range_1']),'Currency','100px',''], ['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_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_2']) + 1)+ '-' +cstr(filter_values['range_3']),'Currency','100px',''],
[cstr(cint(filter_values['range_3']) + 1)+ '-' +cstr(filter_values['range_4']),'Currency','100px',''], [cstr(cint(filter_values['range_3']) + 1)+ '-' +cstr(filter_values['range_4']),'Currency','100px',''],
[cstr(filter_values['range_4']) + '-Above','Currency','100px','']] [cstr(filter_values['range_4']) + '-Above','Currency','100px','']]
for d in data: for d in data:
colnames.append(d[0]) colnames.append(d[0])
coltypes.append(d[1]) coltypes.append(d[1])
colwidths.append(d[2]) colwidths.append(d[2])
coloptions.append(d[3]) coloptions.append(d[3])
col_idx[d[0]] = len(colnames)-1 col_idx[d[0]] = len(colnames)-1
# ageing based on # ageing based on
# ------------------------------------------------------------------ # ------------------------------------------------------------------
aging_based_on = 'Aging Date' aging_based_on = 'Aging Date'
if filter_values.has_key('aging_based_on') and filter_values['aging_based_on']: 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: 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") 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 raise Exception
# ------------------------------------------------------------------ # ------------------------------------------------------------------
# main loop starts here # 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 = [] out = []
total_booking_amt, total_outstanding_amt = 0,0 total_booking_amt, total_outstanding_amt = 0,0
for r in res: for r in res:
# get supplier type outstanding_amt, due_date, bill_no, bill_date, cond = 0, '','','', ''
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']]) booking_amt = r.pop(8)
r.append(supplier_type and cstr(supplier_type[0][0]) or '')
# 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 cond:
if r[col_idx['Against Voucher']] and r[col_idx['Voucher Type']] == 'Payable Voucher': 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)
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 # add to total outstanding
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']])) total_outstanding_amt += flt(outstanding_amt)
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']] # 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 r += [booking_amt, outstanding_amt]
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']]) # split into date ranges
val_l1 = val_l2 = val_l3 = val_l4 = val_l5_above= 0
# if un-adjusted if r[col_idx[aging_based_on]]:
elif not r[col_idx['Against Voucher']]: diff = (getdate(to_date) - getdate(r[col_idx[aging_based_on]])).days
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 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: r += [diff, val_l1, val_l2, val_l3, val_l4, val_l5_above]
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)
# add to total outstanding # Only show that entry which has outstanding
total_outstanding_amt += flt(outstanding_amt) if abs(flt(outstanding_amt)) > 0.001:
out.append(r)
# add to total booking amount
if outstanding_amt and r[col_idx['Voucher Type']] == 'Payable Voucher' and r[col_idx['Against Voucher']]: if len(out) > 300 and from_export == 0:
total_booking_amt += flt(booking_amt) 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
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
# Append Extra rows to RES # Append Extra rows to RES

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

@@ -1,26 +1,11 @@
SELECT * 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 ( FROM `tabGL Entry`,`tabAccount`
WHERE `tabGL Entry`.`posting_date`>= '%(posting_date)s'
SELECT a.posting_date, a.voucher_no, a.account, a.credit AS inv_amount, ifnull( a.credit, 0 ) - ifnull( b.debit, 0 ) AS outstanding AND `tabGL Entry`.`posting_date`<= '%(posting_date1)s'
FROM ( AND `tabGL Entry`.`account` LIKE '%(account)s%%'
AND `tabGL Entry`.`company` LIKE '%(company)s%%'
SELECT gl . * AND ((ifnull(`tabGL Entry`.voucher_type,'') = 'Payable Voucher' and `tabGL Entry`.credit>0) OR `tabGL Entry`.voucher_type = 'Journal Voucher')
FROM `tabGL Entry` gl, `tabAccount` acc AND `tabGL Entry`.`is_cancelled` = 'No'
WHERE gl.account = acc.name AND `tabAccount`.master_type = 'Supplier'
AND acc.master_type = 'Supplier' AND `tabAccount`.name = `tabGL Entry`.account
AND ifnull( gl.is_cancelled, 'No' ) = 'No' ORDER BY `tabGL Entry`.`posting_date`
AND gl.credit >0
AND gl.posting_date <= current_date
)a
LEFT JOIN (
SELECT against_voucher, account, sum( debit ) AS debit
FROM `tabGL Entry`
WHERE ifnull( is_cancelled, 'No' ) = 'No'
AND posting_date <= current_date
GROUP BY against_voucher, account
)b ON a.voucher_no = b.against_voucher
AND a.account = b.account
)c
WHERE outstanding !=0
ORDER BY posting_date, voucher_no

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

@@ -282,6 +282,7 @@
'oldfieldtype': 'Data', 'oldfieldtype': 'Data',
'options': 'Sales Order', 'options': 'Sales Order',
'permlevel': 0, 'permlevel': 0,
'search_index': 0,
'width': '100px' 'width': '100px'
}, },
@@ -338,7 +339,7 @@
'permlevel': 0, 'permlevel': 0,
'print_hide': 1, 'print_hide': 1,
'reqd': 1, 'reqd': 1,
'search_index': 1, 'search_index': 0,
'width': '150px' 'width': '150px'
}, },
@@ -357,7 +358,7 @@
'permlevel': 0, 'permlevel': 0,
'print_hide': 1, 'print_hide': 1,
'reqd': 1, 'reqd': 1,
'search_index': 1, 'search_index': 0,
'width': '150px' 'width': '150px'
}, },
@@ -487,7 +488,8 @@
'options': 'Term', 'options': 'Term',
'permlevel': 0, 'permlevel': 0,
'print_hide': 1, 'print_hide': 1,
'report_hide': 1 'report_hide': 1,
'search_index': 0
}, },
# DocField # DocField

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

@@ -85,7 +85,7 @@
'oldfieldtype': 'Data', 'oldfieldtype': 'Data',
'permlevel': 0, 'permlevel': 0,
'reqd': 1, 'reqd': 1,
'search_index': 1, 'search_index': 0,
'width': '100px' 'width': '100px'
}, },
@@ -132,6 +132,7 @@
'options': 'Brand', 'options': 'Brand',
'permlevel': 1, 'permlevel': 1,
'print_hide': 1, 'print_hide': 1,
'search_index': 0,
'width': '100px' 'width': '100px'
}, },
@@ -151,7 +152,7 @@
'permlevel': 1, 'permlevel': 1,
'print_hide': 1, 'print_hide': 1,
'reqd': 0, 'reqd': 0,
'search_index': 1 'search_index': 0
}, },
# DocField # DocField
@@ -199,6 +200,7 @@
'options': 'UOM', 'options': 'UOM',
'permlevel': 1, 'permlevel': 1,
'reqd': 1, 'reqd': 1,
'search_index': 0,
'width': '50px' 'width': '50px'
}, },

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

@@ -54,7 +54,7 @@
'permlevel': 0, 'permlevel': 0,
'print_hide': 1, 'print_hide': 1,
'reqd': 1, 'reqd': 1,
'search_index': 1 'search_index': 0
}, },
# DocField # DocField
@@ -89,7 +89,7 @@
'permlevel': 0, 'permlevel': 0,
'print_hide': 1, 'print_hide': 1,
'reqd': 1, 'reqd': 1,
'search_index': 1 'search_index': 0
}, },
# DocField # DocField
@@ -182,6 +182,7 @@
'permlevel': 0, 'permlevel': 0,
'print_hide': 0, 'print_hide': 0,
'reqd': 1, 'reqd': 1,
'search_index': 0,
'trigger': 'Client', 'trigger': 'Client',
'width': '100px' 'width': '100px'
}, },
@@ -331,7 +332,8 @@
'oldfieldtype': 'Link', 'oldfieldtype': 'Link',
'options': 'Brand', 'options': 'Brand',
'permlevel': 1, 'permlevel': 1,
'print_hide': 1 'print_hide': 1,
'search_index': 0
}, },
# DocField # DocField
@@ -348,7 +350,7 @@
'options': 'Item Group', 'options': 'Item Group',
'permlevel': 1, 'permlevel': 1,
'print_hide': 1, 'print_hide': 1,
'search_index': 1 'search_index': 0
}, },
# DocField # DocField

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

@@ -206,7 +206,8 @@
'oldfieldtype': 'Link', 'oldfieldtype': 'Link',
'options': 'Serial No', 'options': 'Serial No',
'permlevel': 0, 'permlevel': 0,
'print_hide': 0 'print_hide': 0,
'search_index': 0
}, },
# DocField # DocField
@@ -219,7 +220,8 @@
'oldfieldname': 'batch_no', 'oldfieldname': 'batch_no',
'oldfieldtype': 'Link', 'oldfieldtype': 'Link',
'options': 'Batch', 'options': 'Batch',
'permlevel': 0 'permlevel': 0,
'search_index': 0
}, },
# DocField # DocField
@@ -255,7 +257,7 @@
'options': 'Delivery Note', 'options': 'Delivery Note',
'permlevel': 0, 'permlevel': 0,
'print_hide': 0, 'print_hide': 0,
'search_index': 1 'search_index': 0
}, },
# DocField # DocField

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

@@ -5,7 +5,7 @@
{ {
'creation': '2010-08-08 17:09:26', 'creation': '2010-08-08 17:09:26',
'docstatus': 0, 'docstatus': 0,
'modified': '2011-05-10 17:42:21', 'modified': '2011-07-19 16:18:58',
'modified_by': 'Administrator', 'modified_by': 'Administrator',
'owner': 'Administrator' 'owner': 'Administrator'
}, },
@@ -25,7 +25,7 @@
'show_in_menu': 0, 'show_in_menu': 0,
'subject': ' ', 'subject': ' ',
'tag_fields': 'supplier_type', 'tag_fields': 'supplier_type',
'version': 86 'version': 87
}, },
# These values are common for all DocField # These values are common for all DocField
@@ -163,24 +163,11 @@
'permlevel': 0 '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 # DocField
{ {
'doctype': 'DocField', 'doctype': 'DocField',
'fieldtype': 'Section Break', 'fieldtype': 'Section Break',
'idx': 7, 'idx': 6,
'label': 'Address & Contacts', 'label': 'Address & Contacts',
'oldfieldtype': 'Column Break', 'oldfieldtype': 'Column Break',
'permlevel': 0 'permlevel': 0
@@ -192,7 +179,7 @@
'depends_on': 'eval:doc.__islocal', 'depends_on': 'eval:doc.__islocal',
'doctype': 'DocField', 'doctype': 'DocField',
'fieldtype': 'HTML', 'fieldtype': 'HTML',
'idx': 8, 'idx': 7,
'label': 'Address Desc', 'label': 'Address Desc',
'options': '<em>Addresses will appear only when you save the supplier</em>', 'options': '<em>Addresses will appear only when you save the supplier</em>',
'permlevel': 0 'permlevel': 0
@@ -203,7 +190,7 @@
'colour': 'White:FFF', 'colour': 'White:FFF',
'doctype': 'DocField', 'doctype': 'DocField',
'fieldtype': 'HTML', 'fieldtype': 'HTML',
'idx': 9, 'idx': 8,
'label': 'Address HTML', 'label': 'Address HTML',
'permlevel': 1 'permlevel': 1
}, },
@@ -212,7 +199,7 @@
{ {
'doctype': 'DocField', 'doctype': 'DocField',
'fieldtype': 'Column Break', 'fieldtype': 'Column Break',
'idx': 10, 'idx': 9,
'permlevel': 0, 'permlevel': 0,
'width': '50%' 'width': '50%'
}, },
@@ -223,7 +210,7 @@
'depends_on': 'eval:doc.__islocal', 'depends_on': 'eval:doc.__islocal',
'doctype': 'DocField', 'doctype': 'DocField',
'fieldtype': 'HTML', 'fieldtype': 'HTML',
'idx': 11, 'idx': 10,
'label': 'Contact Desc', 'label': 'Contact Desc',
'options': '<em>Contact Details will appear only when you save the supplier</em>', 'options': '<em>Contact Details will appear only when you save the supplier</em>',
'permlevel': 0 'permlevel': 0
@@ -233,7 +220,7 @@
{ {
'doctype': 'DocField', 'doctype': 'DocField',
'fieldtype': 'HTML', 'fieldtype': 'HTML',
'idx': 12, 'idx': 11,
'label': 'Contact HTML', 'label': 'Contact HTML',
'permlevel': 1 'permlevel': 1
}, },
@@ -242,7 +229,7 @@
{ {
'doctype': 'DocField', 'doctype': 'DocField',
'fieldtype': 'Section Break', 'fieldtype': 'Section Break',
'idx': 13, 'idx': 12,
'label': 'More Info', 'label': 'More Info',
'oldfieldtype': 'Section Break', 'oldfieldtype': 'Section Break',
'permlevel': 0 'permlevel': 0
@@ -255,7 +242,7 @@
'doctype': 'DocField', 'doctype': 'DocField',
'fieldname': 'company', 'fieldname': 'company',
'fieldtype': 'Link', 'fieldtype': 'Link',
'idx': 14, 'idx': 13,
'in_filter': 1, 'in_filter': 1,
'label': 'Company', 'label': 'Company',
'oldfieldname': 'company', 'oldfieldname': 'company',
@@ -263,7 +250,7 @@
'options': 'Company', 'options': 'Company',
'permlevel': 0, 'permlevel': 0,
'reqd': 1, 'reqd': 1,
'search_index': 1 'search_index': 0
}, },
# DocField # DocField
@@ -273,7 +260,7 @@
'doctype': 'DocField', 'doctype': 'DocField',
'fieldname': 'supplier_details', 'fieldname': 'supplier_details',
'fieldtype': 'Text', 'fieldtype': 'Text',
'idx': 15, 'idx': 14,
'label': 'Supplier Details', 'label': 'Supplier Details',
'oldfieldname': 'supplier_details', 'oldfieldname': 'supplier_details',
'oldfieldtype': 'Code', 'oldfieldtype': 'Code',
@@ -284,7 +271,7 @@
{ {
'doctype': 'DocField', 'doctype': 'DocField',
'fieldtype': 'Column Break', 'fieldtype': 'Column Break',
'idx': 16, 'idx': 15,
'permlevel': 0, 'permlevel': 0,
'width': '50%' 'width': '50%'
}, },
@@ -294,7 +281,7 @@
'doctype': 'DocField', 'doctype': 'DocField',
'fieldname': 'credit_days', 'fieldname': 'credit_days',
'fieldtype': 'Int', 'fieldtype': 'Int',
'idx': 17, 'idx': 16,
'label': 'Credit Days', 'label': 'Credit Days',
'permlevel': 0 'permlevel': 0
}, },
@@ -304,7 +291,7 @@
'doctype': 'DocField', 'doctype': 'DocField',
'fieldname': 'website', 'fieldname': 'website',
'fieldtype': 'Data', 'fieldtype': 'Data',
'idx': 18, 'idx': 17,
'label': 'Website', 'label': 'Website',
'oldfieldname': 'website', 'oldfieldname': 'website',
'oldfieldtype': 'Data', 'oldfieldtype': 'Data',
@@ -317,7 +304,7 @@
'depends_on': 'eval:!doc.__islocal', 'depends_on': 'eval:!doc.__islocal',
'doctype': 'DocField', 'doctype': 'DocField',
'fieldtype': 'Section Break', 'fieldtype': 'Section Break',
'idx': 19, 'idx': 18,
'label': 'Transaction History', 'label': 'Transaction History',
'oldfieldtype': 'Section Break', 'oldfieldtype': 'Section Break',
'permlevel': 0 'permlevel': 0
@@ -329,7 +316,7 @@
'depends_on': 'eval:!doc.__islocal', 'depends_on': 'eval:!doc.__islocal',
'doctype': 'DocField', 'doctype': 'DocField',
'fieldtype': 'HTML', 'fieldtype': 'HTML',
'idx': 20, 'idx': 19,
'label': 'History HTML', 'label': 'History HTML',
'oldfieldtype': 'HTML', 'oldfieldtype': 'HTML',
'permlevel': 0 'permlevel': 0
@@ -340,7 +327,7 @@
'doctype': 'DocField', 'doctype': 'DocField',
'fieldname': 'trash_reason', 'fieldname': 'trash_reason',
'fieldtype': 'Small Text', 'fieldtype': 'Small Text',
'idx': 21, 'idx': 20,
'label': 'Trash Reason', 'label': 'Trash Reason',
'oldfieldname': 'trash_reason', 'oldfieldname': 'trash_reason',
'oldfieldtype': 'Small Text', 'oldfieldtype': 'Small Text',

BIN
favicon.ico Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.4 KiB

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

@@ -141,7 +141,7 @@
'oldfieldtype': 'Select', 'oldfieldtype': 'Select',
'options': '\nPresent\nAbsent\nHalf Day', 'options': '\nPresent\nAbsent\nHalf Day',
'reqd': 1, 'reqd': 1,
'search_index': 1 'search_index': 0
}, },
# DocField # DocField
@@ -193,7 +193,7 @@
'oldfieldname': 'att_date', 'oldfieldname': 'att_date',
'oldfieldtype': 'Date', 'oldfieldtype': 'Date',
'reqd': 1, 'reqd': 1,
'search_index': 0 'search_index': 1
}, },
# DocField # DocField

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

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

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

@@ -173,7 +173,8 @@
'oldfieldname': 'employee_name', 'oldfieldname': 'employee_name',
'oldfieldtype': 'Data', 'oldfieldtype': 'Data',
'permlevel': 0, 'permlevel': 0,
'reqd': 1 'reqd': 1,
'search_index': 1
}, },
# DocField # DocField
@@ -275,7 +276,7 @@
'options': '\nActive\nLeft', 'options': '\nActive\nLeft',
'permlevel': 0, 'permlevel': 0,
'reqd': 1, 'reqd': 1,
'search_index': 1 'search_index': 0
}, },
# DocField # DocField
@@ -408,7 +409,8 @@
'oldfieldtype': 'Link', 'oldfieldtype': 'Link',
'options': 'Department', 'options': 'Department',
'permlevel': 0, 'permlevel': 0,
'reqd': 1 'reqd': 1,
'search_index': 1
}, },
# DocField # DocField

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

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

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

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

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

@@ -3,9 +3,9 @@
# These values are common in all dictionaries # These values are common in all dictionaries
{ {
'creation': '2011-02-17 13:25:56', 'creation': '2011-02-10 14:10:08',
'docstatus': 0, 'docstatus': 0,
'modified': '2011-07-08 13:28:15', 'modified': '2011-07-11 12:48:49',
'modified_by': 'Administrator', 'modified_by': 'Administrator',
'owner': 'Administrator' 'owner': 'Administrator'
}, },
@@ -54,28 +54,28 @@
# DocPerm # DocPerm
{ {
'amend': 0, 'amend': 1,
'cancel': 0, 'cancel': 1,
'create': 1, 'create': 1,
'doctype': 'DocPerm', 'doctype': 'DocPerm',
'idx': 1, 'idx': 1,
'match': 'owner',
'permlevel': 0, 'permlevel': 0,
'role': 'Employee', 'submit': 1,
'submit': 0,
'write': 1 'write': 1
}, },
# DocPerm # DocPerm
{ {
'amend': 1, 'amend': 0,
'cancel': 1, 'cancel': 0,
'create': 1, 'create': 0,
'doctype': 'DocPerm', 'doctype': 'DocPerm',
'idx': 2, 'idx': 2,
'match': 'owner',
'permlevel': 0, 'permlevel': 0,
'role': 'HR User', 'submit': 0,
'submit': 1, 'write': 0
'write': 1
}, },
# DocPerm # DocPerm
@@ -86,6 +86,19 @@
'doctype': 'DocPerm', 'doctype': 'DocPerm',
'idx': 3, 'idx': 3,
'permlevel': 0, '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', 'role': 'HR Manager',
'submit': 1, 'submit': 1,
'write': 1 'write': 1
@@ -93,28 +106,18 @@
# DocPerm # DocPerm
{ {
'amend': 0,
'cancel': 0,
'create': 0,
'doctype': 'DocPerm', 'doctype': 'DocPerm',
'idx': 4, 'idx': 5,
'permlevel': 1, 'permlevel': 1,
'role': 'HR User', 'role': 'HR User'
'submit': 0,
'write': 0
}, },
# DocPerm # DocPerm
{ {
'amend': 0,
'cancel': 0,
'create': 0,
'doctype': 'DocPerm', 'doctype': 'DocPerm',
'idx': 5, 'idx': 6,
'permlevel': 1, 'permlevel': 1,
'role': 'HR Manager', 'role': 'HR Manager'
'submit': 0,
'write': 0
}, },
# DocField # DocField
@@ -149,7 +152,7 @@
'in_filter': 1, 'in_filter': 1,
'label': 'Employee Name', 'label': 'Employee Name',
'permlevel': 1, 'permlevel': 1,
'search_index': 1 'search_index': 0
}, },
# DocField # DocField
@@ -201,7 +204,7 @@
'options': 'link:Fiscal Year', 'options': 'link:Fiscal Year',
'permlevel': 0, 'permlevel': 0,
'reqd': 1, 'reqd': 1,
'search_index': 1 'search_index': 0
}, },
# DocField # DocField
@@ -234,6 +237,7 @@
'idx': 10, 'idx': 10,
'label': 'From Date', 'label': 'From Date',
'permlevel': 0, 'permlevel': 0,
'search_index': 1,
'trigger': 'Client' 'trigger': 'Client'
}, },
@@ -246,6 +250,7 @@
'idx': 11, 'idx': 11,
'label': 'To Date', 'label': 'To Date',
'permlevel': 0, 'permlevel': 0,
'search_index': 1,
'trigger': 'Client' 'trigger': 'Client'
}, },

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

@@ -1,614 +0,0 @@
# DocType, Salary Slip
[
# These values are common in all dictionaries
{
'creation': '2010-08-08 17:09:20',
'docstatus': 0,
'modified': '2011-07-14 16:07:20',
'modified_by': 'Administrator',
'owner': 'Administrator'
},
# These values are common for all DocType
{
'_last_update': '1310019491',
'colour': 'White:FFF',
'doctype': 'DocType',
'module': 'HR',
'name': '__common__',
'section_style': 'Simple',
'server_code_error': ' ',
'show_in_menu': 0,
'subject': 'For %(employee_name)s, %(designation)s',
'version': 392
},
# These values are common for all DocField
{
'doctype': 'DocField',
'name': '__common__',
'parent': 'Salary Slip',
'parentfield': 'fields',
'parenttype': 'DocType'
},
# These values are common for all DocPerm
{
'doctype': 'DocPerm',
'name': '__common__',
'parent': 'Salary Slip',
'parentfield': 'permissions',
'parenttype': 'DocType',
'read': 1
},
# DocType, Salary Slip
{
'doctype': 'DocType',
'name': 'Salary Slip'
},
# DocPerm
{
'amend': 0,
'cancel': 0,
'create': 0,
'doctype': 'DocPerm',
'match': 'owner',
'permlevel': 0,
'role': 'Employee',
'submit': 0,
'write': 0
},
# DocPerm
{
'amend': 0,
'cancel': 0,
'create': 0,
'doctype': 'DocPerm',
'match': 'owner',
'permlevel': 0,
'role': 'Employee',
'submit': 0,
'write': 0
},
# DocPerm
{
'amend': 0,
'create': 1,
'doctype': 'DocPerm',
'idx': 3,
'permlevel': 0,
'role': 'HR User',
'submit': 1,
'write': 1
},
# DocPerm
{
'amend': 1,
'cancel': 1,
'create': 1,
'doctype': 'DocPerm',
'idx': 4,
'permlevel': 0,
'role': 'HR Manager',
'submit': 1,
'write': 1
},
# DocPerm
{
'doctype': 'DocPerm',
'idx': 5,
'permlevel': 1,
'role': 'HR User'
},
# DocPerm
{
'doctype': 'DocPerm',
'idx': 6,
'permlevel': 1,
'role': 'HR Manager'
},
# DocField
{
'doctype': 'DocField',
'fieldtype': 'Section Break',
'idx': 1,
'label': 'Basic Info',
'oldfieldtype': 'Section Break',
'permlevel': 0
},
# DocField
{
'doctype': 'DocField',
'fieldtype': 'Column Break',
'idx': 2,
'oldfieldtype': 'Column Break',
'permlevel': 0,
'width': '50%'
},
# DocField
{
'colour': 'White:FFF',
'doctype': 'DocField',
'fieldname': 'employee',
'fieldtype': 'Link',
'idx': 3,
'in_filter': 1,
'label': 'Employee',
'oldfieldname': 'employee',
'oldfieldtype': 'Link',
'options': 'Employee',
'permlevel': 0,
'reqd': 1,
'search_index': 0
},
# DocField
{
'doctype': 'DocField',
'fieldname': 'employee_name',
'fieldtype': 'Data',
'idx': 4,
'in_filter': 1,
'label': 'Employee Name',
'oldfieldname': 'employee_name',
'oldfieldtype': 'Data',
'permlevel': 1,
'reqd': 1
},
# DocField
{
'doctype': 'DocField',
'fieldname': 'department',
'fieldtype': 'Link',
'idx': 5,
'in_filter': 1,
'label': 'Department',
'oldfieldname': 'department',
'oldfieldtype': 'Link',
'options': 'Department',
'permlevel': 1,
'reqd': 0,
'search_index': 1
},
# DocField
{
'doctype': 'DocField',
'fieldname': 'designation',
'fieldtype': 'Link',
'idx': 6,
'in_filter': 1,
'label': 'Designation',
'oldfieldname': 'designation',
'oldfieldtype': 'Link',
'options': 'Designation',
'permlevel': 1,
'search_index': 1
},
# DocField
{
'doctype': 'DocField',
'fieldname': 'branch',
'fieldtype': 'Link',
'idx': 7,
'in_filter': 1,
'label': 'Branch',
'oldfieldname': 'branch',
'oldfieldtype': 'Link',
'options': 'Branch',
'permlevel': 1,
'search_index': 1
},
# DocField
{
'doctype': 'DocField',
'fieldname': 'grade',
'fieldtype': 'Link',
'idx': 8,
'in_filter': 1,
'label': 'Grade',
'oldfieldname': 'grade',
'oldfieldtype': 'Link',
'options': 'Grade',
'permlevel': 1,
'search_index': 1
},
# DocField
{
'doctype': 'DocField',
'fieldname': 'pf_no',
'fieldtype': 'Data',
'idx': 9,
'label': 'PF No.',
'oldfieldname': 'pf_no',
'oldfieldtype': 'Data',
'permlevel': 1
},
# DocField
{
'doctype': 'DocField',
'fieldname': 'esic_no',
'fieldtype': 'Data',
'idx': 10,
'label': 'ESIC No.',
'oldfieldname': 'esic_no',
'oldfieldtype': 'Data',
'permlevel': 1
},
# DocField
{
'doctype': 'DocField',
'fieldname': 'letter_head',
'fieldtype': 'Link',
'idx': 11,
'label': 'Letter Head',
'options': 'Letter Head',
'permlevel': 0
},
# DocField
{
'doctype': 'DocField',
'fieldtype': 'Column Break',
'idx': 12,
'oldfieldtype': 'Column Break',
'permlevel': 0,
'width': '50%'
},
# DocField
{
'colour': 'White:FFF',
'doctype': 'DocField',
'fieldname': 'fiscal_year',
'fieldtype': 'Link',
'idx': 13,
'in_filter': 1,
'label': 'Fiscal Year',
'oldfieldname': 'fiscal_year',
'oldfieldtype': 'Data',
'options': 'Fiscal Year',
'permlevel': 0,
'reqd': 1,
'search_index': 1
},
# DocField
{
'doctype': 'DocField',
'fieldname': 'company',
'fieldtype': 'Select',
'idx': 14,
'in_filter': 1,
'label': 'Company',
'options': 'link:Company',
'permlevel': 0,
'reqd': 1
},
# DocField
{
'colour': 'White:FFF',
'doctype': 'DocField',
'fieldname': 'month',
'fieldtype': 'Select',
'idx': 15,
'in_filter': 1,
'label': 'Month',
'oldfieldname': 'month',
'oldfieldtype': 'Select',
'options': '\n01\n02\n03\n04\n05\n06\n07\n08\n09\n10\n11\n12',
'permlevel': 0,
'reqd': 1,
'search_index': 1,
'trigger': 'Client',
'width': '37%'
},
# DocField
{
'doctype': 'DocField',
'fieldname': 'total_days_in_month',
'fieldtype': 'Data',
'idx': 16,
'label': 'Total days in month',
'oldfieldname': 'total_days_in_month',
'oldfieldtype': 'Int',
'permlevel': 1,
'reqd': 1
},
# DocField
{
'colour': 'White:FFF',
'doctype': 'DocField',
'fieldname': 'leave_without_pay',
'fieldtype': 'Currency',
'idx': 17,
'label': 'Leave Without Pay',
'oldfieldname': 'leave_without_pay',
'oldfieldtype': 'Currency',
'permlevel': 0,
'trigger': 'Client'
},
# DocField
{
'doctype': 'DocField',
'fieldname': 'payment_days',
'fieldtype': 'Float',
'idx': 18,
'label': 'Payment days',
'oldfieldname': 'payment_days',
'oldfieldtype': 'Float',
'permlevel': 1,
'reqd': 1
},
# DocField
{
'doctype': 'DocField',
'fieldname': 'bank_name',
'fieldtype': 'Data',
'idx': 19,
'label': 'Bank Name',
'oldfieldname': 'bank_name',
'oldfieldtype': 'Data',
'permlevel': 1
},
# DocField
{
'doctype': 'DocField',
'fieldname': 'bank_account_no',
'fieldtype': 'Data',
'idx': 20,
'label': 'Bank Account No.',
'oldfieldname': 'bank_account_no',
'oldfieldtype': 'Data',
'permlevel': 1
},
# DocField
{
'colour': 'White:FFF',
'doctype': 'DocField',
'fieldname': 'email_check',
'fieldtype': 'Check',
'idx': 21,
'label': 'Email',
'no_copy': 1,
'oldfieldname': 'email_check',
'oldfieldtype': 'Check',
'permlevel': 0,
'print_hide': 1,
'report_hide': 1
},
# DocField
{
'doctype': 'DocField',
'fieldname': 'amended_from',
'fieldtype': 'Data',
'hidden': 0,
'idx': 22,
'label': 'Amended From',
'no_copy': 1,
'oldfieldname': 'amended_from',
'oldfieldtype': 'Data',
'permlevel': 0,
'print_hide': 1,
'report_hide': 0
},
# DocField
{
'doctype': 'DocField',
'fieldname': 'amendment_date',
'fieldtype': 'Date',
'hidden': 0,
'idx': 23,
'label': 'Amendment Date',
'no_copy': 1,
'oldfieldname': 'amendment_date',
'oldfieldtype': 'Date',
'permlevel': 0,
'print_hide': 1,
'report_hide': 0
},
# DocField
{
'doctype': 'DocField',
'fieldtype': 'Section Break',
'idx': 24,
'label': 'Earning & Deduction',
'oldfieldtype': 'Section Break',
'permlevel': 0
},
# DocField
{
'colour': 'White:FFF',
'doctype': 'DocField',
'fieldtype': 'Column Break',
'idx': 25,
'label': 'Earning',
'oldfieldtype': 'Column Break',
'permlevel': 0,
'reqd': 0,
'width': '50%'
},
# DocField
{
'colour': 'White:FFF',
'doctype': 'DocField',
'fieldname': 'earning_details',
'fieldtype': 'Table',
'idx': 26,
'label': 'Earning Details',
'oldfieldname': 'earning_details',
'oldfieldtype': 'Table',
'options': 'SS Earning Detail',
'permlevel': 0
},
# DocField
{
'colour': 'White:FFF',
'doctype': 'DocField',
'fieldtype': 'Column Break',
'idx': 27,
'label': 'Deduction',
'oldfieldtype': 'Column Break',
'permlevel': 0,
'width': '50%'
},
# DocField
{
'doctype': 'DocField',
'fieldname': 'deduction_details',
'fieldtype': 'Table',
'idx': 28,
'label': 'Deduction Details',
'oldfieldname': 'deduction_details',
'oldfieldtype': 'Table',
'options': 'SS Deduction Detail',
'permlevel': 0
},
# DocField
{
'doctype': 'DocField',
'fieldtype': 'Section Break',
'idx': 29,
'label': 'Totals',
'oldfieldtype': 'Section Break',
'permlevel': 0
},
# DocField
{
'doctype': 'DocField',
'fieldtype': 'Column Break',
'idx': 30,
'oldfieldtype': 'Column Break',
'permlevel': 0,
'width': '50%'
},
# DocField
{
'doctype': 'DocField',
'fieldname': 'arrear_amount',
'fieldtype': 'Currency',
'idx': 31,
'label': 'Arrear Amount',
'oldfieldname': 'arrear_amount',
'oldfieldtype': 'Currency',
'permlevel': 0
},
# DocField
{
'colour': 'White:FFF',
'doctype': 'DocField',
'fieldname': 'leave_encashment_amount',
'fieldtype': 'Currency',
'idx': 32,
'label': 'Leave Encashment Amount',
'oldfieldname': 'encashment_amount',
'oldfieldtype': 'Currency',
'permlevel': 0
},
# DocField
{
'doctype': 'DocField',
'fieldname': 'gross_pay',
'fieldtype': 'Currency',
'idx': 33,
'label': 'Gross Pay',
'oldfieldname': 'gross_pay',
'oldfieldtype': 'Currency',
'permlevel': 1
},
# DocField
{
'doctype': 'DocField',
'fieldname': 'total_deduction',
'fieldtype': 'Currency',
'idx': 34,
'label': 'Total Deduction',
'oldfieldname': 'total_deduction',
'oldfieldtype': 'Currency',
'permlevel': 1
},
# DocField
{
'doctype': 'DocField',
'fieldtype': 'Column Break',
'idx': 35,
'oldfieldtype': 'Column Break',
'permlevel': 0,
'width': '50%'
},
# DocField
{
'colour': 'White:FFF',
'description': 'Gross Pay + Arrear Amount +Encashment Amount - Total Deduction',
'doctype': 'DocField',
'fieldname': 'net_pay',
'fieldtype': 'Currency',
'idx': 36,
'label': 'Net Pay',
'oldfieldname': 'net_pay',
'oldfieldtype': 'Currency',
'permlevel': 1
},
# DocField
{
'doctype': 'DocField',
'fieldname': 'rounded_total',
'fieldtype': 'Currency',
'idx': 37,
'label': 'Rounded Total',
'permlevel': 1
},
# DocField
{
'description': 'Net Pay (in words) will be visible once you save the Salary Slip.',
'doctype': 'DocField',
'fieldname': 'total_in_words',
'fieldtype': 'Data',
'idx': 38,
'label': 'Total in words',
'oldfieldname': 'net_pay_in_words',
'oldfieldtype': 'Data',
'permlevel': 1
}
]

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

@@ -115,7 +115,8 @@
'label': 'Tag 1', 'label': 'Tag 1',
'oldfieldname': 'tag_1', 'oldfieldname': 'tag_1',
'oldfieldtype': 'Link', 'oldfieldtype': 'Link',
'options': 'Question Tag' 'options': 'Question Tag',
'search_index': 0
}, },
# DocField # DocField
@@ -136,7 +137,8 @@
'label': 'Tag 2', 'label': 'Tag 2',
'oldfieldname': 'tag_2', 'oldfieldname': 'tag_2',
'oldfieldtype': 'Link', 'oldfieldtype': 'Link',
'options': 'Question Tag' 'options': 'Question Tag',
'search_index': 0
}, },
# DocField # DocField
@@ -148,7 +150,8 @@
'label': 'Tag 3', 'label': 'Tag 3',
'oldfieldname': 'tag_3', 'oldfieldname': 'tag_3',
'oldfieldtype': 'Link', 'oldfieldtype': 'Link',
'options': 'Question Tag' 'options': 'Question Tag',
'search_index': 0
}, },
# DocField # DocField

49
patches/index_patch.py
View File

@@ -2,6 +2,9 @@
This patch removes wrong indexs and add proper indexes in tables 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(): def create_proper_index():
from webnotes.modules.export_module import export_to_files from webnotes.modules.export_module import export_to_files
@@ -264,29 +267,29 @@ def create_proper_index():
'Print Heading': [], 'Print Heading': [],
'TDS Rate Detail': ['category'] 'TDS Rate Detail': ['category']
} }
#sql("commit") # only required if run from login
for dt in dt_index_fields.keys(): exist_dt = [cstr(d[0]) for d in sql("select name from `tabDocType`")]
current_index = sql("show indexes from `tab%s`" % dt)
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: proper_index = dt_index_fields[dt]
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: for d in current_index:
sql("ALTER TABLE `tab%s` ADD INDEX ( `%s` ) " % (dt, d)) if d[4] not in ['name', 'parent', 'parenttype']:
sql("start transaction") if d[4] not in proper_index:
sql("UPDATE `tabDocField` SET search_index = 1 WHERE fieldname = '%s' AND parent = '%s'" % (d, dt)) sql("ALTER TABLE `tab%s` DROP INDEX %s" % (dt, d[4]))
sql("commit") sql("start transaction")
sql("UPDATE `tabDocField` SET search_index = 0 WHERE fieldname = '%s' AND parent = '%s'" % (d[4], dt))
sql("start transaction") sql("commit")
dt_module = sql("select module from `tabDocType` where name = '%s'" % dt)[0][0] else:
export_to_files(record_list = [['DocType', dt]], record_module = dt_module) proper_index.remove(d[4])
sql("commit")
for d in proper_index:
sql("ALTER TABLE `tab%s` ADD INDEX ( `%s` ) " % (dt, d))
sql("start transaction")
sql("UPDATE `tabDocField` SET search_index = 1 WHERE fieldname = '%s' AND parent = '%s'" % (d, dt))
sql("commit")
except:
continue

37
patches/patch.py
View File

@@ -1,13 +1,12 @@
# REMEMBER to update this # REMEMBER to update this
# ======================== # ========================
last_patch = 326 last_patch = 330
#------------------------------------------- #-------------------------------------------
def execute(patch_no): def execute(patch_no):
import webnotes import webnotes
from webnotes.modules.import_module import import_from_files
from webnotes.modules.module_manager import reload_doc from webnotes.modules.module_manager import reload_doc
from webnotes.model.code import get_obj from webnotes.model.code import get_obj
@@ -1298,3 +1297,37 @@ def execute(patch_no):
# load the new billing page # load the new billing page
if cint(webnotes.conn.get_value('Control Panel',None,'sync_with_gateway')): if cint(webnotes.conn.get_value('Control Panel',None,'sync_with_gateway')):
reload_doc('server_tools','page','billing') reload_doc('server_tools','page','billing')
elif patch_no == 327:
# patch for support email settings now moved to email settings
reload_doc('setup','doctype','email_settings')
# map fields from support to email settings
field_map = {
'support_email': 'email',
'support_host':'host',
'support_username': 'username',
'support_password': 'password',
'support_use_ssl': 'use_ssl',
'sync_support_mails': 'integrate_incoming',
'signature': 'support_signature'
}
for key in field_map:
webnotes.conn.set_value('Email Settings',None,key, \
webnotes.conn.get_value('Support Email Settings',None,field_map[key]))
# delete support email settings
from webnotes.model import delete_doc
delete_doc('DocType', 'Support Email Settings')
reload_doc('support','doctype','support_ticket')
sql("delete from tabDocField where fieldname='problem_description' and parent='Support Ticket'")
elif patch_no == 328:
if webnotes.conn.get_value('Control Panel', None, 'account_id') != 'axjanak2011':
sql("delete from `tabDocField` where fieldname = 'supplier_status' and parent = 'Supplier'")
elif patch_no == 329:
from index_patch import create_proper_index
create_proper_index()
elif patch_no == 330:
reload_doc('utilities', 'doctype', 'rename_tool')
reload_doc('utilities', 'doctype', 'bulk_rename_tool')

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

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

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

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

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

@@ -99,6 +99,7 @@
'oldfieldname': 'bom_created', 'oldfieldname': 'bom_created',
'oldfieldtype': 'Link', 'oldfieldtype': 'Link',
'options': 'Bill Of Materials', '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', 'label': 'Stock UOM',
'oldfieldname': 'stock_uom', 'oldfieldname': 'stock_uom',
'oldfieldtype': 'Link', 'oldfieldtype': 'Link',
'options': 'UOM' 'options': 'UOM',
'search_index': 0
}, },
# DocField # DocField

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

@@ -131,7 +131,7 @@
'oldfieldtype': 'Date', 'oldfieldtype': 'Date',
'permlevel': 0, 'permlevel': 0,
'reqd': 1, 'reqd': 1,
'search_index': 1, 'search_index': 0,
'width': '100px' 'width': '100px'
}, },
@@ -146,6 +146,7 @@
'oldfieldtype': 'Link', 'oldfieldtype': 'Link',
'options': 'Bill Of Materials', 'options': 'Bill Of Materials',
'permlevel': 0, 'permlevel': 0,
'search_index': 0,
'width': '100px' 'width': '100px'
}, },

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

@@ -180,6 +180,7 @@
'options': 'Bill Of Materials', 'options': 'Bill Of Materials',
'permlevel': 1, 'permlevel': 1,
'reqd': 1, 'reqd': 1,
'search_index': 0,
'trigger': 'Client' 'trigger': 'Client'
}, },
@@ -306,7 +307,8 @@
'oldfieldtype': 'Link', 'oldfieldtype': 'Link',
'options': 'Warehouse', 'options': 'Warehouse',
'permlevel': 0, 'permlevel': 0,
'reqd': 1 'reqd': 1,
'search_index': 0
}, },
# DocField # DocField
@@ -323,7 +325,8 @@
'oldfieldtype': 'Link', 'oldfieldtype': 'Link',
'options': 'Warehouse', 'options': 'Warehouse',
'permlevel': 0, 'permlevel': 0,
'reqd': 1 'reqd': 1,
'search_index': 0
}, },
# DocField # DocField
@@ -367,7 +370,8 @@
'oldfieldtype': 'Link', 'oldfieldtype': 'Link',
'options': 'Company', 'options': 'Company',
'permlevel': 0, 'permlevel': 0,
'reqd': 1 'reqd': 1,
'search_index': 0
}, },
# DocField # DocField

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

@@ -86,7 +86,8 @@
'oldfieldname': 'state', 'oldfieldname': 'state',
'oldfieldtype': 'Link', 'oldfieldtype': 'Link',
'options': 'State', 'options': 'State',
'permlevel': 0 'permlevel': 0,
'search_index': 0
}, },
# DocField # DocField
@@ -100,7 +101,8 @@
'oldfieldtype': 'Link', 'oldfieldtype': 'Link',
'options': 'Territory', 'options': 'Territory',
'permlevel': 1, 'permlevel': 1,
'print_hide': 1 'print_hide': 1,
'search_index': 0
}, },
# DocField # DocField

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

@@ -94,7 +94,8 @@
'oldfieldname': 'project_name', 'oldfieldname': 'project_name',
'oldfieldtype': 'Data', 'oldfieldtype': 'Data',
'permlevel': 0, 'permlevel': 0,
'reqd': 1 'reqd': 1,
'search_index': 1
}, },
# DocField # DocField
@@ -112,7 +113,7 @@
'options': 'Open\nCompleted\nCancelled', 'options': 'Open\nCompleted\nCancelled',
'permlevel': 0, 'permlevel': 0,
'reqd': 1, 'reqd': 1,
'search_index': 1 'search_index': 0
}, },
# DocField # DocField
@@ -356,7 +357,7 @@
'oldfieldname': 'customer_name', 'oldfieldname': 'customer_name',
'oldfieldtype': 'Data', 'oldfieldtype': 'Data',
'permlevel': 1, 'permlevel': 1,
'search_index': 1 'search_index': 0
}, },
# DocField # DocField
@@ -401,6 +402,7 @@
'options': 'Territory', 'options': 'Territory',
'permlevel': 0, 'permlevel': 0,
'reqd': 0, 'reqd': 0,
'search_index': 0,
'trigger': 'Client' 'trigger': 'Client'
}, },
@@ -438,7 +440,8 @@
'oldfieldname': 'customer_group', 'oldfieldname': 'customer_group',
'oldfieldtype': 'Link', 'oldfieldtype': 'Link',
'options': 'Customer Group', 'options': 'Customer Group',
'permlevel': 1 'permlevel': 1,
'search_index': 0
}, },
# DocField # DocField

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

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

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

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

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

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

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

@@ -187,7 +187,7 @@
'permlevel': 0, 'permlevel': 0,
'print_hide': 1, 'print_hide': 1,
'reqd': 0, 'reqd': 0,
'search_index': 0, 'search_index': 1,
'trigger': 'Client' 'trigger': 'Client'
}, },
@@ -244,6 +244,7 @@
'options': 'Lead', 'options': 'Lead',
'permlevel': 0, 'permlevel': 0,
'print_hide': 1, 'print_hide': 1,
'search_index': 1,
'trigger': 'Client' 'trigger': 'Client'
}, },
@@ -326,6 +327,7 @@
'oldfieldtype': 'Date', 'oldfieldtype': 'Date',
'permlevel': 0, 'permlevel': 0,
'reqd': 1, 'reqd': 1,
'search_index': 1,
'width': '50px' 'width': '50px'
}, },
@@ -405,7 +407,7 @@
'permlevel': 0, 'permlevel': 0,
'print_hide': 1, 'print_hide': 1,
'reqd': 1, 'reqd': 1,
'search_index': 1, 'search_index': 0,
'trigger': 'Client' 'trigger': 'Client'
}, },
@@ -426,7 +428,7 @@
'permlevel': 0, 'permlevel': 0,
'print_hide': 1, 'print_hide': 1,
'reqd': 0, 'reqd': 0,
'search_index': 1, 'search_index': 0,
'trigger': 'Client' 'trigger': 'Client'
}, },
@@ -492,7 +494,7 @@
'permlevel': 0, 'permlevel': 0,
'print_hide': 1, 'print_hide': 1,
'reqd': 1, 'reqd': 1,
'search_index': 1 'search_index': 0
}, },
# DocField # DocField
@@ -509,7 +511,7 @@
'permlevel': 0, 'permlevel': 0,
'print_hide': 1, 'print_hide': 1,
'reqd': 1, 'reqd': 1,
'search_index': 1 'search_index': 0
}, },
# DocField # DocField

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

@@ -90,7 +90,8 @@
'oldfieldname': 'item_group', 'oldfieldname': 'item_group',
'oldfieldtype': 'Link', 'oldfieldtype': 'Link',
'options': 'Item Group', 'options': 'Item Group',
'print_hide': 1 'print_hide': 1,
'search_index': 0
}, },
# DocField # DocField
@@ -104,7 +105,8 @@
'oldfieldname': 'brand', 'oldfieldname': 'brand',
'oldfieldtype': 'Link', 'oldfieldtype': 'Link',
'options': 'Brand', 'options': 'Brand',
'print_hide': 1 'print_hide': 1,
'search_index': 0
}, },
# DocField # DocField
@@ -140,6 +142,7 @@
'label': 'UOM', 'label': 'UOM',
'oldfieldname': 'uom', 'oldfieldname': 'uom',
'oldfieldtype': 'Link', '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', 'oldfieldtype': 'Data',
'permlevel': 1, 'permlevel': 1,
'reqd': 0, 'reqd': 0,
'search_index': 1 'search_index': 0
}, },
# DocField # DocField
@@ -257,7 +257,7 @@
'permlevel': 0, 'permlevel': 0,
'print_hide': 1, 'print_hide': 1,
'reqd': 1, 'reqd': 1,
'search_index': 1 'search_index': 0
}, },
# DocField # DocField
@@ -292,7 +292,8 @@
'oldfieldname': 'inst_date', 'oldfieldname': 'inst_date',
'oldfieldtype': 'Date', 'oldfieldtype': 'Date',
'permlevel': 0, 'permlevel': 0,
'reqd': 1 'reqd': 1,
'search_index': 1
}, },
# DocField # DocField
@@ -340,7 +341,7 @@
'permlevel': 0, 'permlevel': 0,
'print_hide': 1, 'print_hide': 1,
'reqd': 1, 'reqd': 1,
'search_index': 1, 'search_index': 0,
'trigger': 'Client' 'trigger': 'Client'
}, },

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

@@ -140,7 +140,7 @@
'oldfieldtype': 'Data', 'oldfieldtype': 'Data',
'permlevel': 1, 'permlevel': 1,
'print_hide': 1, 'print_hide': 1,
'search_index': 1, 'search_index': 0,
'width': '150px' '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", 'options': "\nExisting Customer\nReference\nAdvertisement\nCold Calling\nExhibition\nSupplier Reference\nMass Mailing\nCustomer's Vendor\nCampaign\nWebsite",
'permlevel': 0, 'permlevel': 0,
'reqd': 1, 'reqd': 1,
'search_index': 1, 'search_index': 0,
'trigger': 'Client' 'trigger': 'Client'
}, },
@@ -239,7 +239,7 @@
'oldfieldtype': 'Data', 'oldfieldtype': 'Data',
'permlevel': 0, 'permlevel': 0,
'reqd': 0, 'reqd': 0,
'search_index': 1, 'search_index': 0,
'trigger': 'Client' 'trigger': 'Client'
}, },
@@ -350,7 +350,7 @@
'options': '\nHot\nWarm\nCold', 'options': '\nHot\nWarm\nCold',
'permlevel': 0, 'permlevel': 0,
'reqd': 0, 'reqd': 0,
'search_index': 1 'search_index': 0
}, },
# DocField # DocField
@@ -616,7 +616,7 @@
'oldfieldtype': 'Link', 'oldfieldtype': 'Link',
'options': 'Profile', 'options': 'Profile',
'permlevel': 0, 'permlevel': 0,
'search_index': 1 'search_index': 0
}, },
# DocField # DocField
@@ -633,7 +633,7 @@
'options': '\nLower Income\nMiddle Income\nUpper Income', 'options': '\nLower Income\nMiddle Income\nUpper Income',
'permlevel': 0, 'permlevel': 0,
'reqd': 0, 'reqd': 0,
'search_index': 1 'search_index': 0
}, },
# DocField # DocField

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

@@ -414,7 +414,7 @@
'permlevel': 0, 'permlevel': 0,
'print_hide': 0, 'print_hide': 0,
'reqd': 1, 'reqd': 1,
'search_index': 1 'search_index': 0
}, },
# DocField # DocField
@@ -435,7 +435,7 @@
'permlevel': 1, 'permlevel': 1,
'print_hide': 1, 'print_hide': 1,
'reqd': 1, 'reqd': 1,
'search_index': 1 'search_index': 0
}, },
# DocField # DocField
@@ -520,7 +520,7 @@
'permlevel': 0, 'permlevel': 0,
'print_hide': 1, 'print_hide': 1,
'reqd': 1, 'reqd': 1,
'search_index': 1, 'search_index': 0,
'trigger': 'Client' 'trigger': 'Client'
}, },
@@ -539,7 +539,7 @@
'permlevel': 0, 'permlevel': 0,
'print_hide': 1, 'print_hide': 1,
'reqd': 0, 'reqd': 0,
'search_index': 1, 'search_index': 0,
'trigger': 'Client' 'trigger': 'Client'
}, },
@@ -584,7 +584,7 @@
'permlevel': 0, 'permlevel': 0,
'print_hide': 1, 'print_hide': 1,
'reqd': 1, 'reqd': 1,
'search_index': 1, 'search_index': 0,
'trigger': 'Client', 'trigger': 'Client',
'width': '100px' 'width': '100px'
}, },
@@ -1035,7 +1035,7 @@
'permlevel': 0, 'permlevel': 0,
'print_hide': 1, 'print_hide': 1,
'reqd': 1, 'reqd': 1,
'search_index': 1, 'search_index': 0,
'trigger': 'Client', 'trigger': 'Client',
'width': '150px' 'width': '150px'
}, },
@@ -1055,7 +1055,7 @@
'permlevel': 0, 'permlevel': 0,
'print_hide': 1, 'print_hide': 1,
'reqd': 1, 'reqd': 1,
'search_index': 1 'search_index': 0
}, },
# DocField # DocField

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

@@ -73,7 +73,7 @@
'permlevel': 0, 'permlevel': 0,
'print_hide': 1, 'print_hide': 1,
'reqd': 1, 'reqd': 1,
'search_index': 1, 'search_index': 0,
'width': '150px' 'width': '150px'
}, },
@@ -260,7 +260,7 @@
'options': 'Item Group', 'options': 'Item Group',
'permlevel': 1, 'permlevel': 1,
'print_hide': 1, 'print_hide': 1,
'search_index': 1 'search_index': 0
}, },
# DocField # DocField
@@ -276,7 +276,7 @@
'options': 'Brand', 'options': 'Brand',
'permlevel': 1, 'permlevel': 1,
'print_hide': 1, 'print_hide': 1,
'search_index': 1, 'search_index': 0,
'width': '150px' 'width': '150px'
}, },

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

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

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

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

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

@@ -79,7 +79,8 @@
'oldfieldname': 'company', 'oldfieldname': 'company',
'oldfieldtype': 'Link', 'oldfieldtype': 'Link',
'options': 'Company', 'options': 'Company',
'reqd': 0 'reqd': 0,
'search_index': 0
}, },
# DocField # DocField
@@ -157,7 +158,8 @@
'label': 'Applicable To (Employee)', 'label': 'Applicable To (Employee)',
'oldfieldname': 'to_emp', 'oldfieldname': 'to_emp',
'oldfieldtype': 'Link', 'oldfieldtype': 'Link',
'options': 'Employee' 'options': 'Employee',
'search_index': 0
}, },
# DocField # DocField
@@ -171,7 +173,8 @@
'label': 'Applicable To (Designation)', 'label': 'Applicable To (Designation)',
'oldfieldname': 'to_designation', 'oldfieldname': 'to_designation',
'oldfieldtype': 'Link', 'oldfieldtype': 'Link',
'options': 'Designation' 'options': 'Designation',
'search_index': 0
}, },
# DocField # DocField

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

@@ -5,7 +5,7 @@
{ {
'creation': '2010-08-08 17:08:55', 'creation': '2010-08-08 17:08:55',
'docstatus': 0, 'docstatus': 0,
'modified': '2011-07-06 11:42:34', 'modified': '2011-07-01 17:43:29',
'modified_by': 'Administrator', 'modified_by': 'Administrator',
'owner': 'Administrator' 'owner': 'Administrator'
}, },

72
setup/doctype/email_settings/email_settings.py
View File

@@ -1,44 +1,42 @@
# Please edit this list and import only required elements
import webnotes import webnotes
from webnotes.utils import add_days, add_months, add_years, cint, cstr, date_diff, default_fields, flt, fmt_money, formatdate, generate_hash, getTraceback, get_defaults, get_first_day, get_last_day, getdate, has_common, month_name, now, nowdate, replace_newlines, sendmail, set_default, str_esc_quote, user_format, validate_email_add
from webnotes.model import db_exists
from webnotes.model.doc import Document, addchild, removechild, getchildren, make_autoname, SuperDocType
from webnotes.model.doclist import getlist, copy_doclist
from webnotes.model.code import get_obj, get_server_obj, run_server_obj, updatedb, check_syntax
from webnotes import session, form, is_testing, msgprint, errprint
set = webnotes.conn.set
sql = webnotes.conn.sql sql = webnotes.conn.sql
get_value = webnotes.conn.get_value
in_transaction = webnotes.conn.in_transaction
convert_to_lists = webnotes.conn.convert_to_lists
# ----------------------------------------------------------------------------------------- from webnotes.utils import cint, cstr
class DocType: class DocType:
def __init__(self,doc,doclist): def __init__(self,doc,doclist):
self.doc,self.doclist = doc,doclist self.doc,self.doclist = doc,doclist
def set_vals(self): def set_vals(self):
res = sql("select field, value from `tabSingles` where doctype = 'Control Panel' and field IN ('outgoing_mail_server','mail_login','mail_password','auto_email_id','mail_port','use_ssl')") res = sql("select field, value from `tabSingles` where doctype = 'Control Panel' and field IN ('outgoing_mail_server','mail_login','mail_password','auto_email_id','mail_port','use_ssl')")
ret = {} ret = {}
for r in res: for r in res:
ret[cstr(r[0])]=r[1] and cstr(r[1]) or '' ret[cstr(r[0])]=r[1] and cstr(r[1]) or ''
return str(ret) return str(ret)
def on_update(self): def set_cp_value(self, key):
if self.doc.outgoing_mail_server: """
sql("update `tabSingles` set value ='%s' where doctype = 'Control Panel' and field = 'outgoing_mail_server'"%self.doc.outgoing_mail_server) Update value in control panel
if self.doc.mail_login: """
sql("update `tabSingles` set value ='%s' where doctype = 'Control Panel' and field = 'mail_login'"%self.doc.mail_login) if self.doc.fields.get(key):
if self.doc.mail_password: webnotes.conn.set_value('Control Panel', None, key, self.doc.fields[key])
sql("update `tabSingles` set value ='%s' where doctype = 'Control Panel' and field = 'mail_password'"%self.doc.mail_password)
if self.doc.auto_email_id: def on_update(self):
sql("update `tabSingles` set value ='%s' where doctype = 'Control Panel' and field = 'auto_email_id'"%self.doc.auto_email_id) """
if self.doc.mail_port: Sets or cancels the event in the scheduler
sql("update `tabSingles` set value ='%s' where doctype = 'Control Panel' and field = 'mail_port'"%self.doc.mail_port) """
if self.doc.use_ssl: # update control panel
sql("update `tabSingles` set value ='%s' where doctype = 'Control Panel' and field = 'use_ssl'"%self.doc.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:
from webnotes.utils.scheduler import cancel_event
cancel_event('support.doctype.support_ticket.get_support_mails')

152
setup/doctype/email_settings/email_settings.txt
View File

@@ -5,14 +5,14 @@
{ {
'creation': '2010-08-08 17:08:59', 'creation': '2010-08-08 17:08:59',
'docstatus': 0, 'docstatus': 0,
'modified': '2011-01-04 11:21:25', 'modified': '2011-07-25 15:03:51',
'modified_by': 'umair@iwebnotes.com', 'modified_by': 'Administrator',
'owner': 'harshada@webnotestech.com' 'owner': 'harshada@webnotestech.com'
}, },
# These values are common for all DocType # These values are common for all DocType
{ {
'_last_update': '1307707462', '_last_update': '1311586371',
'allow_copy': 1, 'allow_copy': 1,
'allow_email': 1, 'allow_email': 1,
'allow_print': 1, 'allow_print': 1,
@@ -24,7 +24,7 @@
'name': '__common__', 'name': '__common__',
'section_style': 'Simple', 'section_style': 'Simple',
'server_code_error': ' ', 'server_code_error': ' ',
'version': 27 'version': 34
}, },
# These values are common for all DocField # These values are common for all DocField
@@ -69,12 +69,29 @@
'idx': 2 'idx': 2
}, },
# DocField
{
'doctype': 'DocField',
'fieldtype': 'Section Break',
'idx': 1,
'label': 'Outgoing Mails'
},
# DocField
{
'doctype': 'DocField',
'fieldtype': 'HTML',
'idx': 2,
'label': '1',
'options': '<div class="help_box">Set your outgoing mail settings here. All system generated notifications, emails will go from this mail server</div>'
},
# DocField # DocField
{ {
'doctype': 'DocField', 'doctype': 'DocField',
'fieldname': 'outgoing_mail_server', 'fieldname': 'outgoing_mail_server',
'fieldtype': 'Data', 'fieldtype': 'Data',
'idx': 1, 'idx': 3,
'label': 'Outgoing Mail Server' 'label': 'Outgoing Mail Server'
}, },
@@ -83,7 +100,7 @@
'doctype': 'DocField', 'doctype': 'DocField',
'fieldname': 'mail_port', 'fieldname': 'mail_port',
'fieldtype': 'Data', 'fieldtype': 'Data',
'idx': 2, 'idx': 4,
'label': 'Mail Port' 'label': 'Mail Port'
}, },
@@ -92,7 +109,7 @@
'doctype': 'DocField', 'doctype': 'DocField',
'fieldname': 'use_ssl', 'fieldname': 'use_ssl',
'fieldtype': 'Check', 'fieldtype': 'Check',
'idx': 3, 'idx': 5,
'label': 'Use SSL' 'label': 'Use SSL'
}, },
@@ -101,7 +118,7 @@
'doctype': 'DocField', 'doctype': 'DocField',
'fieldname': 'mail_login', 'fieldname': 'mail_login',
'fieldtype': 'Data', 'fieldtype': 'Data',
'idx': 4, 'idx': 6,
'label': 'Login Id' 'label': 'Login Id'
}, },
@@ -110,7 +127,7 @@
'doctype': 'DocField', 'doctype': 'DocField',
'fieldname': 'mail_password', 'fieldname': 'mail_password',
'fieldtype': 'Password', 'fieldtype': 'Password',
'idx': 5, 'idx': 7,
'label': 'Mail Password' 'label': 'Mail Password'
}, },
@@ -119,7 +136,122 @@
'doctype': 'DocField', 'doctype': 'DocField',
'fieldname': 'auto_email_id', 'fieldname': 'auto_email_id',
'fieldtype': 'Data', 'fieldtype': 'Data',
'idx': 6, 'idx': 8,
'label': 'Auto Email Id' 'label': 'Auto Email Id'
},
# DocField
{
'description': 'Set the POP3 email settings to pull emails directly from a mailbox and create Support Tickets',
'doctype': 'DocField',
'fieldtype': 'Section Break',
'idx': 9,
'label': 'Support Ticket Mail Settings'
},
# DocField
{
'doctype': 'DocField',
'fieldtype': 'HTML',
'idx': 10,
'label': '2',
'options': '<div class="help_box">To automatically create Support Tickets from your incoming mail, set your pop3 settings here.</div>'
},
# DocField
{
'doctype': 'DocField',
'fieldtype': 'Section Break',
'idx': 11,
'options': 'Simple'
},
# DocField
{
'colour': 'White:FFF',
'description': 'Check this to pull emails from your mailbox',
'doctype': 'DocField',
'fieldname': 'sync_support_mails',
'fieldtype': 'Check',
'idx': 12,
'label': 'Sync Support Mails'
},
# DocField
{
'colour': 'White:FFF',
'description': 'Your support email id - must be a valid email - this is where your emails will come!',
'doctype': 'DocField',
'fieldname': 'support_email',
'fieldtype': 'Data',
'idx': 13,
'label': 'Support Email'
},
# DocField
{
'colour': 'White:FFF',
'description': 'POP3 mail server (e.g. pop.gmail.com)',
'doctype': 'DocField',
'fieldname': 'support_host',
'fieldtype': 'Data',
'idx': 14,
'label': 'POP3 Mail Server'
},
# DocField
{
'doctype': 'DocField',
'fieldname': 'support_use_ssl',
'fieldtype': 'Check',
'idx': 15,
'label': 'Use SSL'
},
# DocField
{
'doctype': 'DocField',
'fieldname': 'support_username',
'fieldtype': 'Data',
'idx': 16,
'label': 'User Name'
},
# DocField
{
'doctype': 'DocField',
'fieldname': 'support_password',
'fieldtype': 'Password',
'idx': 17,
'label': 'Support Password'
},
# DocField
{
'doctype': 'DocField',
'fieldtype': 'Column Break',
'idx': 18
},
# DocField
{
'colour': 'White:FFF',
'description': 'Signature to be appended at the end of every email',
'doctype': 'DocField',
'fieldname': 'support_signature',
'fieldtype': 'Text',
'idx': 19,
'label': 'Signature'
},
# DocField
{
'colour': 'White:FFF',
'description': 'Autoreply when a new mail is received',
'doctype': 'DocField',
'fieldname': 'support_autoreply',
'fieldtype': 'Text',
'idx': 20,
'label': 'Autoreply'
} }
] ]

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

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

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

@@ -160,7 +160,7 @@
'oldfieldtype': 'Data', 'oldfieldtype': 'Data',
'permlevel': 0, 'permlevel': 0,
'reqd': 1, 'reqd': 1,
'search_index': 1 'search_index': 0
}, },
# DocField # DocField
@@ -186,7 +186,7 @@
'options': 'Company', 'options': 'Company',
'permlevel': 0, 'permlevel': 0,
'reqd': 1, 'reqd': 1,
'search_index': 1 'search_index': 0
}, },
# DocField # DocField

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

@@ -191,7 +191,7 @@
'oldfieldtype': 'Select', 'oldfieldtype': 'Select',
'options': '\nChannel Partner\nDistributor\nDealer\nAgent\nRetailer\nImplementation Partner\nReseller', 'options': '\nChannel Partner\nDistributor\nDealer\nAgent\nRetailer\nImplementation Partner\nReseller',
'permlevel': 0, 'permlevel': 0,
'search_index': 1 'search_index': 0
}, },
# DocField # DocField

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

@@ -156,7 +156,7 @@
'oldfieldtype': 'Data', 'oldfieldtype': 'Data',
'permlevel': 0, 'permlevel': 0,
'reqd': 1, 'reqd': 1,
'search_index': 1 'search_index': 0
}, },
# DocField # DocField
@@ -281,7 +281,7 @@
'oldfieldtype': 'Select', 'oldfieldtype': 'Select',
'options': 'link:Country', 'options': 'link:Country',
'permlevel': 0, 'permlevel': 0,
'search_index': 1, 'search_index': 0,
'trigger': 'Client' 'trigger': 'Client'
}, },
@@ -297,7 +297,7 @@
'oldfieldtype': 'Select', 'oldfieldtype': 'Select',
'options': 'link:State', 'options': 'link:State',
'permlevel': 0, 'permlevel': 0,
'search_index': 1 'search_index': 0
}, },
# DocField # DocField
@@ -324,7 +324,8 @@
'oldfieldname': 'territory', 'oldfieldname': 'territory',
'oldfieldtype': 'Link', 'oldfieldtype': 'Link',
'options': 'Territory', 'options': 'Territory',
'permlevel': 0 'permlevel': 0,
'search_index': 0
}, },
# DocField # DocField
@@ -397,7 +398,8 @@
'oldfieldname': 'distribution_id', 'oldfieldname': 'distribution_id',
'oldfieldtype': 'Link', 'oldfieldtype': 'Link',
'options': 'Budget Distribution', 'options': 'Budget Distribution',
'permlevel': 0 'permlevel': 0,
'search_index': 0
}, },
# DocField # DocField

0
setup/doctype/support_email_settings/__init__.py
View File

18
setup/doctype/support_email_settings/support_email_settings.py
View File

@@ -1,18 +0,0 @@
import webnotes
from webnotes.utils import cint
class DocType:
def __init__(self,dt,dn):
self.doc, self.doctype = dt,dn
def on_update(self):
"""
Sets or cancels the event in the scheduler
"""
if cint(self.doc.integrate_incoming):
from webnotes.utils.scheduler import set_event
set_event('support.doctype.support_ticket.get_support_mails', 60*5, 1)
else:
from webnotes.utils.scheduler import cancel_event
cancel_event('support.doctype.support_ticket.get_support_mails')

144
setup/doctype/support_email_settings/support_email_settings.txt
View File

@@ -1,144 +0,0 @@
# DocType, Support Email Settings
[
# These values are common in all dictionaries
{
'creation': '2011-05-23 14:50:45',
'docstatus': 0,
'modified': '2011-05-28 09:25:53',
'modified_by': 'Administrator',
'owner': 'Administrator'
},
# These values are common for all DocType
{
'_last_update': '1306554355',
'colour': 'White:FFF',
'doctype': 'DocType',
'in_dialog': 1,
'issingle': 1,
'module': 'Setup',
'name': '__common__',
'read_only': 1,
'section_style': 'Simple',
'show_in_menu': 1,
'version': 8
},
# These values are common for all DocField
{
'doctype': 'DocField',
'name': '__common__',
'parent': 'Support Email Settings',
'parentfield': 'fields',
'parenttype': 'DocType',
'permlevel': 0
},
# These values are common for all DocPerm
{
'create': 1,
'doctype': 'DocPerm',
'idx': 1,
'name': '__common__',
'parent': 'Support Email Settings',
'parentfield': 'permissions',
'parenttype': 'DocType',
'permlevel': 0,
'read': 1,
'role': 'System Manager',
'write': 1
},
# DocType, Support Email Settings
{
'doctype': 'DocType',
'name': 'Support Email Settings'
},
# DocPerm
{
'doctype': 'DocPerm'
},
# DocField
{
'colour': 'White:FFF',
'description': 'The full email id of your incoming support emails',
'doctype': 'DocField',
'fieldname': 'email',
'fieldtype': 'Data',
'idx': 1,
'label': 'Email',
'options': 'Email'
},
# DocField
{
'colour': 'White:FFF',
'description': 'By checking this, your incoming mails will automatically be integrated with the Support Ticket',
'doctype': 'DocField',
'fieldname': 'integrate_incoming',
'fieldtype': 'Check',
'idx': 2,
'label': 'Integrate Incoming'
},
# DocField
{
'colour': 'White:FFF',
'description': 'Signature appended to the outgoing email (Text / HTML)',
'doctype': 'DocField',
'fieldname': 'signature',
'fieldtype': 'Text',
'idx': 3,
'label': 'Signature'
},
# DocField
{
'doctype': 'DocField',
'fieldtype': 'Column Break',
'idx': 4
},
# DocField
{
'doctype': 'DocField',
'fieldname': 'use_ssl',
'fieldtype': 'Check',
'idx': 5,
'label': 'Use SSL'
},
# DocField
{
'colour': 'White:FFF',
'description': 'eg. pop.gmail.com',
'doctype': 'DocField',
'fieldname': 'host',
'fieldtype': 'Data',
'idx': 6,
'label': 'Host'
},
# DocField
{
'colour': 'White:FFF',
'description': 'Support Email Id',
'doctype': 'DocField',
'fieldname': 'username',
'fieldtype': 'Data',
'idx': 7,
'label': 'Username'
},
# DocField
{
'doctype': 'DocField',
'fieldname': 'password',
'fieldtype': 'Password',
'idx': 8,
'label': 'Password'
}
]

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

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

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

@@ -160,7 +160,7 @@
'oldfieldtype': 'Link', 'oldfieldtype': 'Link',
'options': 'Sales Person', 'options': 'Sales Person',
'permlevel': 0, 'permlevel': 0,
'search_index': 1 'search_index': 0
}, },
# DocField # DocField
@@ -267,7 +267,8 @@
'oldfieldname': 'distribution_id', 'oldfieldname': 'distribution_id',
'oldfieldtype': 'Link', 'oldfieldtype': 'Link',
'options': 'Budget Distribution', 'options': 'Budget Distribution',
'permlevel': 0 'permlevel': 0,
'search_index': 0
}, },
# DocField # DocField

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

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

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

@@ -183,6 +183,7 @@ SetupData = function(cnty){
['Country',1,'Country','','Country master'], ['Country',1,'Country','','Country master'],
['State',1,'State','','State master'], ['State',1,'State','','State master'],
['Rename Tool',3,'Rename Tool','','Rename a record'], ['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'], ['Activty Type',1,'Activity Type','','Types of activities that you can select in your Timesheet'],
['City',1,'City','','City master']]}; ['City',1,'City','','City master']]};

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

@@ -162,7 +162,7 @@
'label': 'Reserved Quantity', 'label': 'Reserved Quantity',
'oldfieldname': 'reserved_qty', 'oldfieldname': 'reserved_qty',
'oldfieldtype': 'Currency', 'oldfieldtype': 'Currency',
'search_index': 1 'search_index': 0
}, },
# DocField # DocField
@@ -176,7 +176,7 @@
'label': 'Actual Quantity', 'label': 'Actual Quantity',
'oldfieldname': 'actual_qty', 'oldfieldname': 'actual_qty',
'oldfieldtype': 'Currency', 'oldfieldtype': 'Currency',
'search_index': 1 'search_index': 0
}, },
# DocField # DocField
@@ -190,7 +190,7 @@
'label': 'Ordered Quantity', 'label': 'Ordered Quantity',
'oldfieldname': 'ordered_qty', 'oldfieldname': 'ordered_qty',
'oldfieldtype': 'Currency', 'oldfieldtype': 'Currency',
'search_index': 1 'search_index': 0
}, },
# DocField # DocField
@@ -204,7 +204,7 @@
'label': 'Indented Quantity', 'label': 'Indented Quantity',
'oldfieldname': 'indented_qty', 'oldfieldname': 'indented_qty',
'oldfieldtype': 'Currency', 'oldfieldtype': 'Currency',
'search_index': 1 'search_index': 0
}, },
# DocField # DocField
@@ -217,7 +217,7 @@
'label': 'Planned Qty', 'label': 'Planned Qty',
'oldfieldname': 'planned_qty', 'oldfieldname': 'planned_qty',
'oldfieldtype': 'Currency', 'oldfieldtype': 'Currency',
'search_index': 1 'search_index': 0
}, },
# DocField # DocField
@@ -258,7 +258,7 @@
'label': 'UOM', 'label': 'UOM',
'oldfieldname': 'stock_uom', 'oldfieldname': 'stock_uom',
'oldfieldtype': 'Data', 'oldfieldtype': 'Data',
'search_index': 1 'search_index': 0
}, },
# DocField # DocField

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

@@ -332,7 +332,7 @@
'permlevel': 0, 'permlevel': 0,
'print_hide': 0, 'print_hide': 0,
'reqd': 1, 'reqd': 1,
'search_index': 1, 'search_index': 0,
'width': '100px' 'width': '100px'
}, },
@@ -352,7 +352,7 @@
'permlevel': 1, 'permlevel': 1,
'print_hide': 1, 'print_hide': 1,
'reqd': 1, 'reqd': 1,
'search_index': 1, 'search_index': 0,
'width': '150px' 'width': '150px'
}, },
@@ -372,7 +372,7 @@
'oldfieldtype': 'Currency', 'oldfieldtype': 'Currency',
'permlevel': 1, 'permlevel': 1,
'print_hide': 1, 'print_hide': 1,
'search_index': 1 'search_index': 0
}, },
# DocField # DocField
@@ -391,7 +391,7 @@
'oldfieldtype': 'Currency', 'oldfieldtype': 'Currency',
'permlevel': 1, 'permlevel': 1,
'print_hide': 1, 'print_hide': 1,
'search_index': 1 'search_index': 0
}, },
# DocField # DocField
@@ -439,7 +439,7 @@
'permlevel': 0, 'permlevel': 0,
'print_hide': 1, 'print_hide': 1,
'reqd': 1, 'reqd': 1,
'search_index': 1 'search_index': 0
}, },
# DocField # DocField
@@ -453,7 +453,7 @@
'options': 'Customer Group', 'options': 'Customer Group',
'permlevel': 0, 'permlevel': 0,
'print_hide': 1, 'print_hide': 1,
'search_index': 1 'search_index': 0
}, },
# DocField # DocField
@@ -1014,7 +1014,7 @@
'permlevel': 0, 'permlevel': 0,
'print_hide': 1, 'print_hide': 1,
'reqd': 1, 'reqd': 1,
'search_index': 1, 'search_index': 0,
'width': '150px' 'width': '150px'
}, },
@@ -1032,7 +1032,7 @@
'permlevel': 0, 'permlevel': 0,
'print_hide': 1, 'print_hide': 1,
'reqd': 1, 'reqd': 1,
'search_index': 1, 'search_index': 0,
'width': '150px' 'width': '150px'
}, },

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

@@ -285,7 +285,8 @@
'oldfieldtype': 'Link', 'oldfieldtype': 'Link',
'options': 'Batch', 'options': 'Batch',
'permlevel': 0, 'permlevel': 0,
'print_hide': 1 'print_hide': 1,
'search_index': 0
}, },
# DocField # DocField
@@ -299,7 +300,8 @@
'oldfieldtype': 'Link', 'oldfieldtype': 'Link',
'options': 'Item Group', 'options': 'Item Group',
'permlevel': 1, 'permlevel': 1,
'print_hide': 1 'print_hide': 1,
'search_index': 0
}, },
# DocField # DocField
@@ -314,6 +316,7 @@
'options': 'Brand', 'options': 'Brand',
'permlevel': 1, 'permlevel': 1,
'print_hide': 1, 'print_hide': 1,
'search_index': 0,
'width': '150px' 'width': '150px'
}, },
@@ -423,7 +426,7 @@
'oldfieldtype': 'Data', 'oldfieldtype': 'Data',
'permlevel': 1, 'permlevel': 1,
'print_hide': 1, 'print_hide': 1,
'search_index': 1, 'search_index': 0,
'width': '150px' 'width': '150px'
}, },
@@ -455,7 +458,7 @@
'oldfieldtype': 'Data', 'oldfieldtype': 'Data',
'permlevel': 1, 'permlevel': 1,
'print_hide': 1, 'print_hide': 1,
'search_index': 0, 'search_index': 1,
'width': '150px' 'width': '150px'
}, },

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

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

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

@@ -12,7 +12,7 @@
# These values are common for all DocType # These values are common for all DocType
{ {
'_last_update': '1308741898', '_last_update': '1309508838',
'allow_attach': 1, 'allow_attach': 1,
'allow_trash': 1, 'allow_trash': 1,
'autoname': 'field:item_code', 'autoname': 'field:item_code',
@@ -197,7 +197,7 @@
'oldfieldtype': 'Data', 'oldfieldtype': 'Data',
'permlevel': 0, 'permlevel': 0,
'reqd': 1, 'reqd': 1,
'search_index': 1 'search_index': 0
}, },
# DocField # DocField
@@ -241,7 +241,8 @@
'options': 'Brand', 'options': 'Brand',
'permlevel': 0, 'permlevel': 0,
'print_hide': 1, 'print_hide': 1,
'reqd': 0 'reqd': 0,
'search_index': 0
}, },
# DocField # DocField
@@ -312,7 +313,8 @@
'oldfieldtype': 'Link', 'oldfieldtype': 'Link',
'options': 'UOM', 'options': 'UOM',
'permlevel': 0, 'permlevel': 0,
'reqd': 1 'reqd': 1,
'search_index': 0
}, },
# DocField # DocField
@@ -355,7 +357,8 @@
'oldfieldname': 'default_warehouse', 'oldfieldname': 'default_warehouse',
'oldfieldtype': 'Link', 'oldfieldtype': 'Link',
'options': 'Warehouse', 'options': 'Warehouse',
'permlevel': 0 'permlevel': 0,
'search_index': 0
}, },
# DocField # DocField
@@ -556,6 +559,7 @@
'oldfieldtype': 'Link', 'oldfieldtype': 'Link',
'options': 'Account', 'options': 'Account',
'permlevel': 0, 'permlevel': 0,
'search_index': 0,
'trigger': 'Client' 'trigger': 'Client'
}, },
@@ -571,7 +575,8 @@
'oldfieldname': 'cost_center', 'oldfieldname': 'cost_center',
'oldfieldtype': 'Link', 'oldfieldtype': 'Link',
'options': 'Cost Center', 'options': 'Cost Center',
'permlevel': 0 'permlevel': 0,
'search_index': 0
}, },
# DocField # DocField
@@ -719,7 +724,8 @@
'idx': 43, 'idx': 43,
'label': 'Default Income Account', 'label': 'Default Income Account',
'options': 'Account', 'options': 'Account',
'permlevel': 0 'permlevel': 0,
'search_index': 0
}, },
# DocField # DocField
@@ -730,7 +736,8 @@
'idx': 44, 'idx': 44,
'label': 'Cost Center', 'label': 'Cost Center',
'options': 'Cost Center', 'options': 'Cost Center',
'permlevel': 0 'permlevel': 0,
'search_index': 0
}, },
# DocField # DocField
@@ -872,7 +879,8 @@
'oldfieldname': 'default_bom', 'oldfieldname': 'default_bom',
'oldfieldtype': 'Link', 'oldfieldtype': 'Link',
'options': 'Bill Of Materials', 'options': 'Bill Of Materials',
'permlevel': 1 'permlevel': 1,
'search_index': 0
}, },
# DocField # DocField
@@ -909,19 +917,6 @@
'reqd': 1 '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 # DocField
{ {
'doctype': 'DocField', 'doctype': 'DocField',

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

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

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

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

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

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

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

@@ -338,7 +338,7 @@
'oldfieldtype': 'Date', 'oldfieldtype': 'Date',
'permlevel': 0, 'permlevel': 0,
'reqd': 1, 'reqd': 1,
'search_index': 1, 'search_index': 0,
'trigger': 'Client', 'trigger': 'Client',
'width': '100px' 'width': '100px'
}, },
@@ -359,7 +359,7 @@
'permlevel': 1, 'permlevel': 1,
'print_hide': 1, 'print_hide': 1,
'reqd': 1, 'reqd': 1,
'search_index': 1, 'search_index': 0,
'width': '150px' 'width': '150px'
}, },
@@ -888,7 +888,7 @@
'permlevel': 0, 'permlevel': 0,
'print_hide': 1, 'print_hide': 1,
'reqd': 1, 'reqd': 1,
'search_index': 1, 'search_index': 0,
'width': '150px' 'width': '150px'
}, },
@@ -906,7 +906,7 @@
'permlevel': 0, 'permlevel': 0,
'print_hide': 1, 'print_hide': 1,
'reqd': 1, 'reqd': 1,
'search_index': 1, 'search_index': 0,
'width': '150px' 'width': '150px'
}, },

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

@@ -100,6 +100,7 @@
'options': 'UOM', 'options': 'UOM',
'permlevel': 0, 'permlevel': 0,
'reqd': 1, 'reqd': 1,
'search_index': 0,
'trigger': 'Client', 'trigger': 'Client',
'width': '100px' 'width': '100px'
}, },
@@ -324,6 +325,7 @@
'options': 'Batch', 'options': 'Batch',
'permlevel': 0, 'permlevel': 0,
'print_hide': 1, 'print_hide': 1,
'search_index': 0,
'trigger': 'Client' 'trigger': 'Client'
}, },
@@ -342,6 +344,7 @@
'options': 'Warehouse', 'options': 'Warehouse',
'permlevel': 1, 'permlevel': 1,
'print_hide': 1, 'print_hide': 1,
'search_index': 0,
'width': '100px' 'width': '100px'
}, },
@@ -358,7 +361,8 @@
'oldfieldtype': 'Link', 'oldfieldtype': 'Link',
'options': 'QA Inspection Report', 'options': 'QA Inspection Report',
'permlevel': 0, 'permlevel': 0,
'print_hide': 1 'print_hide': 1,
'search_index': 0
}, },
# DocField # DocField
@@ -373,7 +377,8 @@
'oldfieldtype': 'Link', 'oldfieldtype': 'Link',
'options': 'Brand', 'options': 'Brand',
'permlevel': 1, 'permlevel': 1,
'print_hide': 1 'print_hide': 1,
'search_index': 0
}, },
# DocField # DocField
@@ -390,7 +395,7 @@
'options': 'Item Group', 'options': 'Item Group',
'permlevel': 1, 'permlevel': 1,
'print_hide': 1, 'print_hide': 1,
'search_index': 1 'search_index': 0
}, },
# DocField # DocField
@@ -474,7 +479,7 @@
'permlevel': 1, 'permlevel': 1,
'print_hide': 1, 'print_hide': 1,
'reqd': 0, 'reqd': 0,
'search_index': 1, 'search_index': 0,
'width': '150px' 'width': '150px'
}, },

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

@@ -34,8 +34,7 @@
'parent': 'Ref Rate Detail', 'parent': 'Ref Rate Detail',
'parentfield': 'fields', 'parentfield': 'fields',
'parenttype': 'DocType', 'parenttype': 'DocType',
'permlevel': 0, 'permlevel': 0
'search_index': 1
}, },
# DocType, Ref Rate Detail # DocType, Ref Rate Detail
@@ -54,7 +53,8 @@
'oldfieldname': 'price_list_name', 'oldfieldname': 'price_list_name',
'oldfieldtype': 'Select', 'oldfieldtype': 'Select',
'options': 'link:Price List', 'options': 'link:Price List',
'reqd': 1 'reqd': 1,
'search_index': 1
}, },
# DocField # DocField
@@ -66,7 +66,8 @@
'label': 'Ref Rate', 'label': 'Ref Rate',
'oldfieldname': 'ref_rate', 'oldfieldname': 'ref_rate',
'oldfieldtype': 'Currency', 'oldfieldtype': 'Currency',
'reqd': 0 'reqd': 0,
'search_index': 0
}, },
# DocField # DocField
@@ -79,6 +80,7 @@
'oldfieldname': 'ref_currency', 'oldfieldname': 'ref_currency',
'oldfieldtype': 'Select', 'oldfieldtype': 'Select',
'options': 'link:Currency', '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', 'oldfieldname': 'stock_uom',
'oldfieldtype': 'Link', 'oldfieldtype': 'Link',
'options': 'UOM', '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', 'oldfieldname': 'uom',
'oldfieldtype': 'Link', 'oldfieldtype': 'Link',
'options': 'UOM', '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', 'oldfieldtype': 'Data',
'permlevel': 0, 'permlevel': 0,
'reqd': 1, 'reqd': 1,
'search_index': 1 'search_index': 0
}, },
# DocField # DocField
@@ -628,7 +628,7 @@
'oldfieldtype': 'Select', 'oldfieldtype': 'Select',
'options': '\nUnder Warranty\nOut of Warranty\nUnder AMC\nOut of AMC', 'options': '\nUnder Warranty\nOut of Warranty\nUnder AMC\nOut of AMC',
'permlevel': 0, 'permlevel': 0,
'search_index': 1, 'search_index': 0,
'width': '150px' 'width': '150px'
}, },
@@ -715,7 +715,7 @@
'options': 'link:Company', 'options': 'link:Company',
'permlevel': 0, 'permlevel': 0,
'reqd': 1, 'reqd': 1,
'search_index': 1 'search_index': 0
}, },
# DocField # DocField
@@ -729,7 +729,7 @@
'options': 'link:Fiscal Year', 'options': 'link:Fiscal Year',
'permlevel': 0, 'permlevel': 0,
'reqd': 1, 'reqd': 1,
'search_index': 1 'search_index': 0
}, },
# DocField # DocField

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

@@ -3,9 +3,9 @@
# These values are common in all dictionaries # These values are common in all dictionaries
{ {
'creation': '2009-05-12 16:46:45', 'creation': '2010-08-08 17:09:25',
'docstatus': 0, 'docstatus': 0,
'modified': '2011-07-10 14:12:39', 'modified': '2011-07-11 12:48:52',
'modified_by': 'Administrator', 'modified_by': 'Administrator',
'owner': 'Administrator' 'owner': 'Administrator'
}, },
@@ -76,7 +76,7 @@
'doctype': 'DocPerm', 'doctype': 'DocPerm',
'idx': 1, 'idx': 1,
'permlevel': 0, 'permlevel': 0,
'role': 'Material User', 'role': 'Material Manager',
'submit': 1, 'submit': 1,
'write': 1 'write': 1
}, },
@@ -89,28 +89,35 @@
'doctype': 'DocPerm', 'doctype': 'DocPerm',
'idx': 2, 'idx': 2,
'permlevel': 1, 'permlevel': 1,
'role': 'Material User', 'role': 'Material Manager',
'submit': 0, 'submit': 0,
'write': 0 'write': 0
}, },
# DocPerm # DocPerm
{ {
'create': 0, 'amend': 1,
'cancel': 1,
'create': 1,
'doctype': 'DocPerm', 'doctype': 'DocPerm',
'idx': 3, 'idx': 3,
'permlevel': 2, 'permlevel': 0,
'role': 'Production User', 'role': 'Material User',
'submit': 1,
'write': 1 'write': 1
}, },
# DocPerm # DocPerm
{ {
'amend': 0,
'cancel': 0,
'create': 0,
'doctype': 'DocPerm', 'doctype': 'DocPerm',
'idx': 4, 'idx': 4,
'permlevel': 2, 'permlevel': 1,
'role': 'Production Manager', 'role': 'Material User',
'write': 1 'submit': 0,
'write': 0
}, },
# DocPerm # DocPerm
@@ -134,13 +141,23 @@
'role': 'Production User' 'role': 'Production User'
}, },
# DocPerm
{
'create': 0,
'doctype': 'DocPerm',
'idx': 7,
'permlevel': 2,
'role': 'Production User',
'write': 1
},
# DocPerm # DocPerm
{ {
'amend': 1, 'amend': 1,
'cancel': 1, 'cancel': 1,
'create': 1, 'create': 1,
'doctype': 'DocPerm', 'doctype': 'DocPerm',
'idx': 7, 'idx': 8,
'permlevel': 0, 'permlevel': 0,
'role': 'Production Manager', 'role': 'Production Manager',
'submit': 1, 'submit': 1,
@@ -150,34 +167,17 @@
# DocPerm # DocPerm
{ {
'doctype': 'DocPerm', 'doctype': 'DocPerm',
'idx': 8, 'idx': 9,
'permlevel': 1, 'permlevel': 1,
'role': 'Production Manager' 'role': 'Production Manager'
}, },
# DocPerm # 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', 'doctype': 'DocPerm',
'idx': 10, 'idx': 10,
'permlevel': 0, 'permlevel': 2,
'role': 'Material Manager', 'role': 'Production Manager',
'submit': 1,
'write': 1 'write': 1
}, },
@@ -209,14 +209,13 @@
'doctype': 'DocField', 'doctype': 'DocField',
'fieldname': 'naming_series', 'fieldname': 'naming_series',
'fieldtype': 'Select', 'fieldtype': 'Select',
'hidden': 0,
'idx': 3, 'idx': 3,
'in_filter': 0, 'in_filter': 0,
'label': 'Series', 'label': 'Series',
'no_copy': 1, 'no_copy': 1,
'oldfieldname': 'naming_series', 'oldfieldname': 'naming_series',
'oldfieldtype': 'Select', 'oldfieldtype': 'Select',
'options': '\nSTE', 'options': 'STE',
'permlevel': 0, 'permlevel': 0,
'print_hide': 1, 'print_hide': 1,
'report_hide': 0, 'report_hide': 0,
@@ -231,7 +230,6 @@
'doctype': 'DocField', 'doctype': 'DocField',
'fieldname': 'amendment_date', 'fieldname': 'amendment_date',
'fieldtype': 'Date', 'fieldtype': 'Date',
'hidden': 0,
'idx': 4, 'idx': 4,
'in_filter': 0, 'in_filter': 0,
'label': 'Amendment Date', 'label': 'Amendment Date',
@@ -241,7 +239,6 @@
'permlevel': 0, 'permlevel': 0,
'print_hide': 1, 'print_hide': 1,
'report_hide': 0, 'report_hide': 0,
'reqd': 0,
'search_index': 0 'search_index': 0
}, },
@@ -252,7 +249,6 @@
'doctype': 'DocField', 'doctype': 'DocField',
'fieldname': 'purpose', 'fieldname': 'purpose',
'fieldtype': 'Select', 'fieldtype': 'Select',
'hidden': 0,
'idx': 5, 'idx': 5,
'in_filter': 1, 'in_filter': 1,
'label': 'Purpose', 'label': 'Purpose',
@@ -261,7 +257,6 @@
'oldfieldtype': 'Select', 'oldfieldtype': 'Select',
'options': 'Material Issue\nMaterial Receipt\nMaterial Transfer\nSales Return\nPurchase Return\nSubcontracting\nProduction Order', 'options': 'Material Issue\nMaterial Receipt\nMaterial Transfer\nSales Return\nPurchase Return\nSubcontracting\nProduction Order',
'permlevel': 0, 'permlevel': 0,
'print_hide': 0,
'report_hide': 0, 'report_hide': 0,
'reqd': 1, 'reqd': 1,
'search_index': 0, 'search_index': 0,
@@ -286,8 +281,7 @@
'permlevel': 0, 'permlevel': 0,
'print_hide': 1, 'print_hide': 1,
'report_hide': 0, 'report_hide': 0,
'reqd': 0, 'search_index': 1,
'search_index': 0,
'trigger': 'Client' 'trigger': 'Client'
}, },
@@ -309,8 +303,7 @@
'permlevel': 0, 'permlevel': 0,
'print_hide': 1, 'print_hide': 1,
'report_hide': 0, 'report_hide': 0,
'reqd': 0, 'search_index': 1,
'search_index': 0,
'trigger': 'Client' 'trigger': 'Client'
}, },
@@ -345,7 +338,6 @@
'permlevel': 0, 'permlevel': 0,
'print_hide': 1, 'print_hide': 1,
'report_hide': 0, 'report_hide': 0,
'reqd': 0,
'search_index': 0, 'search_index': 0,
'trigger': 'Client' 'trigger': 'Client'
}, },
@@ -356,7 +348,6 @@
'doctype': 'DocField', 'doctype': 'DocField',
'fieldname': 'supplier_name', 'fieldname': 'supplier_name',
'fieldtype': 'Data', 'fieldtype': 'Data',
'hidden': 0,
'idx': 10, 'idx': 10,
'in_filter': 0, 'in_filter': 0,
'label': 'Supplier Name', 'label': 'Supplier Name',
@@ -364,9 +355,7 @@
'oldfieldname': 'supplier_name', 'oldfieldname': 'supplier_name',
'oldfieldtype': 'Data', 'oldfieldtype': 'Data',
'permlevel': 1, 'permlevel': 1,
'print_hide': 0,
'report_hide': 0, 'report_hide': 0,
'reqd': 0,
'search_index': 0 'search_index': 0
}, },
@@ -385,9 +374,7 @@
'oldfieldname': 'supplier_address', 'oldfieldname': 'supplier_address',
'oldfieldtype': 'Small Text', 'oldfieldtype': 'Small Text',
'permlevel': 0, 'permlevel': 0,
'print_hide': 0,
'report_hide': 0, 'report_hide': 0,
'reqd': 0,
'search_index': 0, 'search_index': 0,
'trigger': 'Client' 'trigger': 'Client'
}, },
@@ -410,7 +397,6 @@
'permlevel': 0, 'permlevel': 0,
'print_hide': 1, 'print_hide': 1,
'report_hide': 0, 'report_hide': 0,
'reqd': 0,
'search_index': 0, 'search_index': 0,
'trigger': 'Client' 'trigger': 'Client'
}, },
@@ -429,9 +415,7 @@
'oldfieldname': 'customer_name', 'oldfieldname': 'customer_name',
'oldfieldtype': 'Data', 'oldfieldtype': 'Data',
'permlevel': 1, 'permlevel': 1,
'print_hide': 0,
'report_hide': 0, 'report_hide': 0,
'reqd': 0,
'search_index': 0 'search_index': 0
}, },
@@ -449,9 +433,7 @@
'oldfieldname': 'customer_address', 'oldfieldname': 'customer_address',
'oldfieldtype': 'Small Text', 'oldfieldtype': 'Small Text',
'permlevel': 0, 'permlevel': 0,
'print_hide': 0,
'report_hide': 0, 'report_hide': 0,
'reqd': 0,
'search_index': 0 'search_index': 0
}, },
@@ -473,7 +455,6 @@
'permlevel': 2, 'permlevel': 2,
'print_hide': 1, 'print_hide': 1,
'report_hide': 0, 'report_hide': 0,
'reqd': 0,
'search_index': 0, 'search_index': 0,
'trigger': 'Client' 'trigger': 'Client'
}, },
@@ -496,8 +477,7 @@
'permlevel': 2, 'permlevel': 2,
'print_hide': 1, 'print_hide': 1,
'report_hide': 0, 'report_hide': 0,
'reqd': 0, 'search_index': 1,
'search_index': 0,
'trigger': 'Client' 'trigger': 'Client'
}, },
@@ -507,7 +487,6 @@
'doctype': 'DocField', 'doctype': 'DocField',
'fieldname': 'fg_completed_qty', 'fieldname': 'fg_completed_qty',
'fieldtype': 'Currency', 'fieldtype': 'Currency',
'hidden': 0,
'idx': 17, 'idx': 17,
'in_filter': 0, 'in_filter': 0,
'label': 'FG Completed Qty', 'label': 'FG Completed Qty',
@@ -517,7 +496,6 @@
'permlevel': 2, 'permlevel': 2,
'print_hide': 1, 'print_hide': 1,
'report_hide': 0, 'report_hide': 0,
'reqd': 0,
'search_index': 0, 'search_index': 0,
'trigger': 'Client' 'trigger': 'Client'
}, },
@@ -527,15 +505,13 @@
'colour': 'White:FFF', 'colour': 'White:FFF',
'doctype': 'DocField', 'doctype': 'DocField',
'fieldtype': 'HTML', 'fieldtype': 'HTML',
'hidden': 0,
'idx': 18, 'idx': 18,
'label': 'Warehouse HTML', 'label': 'Warehouse HTML',
'no_copy': 0, 'no_copy': 0,
'oldfieldtype': 'HTML', 'oldfieldtype': 'HTML',
'options': "<div class='columnHeading'>Warehouse</div>", 'options': "<div class='columnHeading'>Warehouse</div>",
'permlevel': 0, 'permlevel': 0,
'print_hide': 1, 'print_hide': 1
'reqd': 0
}, },
# DocField # DocField
@@ -545,7 +521,6 @@
'doctype': 'DocField', 'doctype': 'DocField',
'fieldname': 'from_warehouse', 'fieldname': 'from_warehouse',
'fieldtype': 'Link', 'fieldtype': 'Link',
'hidden': 0,
'idx': 19, 'idx': 19,
'in_filter': 0, 'in_filter': 0,
'label': 'Source Warehouse', 'label': 'Source Warehouse',
@@ -569,7 +544,6 @@
'doctype': 'DocField', 'doctype': 'DocField',
'fieldname': 'to_warehouse', 'fieldname': 'to_warehouse',
'fieldtype': 'Link', 'fieldtype': 'Link',
'hidden': 0,
'idx': 20, 'idx': 20,
'in_filter': 0, 'in_filter': 0,
'label': 'Target Warehouse', 'label': 'Target Warehouse',
@@ -581,7 +555,7 @@
'print_hide': 1, 'print_hide': 1,
'report_hide': 0, 'report_hide': 0,
'reqd': 0, 'reqd': 0,
'search_index': 1, 'search_index': 0,
'trigger': 'Client' 'trigger': 'Client'
}, },
@@ -616,7 +590,6 @@
'doctype': 'DocField', 'doctype': 'DocField',
'fieldname': 'transfer_date', 'fieldname': 'transfer_date',
'fieldtype': 'Date', 'fieldtype': 'Date',
'hidden': 0,
'idx': 23, 'idx': 23,
'in_filter': 1, 'in_filter': 1,
'label': 'Transfer Date', 'label': 'Transfer Date',
@@ -627,7 +600,7 @@
'print_hide': 0, 'print_hide': 0,
'report_hide': 0, 'report_hide': 0,
'reqd': 1, 'reqd': 1,
'search_index': 1 'search_index': 0
}, },
# DocField # DocField
@@ -637,7 +610,6 @@
'doctype': 'DocField', 'doctype': 'DocField',
'fieldname': 'posting_date', 'fieldname': 'posting_date',
'fieldtype': 'Date', 'fieldtype': 'Date',
'hidden': 0,
'idx': 24, 'idx': 24,
'in_filter': 1, 'in_filter': 1,
'label': 'Posting Date', 'label': 'Posting Date',
@@ -657,7 +629,6 @@
'doctype': 'DocField', 'doctype': 'DocField',
'fieldname': 'posting_time', 'fieldname': 'posting_time',
'fieldtype': 'Time', 'fieldtype': 'Time',
'hidden': 0,
'idx': 25, 'idx': 25,
'in_filter': 0, 'in_filter': 0,
'label': 'Posting Time', 'label': 'Posting Time',
@@ -677,7 +648,6 @@
'doctype': 'DocField', 'doctype': 'DocField',
'fieldname': 'amended_from', 'fieldname': 'amended_from',
'fieldtype': 'Link', 'fieldtype': 'Link',
'hidden': 0,
'idx': 26, 'idx': 26,
'in_filter': 0, 'in_filter': 0,
'label': 'Amended From', 'label': 'Amended From',
@@ -688,7 +658,6 @@
'permlevel': 1, 'permlevel': 1,
'print_hide': 1, 'print_hide': 1,
'report_hide': 0, 'report_hide': 0,
'reqd': 0,
'search_index': 0 'search_index': 0
}, },
@@ -698,7 +667,6 @@
'doctype': 'DocField', 'doctype': 'DocField',
'fieldname': 'transporter', 'fieldname': 'transporter',
'fieldtype': 'Data', 'fieldtype': 'Data',
'hidden': 0,
'idx': 27, 'idx': 27,
'in_filter': 0, 'in_filter': 0,
'label': 'Transporter', 'label': 'Transporter',
@@ -708,7 +676,6 @@
'permlevel': 0, 'permlevel': 0,
'print_hide': 1, 'print_hide': 1,
'report_hide': 0, 'report_hide': 0,
'reqd': 0,
'search_index': 0 'search_index': 0
}, },
@@ -718,7 +685,6 @@
'doctype': 'DocField', 'doctype': 'DocField',
'fieldname': 'is_excisable_goods', 'fieldname': 'is_excisable_goods',
'fieldtype': 'Select', 'fieldtype': 'Select',
'hidden': 0,
'idx': 28, 'idx': 28,
'in_filter': 0, 'in_filter': 0,
'label': 'Is Excisable Goods', 'label': 'Is Excisable Goods',
@@ -729,7 +695,6 @@
'permlevel': 0, 'permlevel': 0,
'print_hide': 1, 'print_hide': 1,
'report_hide': 0, 'report_hide': 0,
'reqd': 0,
'search_index': 0 'search_index': 0
}, },
@@ -739,7 +704,6 @@
'doctype': 'DocField', 'doctype': 'DocField',
'fieldname': 'excisable_goods', 'fieldname': 'excisable_goods',
'fieldtype': 'Select', 'fieldtype': 'Select',
'hidden': 0,
'idx': 29, 'idx': 29,
'in_filter': 0, 'in_filter': 0,
'label': 'Excisable Goods', 'label': 'Excisable Goods',
@@ -750,7 +714,6 @@
'permlevel': 0, 'permlevel': 0,
'print_hide': 1, 'print_hide': 1,
'report_hide': 0, 'report_hide': 0,
'reqd': 0,
'search_index': 0 'search_index': 0
}, },
@@ -771,7 +734,6 @@
'permlevel': 0, 'permlevel': 0,
'print_hide': 1, 'print_hide': 1,
'report_hide': 0, 'report_hide': 0,
'reqd': 0,
'search_index': 0 'search_index': 0
}, },
@@ -781,7 +743,6 @@
'doctype': 'DocField', 'doctype': 'DocField',
'fieldname': 'remarks', 'fieldname': 'remarks',
'fieldtype': 'Text', 'fieldtype': 'Text',
'hidden': 0,
'idx': 31, 'idx': 31,
'in_filter': 0, 'in_filter': 0,
'label': 'Remarks', 'label': 'Remarks',
@@ -837,25 +798,6 @@
'print_hide': 1 '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 # DocField
{ {
'doctype': 'DocField', 'doctype': 'DocField',
@@ -881,7 +823,6 @@
'permlevel': 2, 'permlevel': 2,
'print_hide': 1, 'print_hide': 1,
'report_hide': 0, 'report_hide': 0,
'reqd': 0,
'search_index': 0 'search_index': 0
}, },
@@ -902,7 +843,6 @@
'doctype': 'DocField', 'doctype': 'DocField',
'fieldname': 'mtn_details', 'fieldname': 'mtn_details',
'fieldtype': 'Table', 'fieldtype': 'Table',
'hidden': 0,
'idx': 39, 'idx': 39,
'in_filter': 0, 'in_filter': 0,
'label': 'MTN Details', 'label': 'MTN Details',
@@ -913,7 +853,6 @@
'permlevel': 0, 'permlevel': 0,
'print_hide': 0, 'print_hide': 0,
'report_hide': 0, 'report_hide': 0,
'reqd': 0,
'search_index': 0 'search_index': 0
}, },
@@ -923,7 +862,6 @@
'doctype': 'DocField', 'doctype': 'DocField',
'fieldname': 'total_amount', 'fieldname': 'total_amount',
'fieldtype': 'Currency', 'fieldtype': 'Currency',
'hidden': 0,
'idx': 40, 'idx': 40,
'in_filter': 0, 'in_filter': 0,
'label': 'Total Amount', 'label': 'Total Amount',
@@ -933,7 +871,6 @@
'permlevel': 1, 'permlevel': 1,
'print_hide': 1, 'print_hide': 1,
'report_hide': 0, 'report_hide': 0,
'reqd': 0,
'search_index': 0 'search_index': 0
}, },
@@ -953,7 +890,6 @@
'doctype': 'DocField', 'doctype': 'DocField',
'fieldname': 'company', 'fieldname': 'company',
'fieldtype': 'Link', 'fieldtype': 'Link',
'hidden': 0,
'idx': 42, 'idx': 42,
'in_filter': 1, 'in_filter': 1,
'label': 'Company', 'label': 'Company',
@@ -965,7 +901,7 @@
'print_hide': 1, 'print_hide': 1,
'report_hide': 0, 'report_hide': 0,
'reqd': 1, 'reqd': 1,
'search_index': 1 'search_index': 0
}, },
# DocField # DocField
@@ -974,7 +910,6 @@
'doctype': 'DocField', 'doctype': 'DocField',
'fieldname': 'fiscal_year', 'fieldname': 'fiscal_year',
'fieldtype': 'Select', 'fieldtype': 'Select',
'hidden': 0,
'idx': 43, 'idx': 43,
'in_filter': 0, 'in_filter': 0,
'label': 'Fiscal Year', 'label': 'Fiscal Year',
@@ -986,7 +921,7 @@
'print_hide': 1, 'print_hide': 1,
'report_hide': 0, 'report_hide': 0,
'reqd': 1, 'reqd': 1,
'search_index': 1 'search_index': 0
}, },
# DocField # DocField
@@ -995,7 +930,6 @@
'doctype': 'DocField', 'doctype': 'DocField',
'fieldname': 'select_print_heading', 'fieldname': 'select_print_heading',
'fieldtype': 'Link', 'fieldtype': 'Link',
'hidden': 0,
'idx': 44, 'idx': 44,
'in_filter': 0, 'in_filter': 0,
'label': 'Select Print Heading', 'label': 'Select Print Heading',
@@ -1004,9 +938,7 @@
'oldfieldtype': 'Link', 'oldfieldtype': 'Link',
'options': 'Print Heading', 'options': 'Print Heading',
'permlevel': 0, 'permlevel': 0,
'print_hide': 0,
'report_hide': 0, 'report_hide': 0,
'reqd': 0,
'search_index': 0 'search_index': 0
} }
] ]

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

@@ -135,6 +135,7 @@
'options': 'Batch', 'options': 'Batch',
'permlevel': 0, 'permlevel': 0,
'print_hide': 1, 'print_hide': 1,
'search_index': 0,
'trigger': 'Client' 'trigger': 'Client'
}, },
@@ -152,7 +153,7 @@
'permlevel': 1, 'permlevel': 1,
'print_hide': 1, 'print_hide': 1,
'reqd': 0, 'reqd': 0,
'search_index': 1 'search_index': 0
}, },
# DocField # DocField
@@ -196,6 +197,7 @@
'options': 'UOM', 'options': 'UOM',
'permlevel': 0, 'permlevel': 0,
'reqd': 1, 'reqd': 1,
'search_index': 0,
'trigger': 'Client' '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 # These values are common for all DocType
{ {
'_last_update': '1307707462', '_last_update': '1309508840',
'autoname': 'SLE/.########', 'autoname': 'SLE/.########',
'colour': 'White:FFF', 'colour': 'White:FFF',
'doctype': 'DocType', 'doctype': 'DocType',
@@ -163,7 +163,7 @@
'oldfieldtype': 'Select', 'oldfieldtype': 'Select',
'options': 'link:Warehouse Type', 'options': 'link:Warehouse Type',
'permlevel': 1, 'permlevel': 1,
'search_index': 1 'search_index': 0
}, },
# DocField # DocField
@@ -194,7 +194,7 @@
'oldfieldname': 'posting_time', 'oldfieldname': 'posting_time',
'oldfieldtype': 'Time', 'oldfieldtype': 'Time',
'permlevel': 1, 'permlevel': 1,
'search_index': 0, 'search_index': 1,
'width': '100px' 'width': '100px'
}, },
@@ -210,7 +210,7 @@
'oldfieldname': 'transaction_date', 'oldfieldname': 'transaction_date',
'oldfieldtype': 'Date', 'oldfieldtype': 'Date',
'permlevel': 1, 'permlevel': 1,
'search_index': 1, 'search_index': 0,
'width': '100px' 'width': '100px'
}, },
@@ -225,7 +225,7 @@
'oldfieldname': 'voucher_type', 'oldfieldname': 'voucher_type',
'oldfieldtype': 'Data', 'oldfieldtype': 'Data',
'permlevel': 1, 'permlevel': 1,
'search_index': 1, 'search_index': 0,
'width': '150px' 'width': '150px'
}, },
@@ -240,7 +240,7 @@
'oldfieldname': 'voucher_no', 'oldfieldname': 'voucher_no',
'oldfieldtype': 'Data', 'oldfieldtype': 'Data',
'permlevel': 1, 'permlevel': 1,
'search_index': 1, 'search_index': 0,
'width': '150px' 'width': '150px'
}, },
@@ -394,7 +394,7 @@
'oldfieldname': 'company', 'oldfieldname': 'company',
'oldfieldtype': 'Data', 'oldfieldtype': 'Data',
'permlevel': 1, 'permlevel': 1,
'search_index': 1, 'search_index': 0,
'width': '150px' 'width': '150px'
}, },
@@ -409,7 +409,7 @@
'oldfieldname': 'fiscal_year', 'oldfieldname': 'fiscal_year',
'oldfieldtype': 'Data', 'oldfieldtype': 'Data',
'permlevel': 1, 'permlevel': 1,
'search_index': 1, 'search_index': 0,
'width': '150px' 'width': '150px'
}, },
@@ -425,7 +425,7 @@
'oldfieldtype': 'Select', 'oldfieldtype': 'Select',
'options': '\nYes\nNo', 'options': '\nYes\nNo',
'permlevel': 1, 'permlevel': 1,
'search_index': 1, 'search_index': 0,
'width': '100px' 'width': '100px'
}, },
@@ -441,7 +441,7 @@
'oldfieldtype': 'Select', 'oldfieldtype': 'Select',
'options': '\nYes\nNo', 'options': '\nYes\nNo',
'permlevel': 1, 'permlevel': 1,
'search_index': 1, 'search_index': 0,
'width': '100px' '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): def get_current_stock(self, item_code, warehouse):
bin = sql("select name from `tabBin` where item_code = '%s' and warehouse = '%s'" % (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) 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]} 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 # These values are common for all DocType
{ {
'_last_update': '1307707462', '_last_update': '1309508840',
'allow_attach': 1, 'allow_attach': 1,
'colour': 'White:FFF', 'colour': 'White:FFF',
'doctype': 'DocType', 'doctype': 'DocType',
@@ -131,7 +131,8 @@
'oldfieldname': 'reconciliation_date', 'oldfieldname': 'reconciliation_date',
'oldfieldtype': 'Date', 'oldfieldtype': 'Date',
'permlevel': 0, 'permlevel': 0,
'reqd': 1 'reqd': 1,
'search_index': 1
}, },
# DocField # DocField
@@ -185,7 +186,7 @@
'oldfieldtype': 'Link', 'oldfieldtype': 'Link',
'options': 'Company', 'options': 'Company',
'permlevel': 0, 'permlevel': 0,
'search_index': 1 'search_index': 0
}, },
# DocField # DocField
@@ -200,7 +201,7 @@
'oldfieldtype': 'Select', 'oldfieldtype': 'Select',
'options': 'link:Fiscal Year', 'options': 'link:Fiscal Year',
'permlevel': 0, 'permlevel': 0,
'search_index': 1 'search_index': 0
}, },
# DocField # DocField

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

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

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

@@ -167,7 +167,7 @@
'options': '\nOpen\nClosed\nWork In Progress\nCancelled', 'options': '\nOpen\nClosed\nWork In Progress\nCancelled',
'permlevel': 0, 'permlevel': 0,
'reqd': 1, 'reqd': 1,
'search_index': 1 'search_index': 0
}, },
# DocField # DocField
@@ -340,7 +340,7 @@
'permlevel': 0, 'permlevel': 0,
'print_hide': 1, 'print_hide': 1,
'reqd': 0, 'reqd': 0,
'search_index': 1 'search_index': 0
}, },
# DocField # DocField
@@ -371,7 +371,7 @@
'permlevel': 0, 'permlevel': 0,
'print_hide': 1, 'print_hide': 1,
'reqd': 1, 'reqd': 1,
'search_index': 1, 'search_index': 0,
'trigger': 'Client' 'trigger': 'Client'
}, },
@@ -389,7 +389,7 @@
'permlevel': 0, 'permlevel': 0,
'print_hide': 1, 'print_hide': 1,
'reqd': 1, 'reqd': 1,
'search_index': 1 'search_index': 0
}, },
# DocField # DocField
@@ -563,7 +563,7 @@
'oldfieldname': 'allocated_on', 'oldfieldname': 'allocated_on',
'oldfieldtype': 'Date', 'oldfieldtype': 'Date',
'permlevel': 0, 'permlevel': 0,
'search_index': 1 'search_index': 0
}, },
# DocField # DocField
@@ -578,7 +578,7 @@
'oldfieldtype': 'Link', 'oldfieldtype': 'Link',
'options': 'Sales Person', 'options': 'Sales Person',
'permlevel': 0, 'permlevel': 0,
'search_index': 1 'search_index': 0
}, },
# DocField # DocField
@@ -627,7 +627,7 @@
'oldfieldname': 'resolution_date', 'oldfieldname': 'resolution_date',
'oldfieldtype': 'Date', 'oldfieldtype': 'Date',
'permlevel': 0, 'permlevel': 0,
'search_index': 1 'search_index': 0
}, },
# DocField # DocField
@@ -643,7 +643,7 @@
'oldfieldtype': 'Link', 'oldfieldtype': 'Link',
'options': 'Sales Person', 'options': 'Sales Person',
'permlevel': 0, 'permlevel': 0,
'search_index': 1 'search_index': 0
}, },
# DocField # DocField

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

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

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

@@ -167,7 +167,7 @@
'oldfieldtype': 'Data', 'oldfieldtype': 'Data',
'permlevel': 1, 'permlevel': 1,
'reqd': 0, 'reqd': 0,
'search_index': 1 'search_index': 0
}, },
# DocField # DocField
@@ -252,7 +252,7 @@
'options': '\nDraft\nSubmitted\nCancelled', 'options': '\nDraft\nSubmitted\nCancelled',
'permlevel': 1, 'permlevel': 1,
'reqd': 1, 'reqd': 1,
'search_index': 1 'search_index': 0
}, },
# DocField # DocField
@@ -297,7 +297,7 @@
'options': 'Company', 'options': 'Company',
'permlevel': 0, 'permlevel': 0,
'reqd': 1, 'reqd': 1,
'search_index': 1 'search_index': 0
}, },
# DocField # DocField
@@ -313,7 +313,7 @@
'options': 'Territory', 'options': 'Territory',
'permlevel': 0, 'permlevel': 0,
'reqd': 1, 'reqd': 1,
'search_index': 1 'search_index': 0
}, },
# DocField # DocField

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

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

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

@@ -241,7 +241,7 @@
'permlevel': 0, 'permlevel': 0,
'print_hide': 1, 'print_hide': 1,
'reqd': 1, 'reqd': 1,
'search_index': 1 'search_index': 0
}, },
# DocField # DocField
@@ -258,7 +258,7 @@
'permlevel': 0, 'permlevel': 0,
'print_hide': 1, 'print_hide': 1,
'reqd': 1, 'reqd': 1,
'search_index': 1 'search_index': 0
}, },
# DocField # DocField
@@ -410,7 +410,7 @@
'options': '\nScheduled\nUnscheduled\nBreakdown', 'options': '\nScheduled\nUnscheduled\nBreakdown',
'permlevel': 0, 'permlevel': 0,
'reqd': 1, 'reqd': 1,
'search_index': 1 'search_index': 0
}, },
# DocField # DocField

54
support/doctype/support_ticket/__init__.py
View File

@@ -6,14 +6,26 @@ class SupportMailbox(POP3Mailbox):
def __init__(self): def __init__(self):
""" """
settings_doc must contain settings_doc must contain
is_ssl, host, username, password use_ssl, host, username, password
""" """
POP3Mailbox.__init__(self, 'Support Email Settings') from webnotes.model.doc import Document
# extract email settings
self.email_settings = Document('Email Settings','Email Settings')
s = Document('Support Email Settings')
s.use_ssl = self.email_settings.support_use_ssl
s.host = self.email_settings.support_host
s.username = self.email_settings.support_username
s.password = self.email_settings.support_password
POP3Mailbox.__init__(self, s)
def check_mails(self): def check_mails(self):
""" """
returns true if there are active sessions returns true if there are active sessions
""" """
self.auto_close_tickets()
return webnotes.conn.sql("select user from tabSessions where time_to_sec(timediff(now(), lastupdate)) < 1800") return webnotes.conn.sql("select user from tabSessions where time_to_sec(timediff(now(), lastupdate)) < 1800")
def process_message(self, mail): def process_message(self, mail):
@@ -56,6 +68,39 @@ class SupportMailbox(POP3Mailbox):
# update feed # update feed
update_feed(d) update_feed(d)
# send auto reply
self.send_auto_reply(d)
def send_auto_reply(self, d):
"""
Send auto reply to emails
"""
signature = self.email_settings.support_signature
response = self.email_settings.support_autoreply or ("""
A new Ticket has been raised for your query. If you have any additional information, please
reply back to this mail.
We will get back to you as soon as possible
[This is an automatic response]
""" + signature)
from webnotes.utils.email_lib import sendmail
sendmail(\
recipients = [d.raised_by], \
sender = self.email_settings.support_email, \
subject = '['+d.name+'] ' + d.subject, \
msg = response)
def auto_close_tickets(self):
"""
Auto Closes Waiting for Customer Support Ticket after 15 days
"""
webnotes.conn.sql("update `tabSupport Ticket` set status = 'Closed' where status = 'Waiting for Customer' and date_sub(curdate(),interval 15 Day) > modified")
def get_support_mails(): def get_support_mails():
""" """
@@ -63,8 +108,3 @@ def get_support_mails():
""" """
SupportMailbox().get_messages() 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")

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

@@ -20,9 +20,9 @@ $.extend(cur_frm.cscript, {
items: [ items: [
{ {
column: 0, column: 0,
label:'Support Email Settings', label:'Email Settings',
description:'Integrate your incoming support emails to support ticket', 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'); }
}, },
] ]
}) })

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

@@ -19,7 +19,7 @@ class DocType(TransactionBase):
response = self.doc.new_response + '\n\n[Please do not change the subject while responding.]' 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: if signature:
response += '\n\n' + signature response += '\n\n' + signature
@@ -27,7 +27,7 @@ class DocType(TransactionBase):
sendmail(\ sendmail(\
recipients = [self.doc.raised_by], \ 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, \ subject=subject, \
msg=response) msg=response)

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

@@ -3,16 +3,16 @@
# These values are common in all dictionaries # These values are common in all dictionaries
{ {
'creation': '2011-05-23 14:50:46', 'creation': '2011-05-23 09:01:10',
'docstatus': 0, 'docstatus': 0,
'modified': '2011-07-06 09:25:53', 'modified': '2011-07-25 14:45:28',
'modified_by': 'Administrator', 'modified_by': 'Administrator',
'owner': 'Administrator' 'owner': 'Administrator'
}, },
# These values are common for all DocType # These values are common for all DocType
{ {
'_last_update': '1309771514', '_last_update': '1311584009',
'allow_trash': 1, 'allow_trash': 1,
'autoname': 'SUP.######', 'autoname': 'SUP.######',
'colour': 'White:FFF', 'colour': 'White:FFF',
@@ -25,7 +25,7 @@
'show_in_menu': 0, 'show_in_menu': 0,
'subject': '%(subject)s', 'subject': '%(subject)s',
'tag_fields': 'status,allocated_to', 'tag_fields': 'status,allocated_to',
'version': 150 'version': 144
}, },
# These values are common for all DocField # These values are common for all DocField
@@ -131,7 +131,7 @@
{ {
'doctype': 'DocField', 'doctype': 'DocField',
'fieldname': 'subject', 'fieldname': 'subject',
'fieldtype': 'Small Text', 'fieldtype': 'Text',
'idx': 2, 'idx': 2,
'in_filter': 1, 'in_filter': 1,
'label': 'Subject', 'label': 'Subject',
@@ -168,24 +168,12 @@
'reqd': 0 'reqd': 0
}, },
# DocField
{
'doctype': 'DocField',
'fieldname': 'problem_description',
'fieldtype': 'Text',
'idx': 5,
'label': 'Problem Description',
'oldfieldname': 'problem_description',
'oldfieldtype': 'Text',
'permlevel': 0
},
# DocField # DocField
{ {
'depends_on': 'eval:!doc.__islocal', 'depends_on': 'eval:!doc.__islocal',
'doctype': 'DocField', 'doctype': 'DocField',
'fieldtype': 'HTML', 'fieldtype': 'HTML',
'idx': 6, 'idx': 5,
'label': 'Thread HTML', 'label': 'Thread HTML',
'permlevel': 1 'permlevel': 1
}, },
@@ -196,7 +184,7 @@
'doctype': 'DocField', 'doctype': 'DocField',
'fieldname': 'new_response', 'fieldname': 'new_response',
'fieldtype': 'Text', 'fieldtype': 'Text',
'idx': 7, 'idx': 6,
'label': 'New Response', 'label': 'New Response',
'permlevel': 0 'permlevel': 0
}, },
@@ -206,9 +194,8 @@
'depends_on': 'eval:!doc.__islocal', 'depends_on': 'eval:!doc.__islocal',
'doctype': 'DocField', 'doctype': 'DocField',
'fieldtype': 'Button', 'fieldtype': 'Button',
'idx': 8, 'idx': 7,
'label': 'Send', 'label': 'Send',
'options': 'send_response',
'permlevel': 0 'permlevel': 0
}, },
@@ -217,7 +204,7 @@
'colour': 'White:FFF', 'colour': 'White:FFF',
'doctype': 'DocField', 'doctype': 'DocField',
'fieldtype': 'Section Break', 'fieldtype': 'Section Break',
'idx': 9, 'idx': 8,
'label': 'Additional Info', 'label': 'Additional Info',
'permlevel': 1 'permlevel': 1
}, },
@@ -227,7 +214,7 @@
'depends_on': 'eval:!doc.__islocal', 'depends_on': 'eval:!doc.__islocal',
'doctype': 'DocField', 'doctype': 'DocField',
'fieldtype': 'Column Break', 'fieldtype': 'Column Break',
'idx': 10, 'idx': 9,
'oldfieldtype': 'Column Break', 'oldfieldtype': 'Column Break',
'permlevel': 1, 'permlevel': 1,
'width': '50%' 'width': '50%'
@@ -239,7 +226,7 @@
'doctype': 'DocField', 'doctype': 'DocField',
'fieldname': 'customer', 'fieldname': 'customer',
'fieldtype': 'Link', 'fieldtype': 'Link',
'idx': 11, 'idx': 10,
'in_filter': 1, 'in_filter': 1,
'label': 'Customer', 'label': 'Customer',
'oldfieldname': 'customer', 'oldfieldname': 'customer',
@@ -257,14 +244,14 @@
'doctype': 'DocField', 'doctype': 'DocField',
'fieldname': 'customer_name', 'fieldname': 'customer_name',
'fieldtype': 'Data', 'fieldtype': 'Data',
'idx': 12, 'idx': 11,
'in_filter': 1, 'in_filter': 1,
'label': 'Customer Name', 'label': 'Customer Name',
'oldfieldname': 'customer_name', 'oldfieldname': 'customer_name',
'oldfieldtype': 'Data', 'oldfieldtype': 'Data',
'permlevel': 2, 'permlevel': 2,
'reqd': 0, 'reqd': 0,
'search_index': 1 'search_index': 0
}, },
# DocField # DocField
@@ -272,7 +259,7 @@
'doctype': 'DocField', 'doctype': 'DocField',
'fieldname': 'address_display', 'fieldname': 'address_display',
'fieldtype': 'Small Text', 'fieldtype': 'Small Text',
'idx': 13, 'idx': 12,
'label': 'Address', 'label': 'Address',
'permlevel': 2 'permlevel': 2
}, },
@@ -282,7 +269,7 @@
'doctype': 'DocField', 'doctype': 'DocField',
'fieldname': 'contact_display', 'fieldname': 'contact_display',
'fieldtype': 'Data', 'fieldtype': 'Data',
'idx': 14, 'idx': 13,
'label': 'Contact Name', 'label': 'Contact Name',
'permlevel': 2 'permlevel': 2
}, },
@@ -292,7 +279,7 @@
'doctype': 'DocField', 'doctype': 'DocField',
'fieldname': 'contact_mobile', 'fieldname': 'contact_mobile',
'fieldtype': 'Data', 'fieldtype': 'Data',
'idx': 15, 'idx': 14,
'label': 'Mobile No', 'label': 'Mobile No',
'permlevel': 2 'permlevel': 2
}, },
@@ -302,7 +289,7 @@
'doctype': 'DocField', 'doctype': 'DocField',
'fieldname': 'contact_email', 'fieldname': 'contact_email',
'fieldtype': 'Data', 'fieldtype': 'Data',
'idx': 16, 'idx': 15,
'label': 'Contact Email', 'label': 'Contact Email',
'oldfieldname': 'contact_no', 'oldfieldname': 'contact_no',
'oldfieldtype': 'Data', 'oldfieldtype': 'Data',
@@ -315,7 +302,7 @@
'doctype': 'DocField', 'doctype': 'DocField',
'fieldname': 'opening_date', 'fieldname': 'opening_date',
'fieldtype': 'Date', 'fieldtype': 'Date',
'idx': 17, 'idx': 16,
'label': 'Opening Date', 'label': 'Opening Date',
'no_copy': 1, 'no_copy': 1,
'oldfieldname': 'opening_date', 'oldfieldname': 'opening_date',
@@ -328,7 +315,7 @@
'doctype': 'DocField', 'doctype': 'DocField',
'fieldname': 'opening_time', 'fieldname': 'opening_time',
'fieldtype': 'Time', 'fieldtype': 'Time',
'idx': 18, 'idx': 17,
'label': 'Opening Time', 'label': 'Opening Time',
'no_copy': 1, 'no_copy': 1,
'oldfieldname': 'opening_time', 'oldfieldname': 'opening_time',
@@ -341,19 +328,18 @@
'depends_on': 'eval:!doc.__islocal', 'depends_on': 'eval:!doc.__islocal',
'doctype': 'DocField', 'doctype': 'DocField',
'fieldtype': 'Column Break', 'fieldtype': 'Column Break',
'idx': 19, 'idx': 18,
'oldfieldtype': 'Column Break', 'oldfieldtype': 'Column Break',
'permlevel': 1 'permlevel': 1
}, },
# DocField # DocField
{ {
'colour': 'White:FFF',
'depends_on': 'eval:!doc.__islocal', 'depends_on': 'eval:!doc.__islocal',
'doctype': 'DocField', 'doctype': 'DocField',
'fieldname': 'allocated_to', 'fieldname': 'allocated_to',
'fieldtype': 'Link', 'fieldtype': 'Link',
'idx': 20, 'idx': 19,
'in_filter': 1, 'in_filter': 1,
'label': 'Allocated To', 'label': 'Allocated To',
'oldfieldname': 'allocated_to', 'oldfieldname': 'allocated_to',
@@ -368,8 +354,8 @@
'depends_on': 'eval:!doc.__islocal', 'depends_on': 'eval:!doc.__islocal',
'doctype': 'DocField', 'doctype': 'DocField',
'fieldname': 'resolution_details', 'fieldname': 'resolution_details',
'fieldtype': 'Small Text', 'fieldtype': 'Text',
'idx': 21, 'idx': 20,
'label': 'Resolution Details', 'label': 'Resolution Details',
'no_copy': 1, 'no_copy': 1,
'oldfieldname': 'resolution_details', 'oldfieldname': 'resolution_details',
@@ -379,19 +365,18 @@
# DocField # DocField
{ {
'colour': 'White:FFF',
'depends_on': 'eval:!doc.__islocal', 'depends_on': 'eval:!doc.__islocal',
'doctype': 'DocField', 'doctype': 'DocField',
'fieldname': 'resolution_date', 'fieldname': 'resolution_date',
'fieldtype': 'Date', 'fieldtype': 'Date',
'idx': 22, 'idx': 21,
'in_filter': 0, 'in_filter': 0,
'label': 'Resolution Date', 'label': 'Resolution Date',
'no_copy': 1, 'no_copy': 1,
'oldfieldname': 'resolution_date', 'oldfieldname': 'resolution_date',
'oldfieldtype': 'Date', 'oldfieldtype': 'Date',
'permlevel': 1, 'permlevel': 1,
'search_index': 1 'search_index': 0
}, },
# DocField # DocField
@@ -400,7 +385,7 @@
'doctype': 'DocField', 'doctype': 'DocField',
'fieldname': 'resolution_time', 'fieldname': 'resolution_time',
'fieldtype': 'Time', 'fieldtype': 'Time',
'idx': 23, 'idx': 22,
'label': 'Resolution Time', 'label': 'Resolution Time',
'oldfieldname': 'resolution_time', 'oldfieldname': 'resolution_time',
'oldfieldtype': 'Time', 'oldfieldtype': 'Time',
@@ -414,7 +399,7 @@
'fieldname': 'content_type', 'fieldname': 'content_type',
'fieldtype': 'Data', 'fieldtype': 'Data',
'hidden': 1, 'hidden': 1,
'idx': 24, 'idx': 23,
'label': 'Content Type', 'label': 'Content Type',
'permlevel': 0 'permlevel': 0
} }

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

@@ -117,7 +117,7 @@
'label': 'City/Town', 'label': 'City/Town',
'permlevel': 0, 'permlevel': 0,
'reqd': 1, 'reqd': 1,
'search_index': 1 'search_index': 0
}, },
# DocField # DocField
@@ -129,7 +129,7 @@
'in_filter': 1, 'in_filter': 1,
'label': 'Pincode', 'label': 'Pincode',
'permlevel': 0, 'permlevel': 0,
'search_index': 1 'search_index': 0
}, },
# DocField # DocField
@@ -144,7 +144,7 @@
'options': 'link:Country', 'options': 'link:Country',
'permlevel': 0, 'permlevel': 0,
'reqd': 1, 'reqd': 1,
'search_index': 1, 'search_index': 0,
'trigger': 'Client' 'trigger': 'Client'
}, },
@@ -214,6 +214,7 @@
'label': 'Customer', 'label': 'Customer',
'options': 'Customer', 'options': 'Customer',
'permlevel': 0, 'permlevel': 0,
'search_index': 1,
'trigger': 'Client' 'trigger': 'Client'
}, },
@@ -240,6 +241,7 @@
'label': 'Supplier', 'label': 'Supplier',
'options': 'Supplier', 'options': 'Supplier',
'permlevel': 0, 'permlevel': 0,
'search_index': 1,
'trigger': 'Client' 'trigger': 'Client'
}, },

Some files were not shown because too many files have changed in this diff Show More