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

Merge branch 'master' of github.com:webnotes/erpnext

Browse Source
This commit is contained in:
Rushabh Mehta 2011-07-27 15:40:17 +05:30
commit e4d3b19b24
124 changed files with 1717 additions and 1451 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -1,6 +1,5 @@
*.pyc
*.comp.js
*.txt
.DS_Store
server_tools
patch.log

72
accounts/Module Def/Accounts/Accounts.txt
View File

@ -5,7 +5,7 @@
{
'creation': '2010-09-25 10:50:34',
'docstatus': 0,
'modified': '2011-07-15 10:43:04',
'modified': '2011-07-27 11:43:40',
'modified_by': 'Administrator',
'owner': 'Administrator'
},
@ -40,7 +40,7 @@
'module_icon': 'Accounts.gif',
'module_label': 'Accounts',
'module_name': 'Accounts',
'module_seq': 5,
'module_seq': 3,
'name': '__common__'
},
@ -107,8 +107,9 @@
# Module Def Item
{
'display_name': 'Loan',
'doc_name': 'Loan',
'description': 'Lease Agreement for Vehicles',
'display_name': 'Lease Agreement',
'doc_name': 'Lease Agreement',
'doc_type': 'Forms',
'doctype': 'Module Def Item',
'idx': 6
@ -354,6 +355,69 @@
'idx': 32
},
# Module Def Item
{
'display_name': 'Lease Agreement List',
'doc_name': 'Lease Agreement List',
'doc_type': 'Reports',
'doctype': 'Module Def Item',
'idx': 33
},
# Module Def Item
{
'display_name': 'Lease Monthly Future Installment Inflows',
'doc_name': 'Lease Monthly Future Installment Inflows',
'doc_type': 'Reports',
'doctype': 'Module Def Item',
'idx': 34
},
# Module Def Item
{
'display_name': 'Lease Overdue Age Wise',
'doc_name': 'Lease Overdue Age Wise',
'doc_type': 'Reports',
'doctype': 'Module Def Item',
'idx': 35
},
# Module Def Item
{
'display_name': 'Lease Overdue List',
'doc_name': 'Lease Overdue List',
'doc_type': 'Reports',
'doctype': 'Module Def Item',
'idx': 36
},
# Module Def Item
{
'display_name': 'Lease Receipts Client Wise',
'doc_name': 'Lease Receipts Client Wise',
'doc_type': 'Reports',
'doctype': 'Module Def Item',
'idx': 37
},
# Module Def Item
{
'display_name': 'Lease Receipt Summary Year to Date',
'doc_name': 'Lease Receipt Summary Year to Date',
'doc_type': 'Reports',
'doctype': 'Module Def Item',
'idx': 38
},
# Module Def Item
{
'display_name': 'Lease Yearly Future Installment Inflows',
'doc_name': 'Lease Yearly Future Installment Inflows',
'doc_type': 'Reports',
'doctype': 'Module Def Item',
'idx': 39
},
# Module Def Role
{
'doctype': 'Module Def Role',

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

@ -12,7 +12,7 @@
# These values are common for all DocType
{
'_last_update': '1308829300',
'_last_update': '1309508836',
'allow_copy': 1,
'allow_trash': 1,
'colour': 'White:FFF',
@ -179,7 +179,7 @@
'oldfieldtype': 'Data',
'permlevel': 1,
'reqd': 1,
'search_index': 1
'search_index': 0
},
# DocField
@ -225,7 +225,7 @@
'options': '\nLedger\nGroup',
'permlevel': 1,
'reqd': 1,
'search_index': 1
'search_index': 0
},
# DocField
@ -259,7 +259,7 @@
'oldfieldname': 'debit_or_credit',
'oldfieldtype': 'Data',
'permlevel': 1,
'search_index': 1
'search_index': 0
},
# DocField
@ -274,7 +274,7 @@
'oldfieldtype': 'Select',
'options': 'Yes\nNo',
'permlevel': 1,
'search_index': 1
'search_index': 0
},
# DocField
@ -344,7 +344,7 @@
'options': 'Company',
'permlevel': 1,
'reqd': 1,
'search_index': 1
'search_index': 0
},
# DocField

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

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

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

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

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

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

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

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

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',
'options': 'Cost Center',
'permlevel': 0,
'search_index': 1,
'search_index': 0,
'width': '180px'
},

0
accounts/doctype/lease_agreement/__init__.py Normal file
View File

66
accounts/doctype/lease_agreement/lease_agreement.js Normal file
View File

@ -0,0 +1,66 @@
$.extend(cur_frm.cscript, {
Generate: function(doc, dt, dn) {
cur_frm.cscript.clear_installments(doc);
tot=0;i=0;
while(tot<flt(doc.invoice_amount)-flt(doc.down_payment)){
d = LocalDB.add_child(doc, 'Lease Installment', 'installments');
d.amount = flt(doc.installment_amount) < flt(doc.invoice_amount)-flt(doc.down_payment)-tot ? flt(doc.installment_amount) : flt(doc.invoice_amount)-flt(doc.down_payment)-tot
d.due_date = dateutil.add_months(doc.start_date, i+1);
tot += flt(doc.installment_amount)
i++;
}
cur_frm.refresh();
},
refresh: function(doc) {
cur_frm.cscript.hide_show_buttons(doc);
},
hide_show_buttons: function(doc) {
if(doc.docstatus==0) {
hide_field('Installment Reciept'); show_field('Generate');
} else if (doc.docstatus==1) {
show_field('Installment Reciept');hide_field('Generate');
}
},
clear_installments: function(doc) {
$.each(getchildren('Lease Installment', doc.name, 'installments', 'Lease Agreement'),
function(i, d) {
LocalDB.delete_doc('Lease Installment', d.name);
}
)
},
no_of_installments: function(doc)
{
if(flt(doc.no_of_installments)!=0) {
doc.installment_amount = (flt(doc.invoice_amount)- flt(doc.down_payment))/flt(doc.no_of_installments);
refresh_field('installment_amount');
}
},
'Installment Reciept': function(doc, dt, dn) {
var d = new wn.widgets.Dialog({
width: 500,
title: 'Add a new payment installment',
fields: [
{fieldtype:'Data', label:'Cheque Number', fieldname:'cheque_number', reqd:1},
{fieldtype:'Date', label:'Cheque Date', fieldname:'cheque_date', reqd:1},
{fieldtype:'Link', label:'Bank Account', fieldname:'bank_account', reqd:1, options:'Account'},
{fieldtype:'Button', label:'Update',fieldname:'update'}
]
})
d.show();
d.fields_dict.update.input.onclick = function() {
var data = d.get_values();
if(data) {
$c_obj(make_doclist(dt,dn),'lease_installment_post',data,function(){cur_frm.refresh(); d.hide();});
}
}
}
})
cur_frm.add_fetch('invoice','grand_total','invoice_amount');
cur_frm.fields_dict.invoice.get_query=function(doc){
return "SELECT tv.name FROM `tabReceivable Voucher` tv WHERE debit_to='"+doc.account+"' and tv.%(key)s like '%s' ORDER BY tv.name LIMIT 50"
}

37
accounts/doctype/lease_agreement/lease_agreement.py Normal file
View File

@ -0,0 +1,37 @@
import webnotes
from webnotes.model.doc import make_autoname, Document, addchild
from webnotes import msgprint
from webnotes.utils import get_defaults
import json
from accounts.utils import post_jv
sql = webnotes.conn.sql
class DocType:
def __init__(self, doc, doclist):
self.doc, self.doclist = doc, doclist
def autoname(self):
"""
Create Lease Id using naming_series pattern
"""
self.doc.name = make_autoname(self.doc.naming_series+ '.#####')
def lease_installment_post(self, args):
"""
Posts the Installment receipt into Journal Voucher
"""
next_inst = sql("select amount,name from `tabLease Installment` where parent=%s and ifnull(cheque_number,'')='' order by due_date limit 1",self.doc.name)
data = json.loads(args)
data['voucher_type']='Lease Receipt'
data['naming_series']='JV'
data['amount']=next_inst[0][0]
data['debit_account']=data.get('bank_account')
data['credit_account']=self.doc.account
data['fiscal_year']=get_defaults()['fiscal_year']
data['company']=get_defaults()['company']
jv_name=post_jv(data)
sql("update `tabLease Installment` set cheque_number=%s, cheque_date=%s, jv_number=%s where name=%s",(data.get('cheque_number'),data.get('cheque_date'),jv_name,next_inst[0][1]))
self.doclist = [Document(d.doctype, d.name) for d in self.doclist]

310
accounts/doctype/lease_agreement/lease_agreement.txt Normal file
View File

@ -0,0 +1,310 @@
# DocType, Lease Agreement
[
# These values are common in all dictionaries
{
'creation': '2011-07-22 17:47:57',
'docstatus': 0,
'modified': '2011-07-27 12:54:48',
'modified_by': 'Administrator',
'owner': 'Administrator'
},
# These values are common for all DocType
{
'_last_update': '1311555967',
'colour': 'White:FFF',
'doctype': 'DocType',
'module': 'Accounts',
'name': '__common__',
'section_style': 'Simple',
'show_in_menu': 0,
'version': 20
},
# These values are common for all DocField
{
'doctype': 'DocField',
'name': '__common__',
'parent': 'Lease Agreement',
'parentfield': 'fields',
'parenttype': 'DocType'
},
# These values are common for all DocPerm
{
'doctype': 'DocPerm',
'name': '__common__',
'parent': 'Lease Agreement',
'parentfield': 'permissions',
'parenttype': 'DocType',
'read': 1
},
# DocType, Lease Agreement
{
'doctype': 'DocType',
'name': 'Lease Agreement'
},
# DocPerm
{
'cancel': 1,
'create': 1,
'doctype': 'DocPerm',
'idx': 1,
'permlevel': 0,
'role': 'Accounts User',
'submit': 1,
'write': 1
},
# DocPerm
{
'doctype': 'DocPerm',
'idx': 2,
'permlevel': 1,
'role': 'Accounts User'
},
# DocPerm
{
'cancel': 1,
'create': 1,
'doctype': 'DocPerm',
'idx': 3,
'permlevel': 0,
'role': 'Accounts Manager',
'submit': 1,
'write': 1
},
# DocPerm
{
'doctype': 'DocPerm',
'idx': 4,
'permlevel': 1,
'role': 'Accounts Manager'
},
# DocField
{
'doctype': 'DocField',
'fieldname': 'naming_series',
'fieldtype': 'Select',
'idx': 1,
'label': 'Naming Series',
'options': '\nLA',
'permlevel': 0,
'reqd': 1
},
# DocField
{
'doctype': 'DocField',
'fieldtype': 'Section Break',
'idx': 2,
'label': 'Lessee Info.',
'permlevel': 0
},
# DocField
{
'doctype': 'DocField',
'fieldname': 'account',
'fieldtype': 'Link',
'idx': 3,
'label': 'Account',
'options': 'Account',
'permlevel': 0,
'reqd': 1
},
# DocField
{
'doctype': 'DocField',
'fieldname': 'lessee_father',
'fieldtype': 'Data',
'idx': 4,
'label': 'Lessee Father',
'permlevel': 0
},
# DocField
{
'doctype': 'DocField',
'fieldname': 'lessee_nic',
'fieldtype': 'Data',
'idx': 5,
'label': 'Lessee NIC',
'permlevel': 0
},
# DocField
{
'doctype': 'DocField',
'fieldname': 'lessee_contact',
'fieldtype': 'Data',
'idx': 6,
'label': 'Lessee Contact',
'permlevel': 0
},
# DocField
{
'doctype': 'DocField',
'fieldname': 'lessee_address',
'fieldtype': 'Text',
'idx': 7,
'label': 'Lessee Address',
'permlevel': 0
},
# DocField
{
'doctype': 'DocField',
'fieldtype': 'Section Break',
'idx': 8,
'label': 'Vehicle Info.',
'permlevel': 0
},
# DocField
{
'doctype': 'DocField',
'fieldname': 'model_no',
'fieldtype': 'Data',
'idx': 9,
'label': 'Model No',
'permlevel': 0
},
# DocField
{
'doctype': 'DocField',
'fieldname': 'engine_no',
'fieldtype': 'Data',
'idx': 10,
'label': 'Engine No',
'permlevel': 0
},
# DocField
{
'doctype': 'DocField',
'fieldname': 'chassis_no',
'fieldtype': 'Data',
'idx': 11,
'label': 'Chassis No',
'permlevel': 0
},
# DocField
{
'doctype': 'DocField',
'fieldtype': 'Section Break',
'idx': 12,
'label': 'Invoice and Payment Info.',
'permlevel': 0
},
# DocField
{
'colour': 'White:FFF',
'doctype': 'DocField',
'fieldname': 'invoice',
'fieldtype': 'Link',
'idx': 13,
'label': 'Invoice',
'options': 'Receivable Voucher',
'permlevel': 0,
'reqd': 1,
'trigger': 'Client'
},
# DocField
{
'doctype': 'DocField',
'fieldname': 'invoice_amount',
'fieldtype': 'Currency',
'idx': 14,
'label': 'Invoice Amount',
'permlevel': 1
},
# DocField
{
'doctype': 'DocField',
'fieldname': 'down_payment',
'fieldtype': 'Currency',
'idx': 15,
'label': 'Down Payment',
'permlevel': 0,
'reqd': 1
},
# DocField
{
'doctype': 'DocField',
'fieldname': 'start_date',
'fieldtype': 'Date',
'idx': 16,
'label': 'Start Date',
'permlevel': 0,
'reqd': 1
},
# DocField
{
'doctype': 'DocField',
'fieldname': 'no_of_installments',
'fieldtype': 'Int',
'idx': 17,
'label': 'No of Installments',
'permlevel': 0,
'reqd': 1
},
# DocField
{
'doctype': 'DocField',
'fieldname': 'installment_amount',
'fieldtype': 'Currency',
'idx': 18,
'label': 'Installment Amount',
'permlevel': 0
},
# DocField
{
'colour': 'White:FFF',
'doctype': 'DocField',
'fieldtype': 'Button',
'idx': 19,
'label': 'Generate',
'permlevel': 0,
'trigger': 'Client'
},
# DocField
{
'doctype': 'DocField',
'fieldname': 'installments',
'fieldtype': 'Table',
'idx': 20,
'label': 'Installments',
'options': 'Lease Installment',
'permlevel': 0
},
# DocField
{
'allow_on_submit': 1,
'colour': 'White:FFF',
'doctype': 'DocField',
'fieldtype': 'Button',
'idx': 21,
'label': 'Installment Reciept',
'permlevel': 0
}
]

0
accounts/doctype/lease_installment/__init__.py Normal file
View File

91
accounts/doctype/lease_installment/lease_installment.txt Normal file
View File

@ -0,0 +1,91 @@
# DocType, Lease Installment
[
# These values are common in all dictionaries
{
'creation': '2011-07-22 17:49:33',
'docstatus': 0,
'modified': '2011-07-22 17:49:33',
'modified_by': 'Administrator',
'owner': 'Administrator'
},
# These values are common for all DocType
{
'colour': 'White:FFF',
'doctype': 'DocType',
'istable': 1,
'module': 'Accounts',
'name': '__common__',
'section_style': 'Simple',
'show_in_menu': 0,
'version': 5
},
# These values are common for all DocField
{
'doctype': 'DocField',
'name': '__common__',
'parent': 'Lease Installment',
'parentfield': 'fields',
'parenttype': 'DocType'
},
# DocType, Lease Installment
{
'doctype': 'DocType',
'name': 'Lease Installment'
},
# DocField
{
'doctype': 'DocField',
'fieldname': 'amount',
'fieldtype': 'Currency',
'idx': 1,
'label': 'Amount',
'permlevel': 0
},
# DocField
{
'doctype': 'DocField',
'fieldname': 'due_date',
'fieldtype': 'Date',
'idx': 2,
'label': 'Due Date',
'permlevel': 0
},
# DocField
{
'doctype': 'DocField',
'fieldname': 'cheque_number',
'fieldtype': 'Data',
'idx': 3,
'label': 'Cheque Number',
'permlevel': 0
},
# DocField
{
'doctype': 'DocField',
'fieldname': 'cheque_date',
'fieldtype': 'Date',
'idx': 4,
'label': 'Cheque Date',
'permlevel': 0
},
# DocField
{
'doctype': 'DocField',
'fieldname': 'jv_number',
'fieldtype': 'Link',
'hidden': 0,
'idx': 5,
'label': 'JV Number',
'options': 'Journal Voucher',
'permlevel': 1
}
]

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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'):
msgprint("Please select From Posting Date and To Posting Date ")
raise Exception
msgprint("Please select From Posting Date and To Posting Date ")
raise Exception
else:
from_date = filter_values.get('posting_date')
to_date = filter_values.get('posting_date1')
from_date = filter_values.get('posting_date')
to_date = filter_values.get('posting_date1')
if not filter_values['range_1'] or not filter_values['range_2'] or not filter_values['range_3'] or not filter_values['range_4']:
msgprint("Please select aging ranges in no of days in 'More Filters' ")
raise Exception
msgprint("Please select aging ranges in no of days in 'More Filters' ")
raise Exception
# validate Range
range_list = ['range_1','range_2','range_3','range_4']
for r in range(len(range_list)-1):
if not cint(filter_values[range_list[r]]) < cint(filter_values[range_list[r + 1]]):
msgprint("Range %s should be less than Range %s." % (cstr(r+1),cstr(r+2)))
raise Exception
if not cint(filter_values[range_list[r]]) < cint(filter_values[range_list[r + 1]]):
msgprint("Range %s should be less than Range %s." % (cstr(r+1),cstr(r+2)))
raise Exception
# Add columns
# ------------------------------------------------------------------
data = [['Aging Date','Date','80px',''],
['Transaction Date','Date','80px',''],
['Account','Data','120px',''],
['Against Voucher Type','Data','120px',''],
['Against Voucher','Data','120px',''],
['Voucher Type','Data','120px',''],
['Voucher No','Data','120px',''],
['Remarks','Data','160px',''],
['Supplier Type', 'Data', '80px', ''],
['Due Date', 'Data', '80px', ''],
['Bill No','Data','80px',''],
['Bill Date','Data','80px',''],
['Opening Amt','Currency','120px',''],
['Outstanding Amt','Currency','120px',''],
['Age (Days)', 'Currency', '150px', ''],
['0-'+cstr(filter_values['range_1']),'Currency','100px',''],
[cstr(cint(filter_values['range_1']) + 1)+ '-' +cstr(filter_values['range_2']),'Currency','100px',''],
[cstr(cint(filter_values['range_2']) + 1)+ '-' +cstr(filter_values['range_3']),'Currency','100px',''],
[cstr(cint(filter_values['range_3']) + 1)+ '-' +cstr(filter_values['range_4']),'Currency','100px',''],
[cstr(filter_values['range_4']) + '-Above','Currency','100px','']]
['Transaction Date','Date','80px',''],
['Account','Data','120px',''],
['Against Voucher Type','Data','120px',''],
['Against Voucher','Data','120px',''],
['Voucher Type','Data','120px',''],
['Voucher No','Data','120px',''],
['Remarks','Data','160px',''],
['Supplier Type', 'Data', '80px', ''],
['Due Date', 'Data', '80px', ''],
['Bill No','Data','80px',''],
['Bill Date','Data','80px',''],
['Opening Amt','Currency','120px',''],
['Outstanding Amt','Currency','120px',''],
['Age (Days)', 'Currency', '150px', ''],
['0-'+cstr(filter_values['range_1']),'Currency','100px',''],
[cstr(cint(filter_values['range_1']) + 1)+ '-' +cstr(filter_values['range_2']),'Currency','100px',''],
[cstr(cint(filter_values['range_2']) + 1)+ '-' +cstr(filter_values['range_3']),'Currency','100px',''],
[cstr(cint(filter_values['range_3']) + 1)+ '-' +cstr(filter_values['range_4']),'Currency','100px',''],
[cstr(filter_values['range_4']) + '-Above','Currency','100px','']]
for d in data:
colnames.append(d[0])
coltypes.append(d[1])
colwidths.append(d[2])
coloptions.append(d[3])
col_idx[d[0]] = len(colnames)-1
colnames.append(d[0])
coltypes.append(d[1])
colwidths.append(d[2])
coloptions.append(d[3])
col_idx[d[0]] = len(colnames)-1
# ageing based on
# ------------------------------------------------------------------
aging_based_on = 'Aging Date'
if filter_values.has_key('aging_based_on') and filter_values['aging_based_on']:
aging_based_on = filter_values['aging_based_on'].split(NEWLINE)[-1]
aging_based_on = filter_values['aging_based_on'].split(NEWLINE)[-1]
if len(res) > 600 and from_export == 0:
msgprint("This is a very large report and cannot be shown in the browser as it is likely to make your browser very slow.Please select Account or click on 'Export' to open in excel")
raise Exception
if len(res) > 600 and from_export == 0:
msgprint("This is a very large report and cannot be shown in the browser as it is likely to make your browser very slow.Please select Account or click on 'Export' to open in excel")
raise Exception
# ------------------------------------------------------------------
# main loop starts here
# ------------------------------------------------------------------
# get supplier type
supp_type_dict = {}
for each in sql("select t2.name, t1.supplier_type from tabSupplier t1, tabAccount t2 where t1.name = t2.account_name group by t2.name"):
supp_type_dict[each[0]] = each[1]
# get due_date, bill_no, bill_date from PV
pv_dict = {}
for t in sql("select name, due_date, bill_no, bill_date from `tabPayable Voucher` group by name"):
pv_dict[t[0]] = [cstr(t[1]), t[2], cstr(t[3])]
# pv outside this period
pv_outside_period = [d[0] for d in sql("select distinct name from `tabPayable Voucher` where (posting_date < '%s' or posting_date > '%s') and docstatus = 1" % (from_date, to_date))]
out = []
total_booking_amt, total_outstanding_amt = 0,0
for r in res:
# get supplier type
supplier_type = sql("select t1.supplier_type from tabSupplier t1, tabAccount t2 where t1.name = t2.account_name and t2.name = '%s'" % r[col_idx['Account']])
r.append(supplier_type and cstr(supplier_type[0][0]) or '')
outstanding_amt, due_date, bill_no, bill_date, cond = 0, '','','', ''
booking_amt = r.pop(8)
# supplier type
r.append(supp_type_dict.get(r[col_idx['Account']], ''))
# if entry against Payable Voucher
if r[col_idx['Against Voucher']] and r[col_idx['Voucher Type']] == 'Payable Voucher':
r += pv_dict.get(r[col_idx['Voucher No']], ['', '', ''])
cond = " and ifnull(against_voucher, '') = '%s'" % r[col_idx['Against Voucher']]
outstanding_amt, booking_amt, due_date, bill_no, bill_date, cond = 0,0, '','','', ''
# if entry against JV & and not adjusted within period
elif r[col_idx['Against Voucher Type']] == 'Payable Voucher' and r[col_idx['Against Voucher']] in pv_outside_period:
booking_amt = 0
cond = " and voucher_no = '%s' and ifnull(against_voucher, '') = '%s'" % (r[col_idx['Voucher No']], r[col_idx['Against Voucher']])
# if un-adjusted
elif not r[col_idx['Against Voucher']]:
booking_amt = 0
cond = " and ((voucher_no = '%s' and ifnull(against_voucher, '') = '') or (ifnull(against_voucher, '') = '%s' and voucher_type = 'Journal Voucher'))" % (r[col_idx['Voucher No']], r[col_idx['Voucher No']])
# if entry against Payable Voucher
if r[col_idx['Against Voucher']] and r[col_idx['Voucher Type']] == 'Payable Voucher':
due_date, bill_no, bill_date = [cstr(t) for t in sql("select due_date,bill_no,bill_date from `tabPayable Voucher` where name = %s", r[col_idx['Voucher No']])[0]]
if cond:
outstanding_amt = flt(sql("select sum(ifnull(credit, 0))-sum(ifnull(debit, 0)) from `tabGL Entry` where account = '%s' and ifnull(is_cancelled, 'No') = 'No' and posting_date <= '%s' %s" % (r[col_idx['Account']], to_date, cond))[0][0] or 0)
# get opening
booking_amt = sql("select credit from `tabGL Entry` where account = %s and voucher_no = %s and is_cancelled = 'No'", (r[col_idx['Account']], r[col_idx['Voucher No']]))
booking_amt = booking_amt and flt(booking_amt[0][0]) or 0
# add to total outstanding
total_outstanding_amt += flt(outstanding_amt)
cond = " and against_voucher = '%s' and against_voucher is not null" % r[col_idx['Against Voucher']]
# add to total booking amount
if outstanding_amt and r[col_idx['Voucher Type']] == 'Payable Voucher' and r[col_idx['Against Voucher']]:
total_booking_amt += flt(booking_amt)
# if entry against JV & and not adjusted within period
elif r[col_idx['Against Voucher Type']] == 'Payable Voucher' and sql("select name from `tabPayable Voucher` where name = '%s' and (posting_date < '%s' or posting_date > '%s') and docstatus = 1" % (r[col_idx['Against Voucher']], from_date, to_date)):
cond = " and voucher_no = '%s' and ifnull(against_voucher, '') = '%s'" % (r[col_idx['Voucher No']], r[col_idx['Against Voucher']])
# if un-adjusted
elif not r[col_idx['Against Voucher']]:
cond = " and ((voucher_no = '%s' and ifnull(against_voucher, '') = '') or (ifnull(against_voucher, '') = '%s' and voucher_type = 'Journal Voucher'))" % (r[col_idx['Voucher No']], r[col_idx['Voucher No']])
r += [booking_amt, outstanding_amt]
# split into date ranges
val_l1 = val_l2 = val_l3 = val_l4 = val_l5_above= 0
if r[col_idx[aging_based_on]]:
diff = (getdate(to_date) - getdate(r[col_idx[aging_based_on]])).days
if diff < cint(filter_values['range_1']):
val_l1 = outstanding_amt
if diff >= cint(filter_values['range_1']) and diff < cint(filter_values['range_2']):
val_l2 = outstanding_amt
if diff >= cint(filter_values['range_2']) and diff < cint(filter_values['range_3']):
val_l3 = outstanding_amt
if diff >= cint(filter_values['range_3']) and diff < cint(filter_values['range_4']):
val_l4 = outstanding_amt
if diff >= cint(filter_values['range_4']):
val_l5_above = outstanding_amt
if cond:
outstanding_amt = flt(sql("select sum(ifnull(credit, 0))-sum(ifnull(debit, 0)) from `tabGL Entry` where account = '%s' and ifnull(is_cancelled, 'No') = 'No' and posting_date <= '%s' %s" % (r[col_idx['Account']], to_date, cond))[0][0] or 0)
r += [diff, val_l1, val_l2, val_l3, val_l4, val_l5_above]
# add to total outstanding
total_outstanding_amt += flt(outstanding_amt)
# add to total booking amount
if outstanding_amt and r[col_idx['Voucher Type']] == 'Payable Voucher' and r[col_idx['Against Voucher']]:
total_booking_amt += flt(booking_amt)
r += [due_date, bill_no, bill_date, booking_amt, outstanding_amt]
# split into date ranges
val_l1 = val_l2 = val_l3 = val_l4 = val_l5_above= 0
if r[col_idx[aging_based_on]]:
diff = (getdate(to_date) - getdate(r[col_idx[aging_based_on]])).days
if diff < cint(filter_values['range_1']):
val_l1 = outstanding_amt
if diff >= cint(filter_values['range_1']) and diff < cint(filter_values['range_2']):
val_l2 = outstanding_amt
if diff >= cint(filter_values['range_2']) and diff < cint(filter_values['range_3']):
val_l3 = outstanding_amt
if diff >= cint(filter_values['range_3']) and diff < cint(filter_values['range_4']):
val_l4 = outstanding_amt
if diff >= cint(filter_values['range_4']):
val_l5_above = outstanding_amt
r += [diff, val_l1, val_l2, val_l3, val_l4, val_l5_above]
# Only show that entry which has outstanding
if abs(flt(outstanding_amt)) > 0.001:
out.append(r)
if len(out) > 300 and from_export == 0:
msgprint("This is a very large report and cannot be shown in the browser as it is likely to make your browser very slow.Please select Account or click on 'Export' to open in excel")
raise Exception
# Only show that entry which has outstanding
if abs(flt(outstanding_amt)) > 0.001:
out.append(r)
if len(out) > 300 and from_export == 0:
msgprint("This is a very large report and cannot be shown in the browser as it is likely to make your browser very slow.Please select Account or click on 'Export' to open in excel")
raise Exception
# Append Extra rows to RES

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

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

6
accounts/search_criteria/accounts_receivable/accounts_receivable.js
View File

@ -5,8 +5,8 @@ report.customize_filters = function() {
this.filter_fields_dict['GL Entry'+FILTER_SEP +'From Posting Date'].df.filter_hide = 0;
this.filter_fields_dict['GL Entry'+FILTER_SEP +'To Posting Date'].df.filter_hide = 0;
this.filter_fields_dict['GL Entry'+FILTER_SEP +'Account'].df.filter_hide = 0;
this.add_filter({fieldname:'aging_based_on', label:'Aging Based On', fieldtype:'Select', options:NEWLINE+'Transaction Date'+NEWLINE+'Aging Date'+NEWLINE+'Due Date',ignore : 1, parent:'Receivable Voucher', report_default:'Aging Date'});
this.add_filter({fieldname:'aging_based_on', label:'Aging Based On', fieldtype:'Select', options:NEWLINE+'Transaction Date'+NEWLINE+'Aging Date'+NEWLINE+'Due Date',ignore : 1, parent:'Receivable Voucher', report_default:'Aging Date'});
this.add_filter({fieldname:'range_1', label:'Range 1', fieldtype:'Data', ignore : 1, parent:'GL Entry'});
this.add_filter({fieldname:'range_2', label:'Range 2', fieldtype:'Data', ignore : 1, parent:'GL Entry'});
this.add_filter({fieldname:'range_3', label:'Range 3', fieldtype:'Data', ignore : 1, parent:'GL Entry'});
@ -19,4 +19,4 @@ report.customize_filters = function() {
this.dt.set_no_limit(1);
}
this.mytabs.items['Select Columns'].hide()
//this.mytabs.items['Select Columns'].hide()

0
accounts/search_criteria/lease_agreement_list/__init__.py Normal file
View File

30
accounts/search_criteria/lease_agreement_list/lease_agreement_list.txt Normal file
View File

@ -0,0 +1,30 @@
# Search Criteria, lease_agreement_list
[
# These values are common in all dictionaries
{
'creation': '2011-07-27 13:14:29',
'docstatus': 0,
'modified': '2011-07-27 13:14:29',
'modified_by': 'Administrator',
'owner': 'Administrator'
},
# These values are common for all Search Criteria
{
'columns': 'GL Entry\x01ID,GL Entry\x01Owner,GL Entry\x01Posting Date,GL Entry\x01Aging Date,GL Entry\x01Account,GL Entry\x01Cost Center,GL Entry\x01Against,GL Entry\x01Against Voucher,GL Entry\x01Voucher Type,GL Entry\x01Voucher No,GL Entry\x01Remarks,GL Entry\x01Is Cancelled,GL Entry\x01Is Opening,GL Entry\x01Fiscal Year,GL Entry\x01Company',
'criteria_name': 'Lease Agreement List',
'doc_type': 'GL Entry',
'doctype': 'Search Criteria',
'filters': "{'GL Entry\x01Voucher Type':'','GL Entry\x01Is Cancelled':'','GL Entry\x01Is Opening':'','GL Entry\x01Fiscal Year':''}",
'module': 'Accounts',
'name': '__common__',
'standard': 'Yes'
},
# Search Criteria, lease_agreement_list
{
'doctype': 'Search Criteria',
'name': 'lease_agreement_list'
}
]

0
accounts/search_criteria/lease_monthly_future_installment_inflows/__init__.py Normal file
View File

30
accounts/search_criteria/lease_monthly_future_installment_inflows/lease_monthly_future_installment_inflows.txt Normal file
View File

@ -0,0 +1,30 @@
# Search Criteria, lease_monthly_future_installment_inflows
[
# These values are common in all dictionaries
{
'creation': '2011-07-27 13:14:29',
'docstatus': 0,
'modified': '2011-07-27 13:14:29',
'modified_by': 'Administrator',
'owner': 'Administrator'
},
# These values are common for all Search Criteria
{
'columns': 'GL Entry\x01ID,GL Entry\x01Owner,GL Entry\x01Posting Date,GL Entry\x01Aging Date,GL Entry\x01Account,GL Entry\x01Cost Center,GL Entry\x01Against,GL Entry\x01Against Voucher,GL Entry\x01Voucher Type,GL Entry\x01Voucher No,GL Entry\x01Remarks,GL Entry\x01Is Cancelled,GL Entry\x01Is Opening,GL Entry\x01Fiscal Year,GL Entry\x01Company',
'criteria_name': 'Lease Monthly Future Installment Inflows',
'doc_type': 'GL Entry',
'doctype': 'Search Criteria',
'filters': "{'GL Entry\x01Voucher Type':'','GL Entry\x01Is Cancelled':'','GL Entry\x01Is Opening':'','GL Entry\x01Fiscal Year':''}",
'module': 'Accounts',
'name': '__common__',
'standard': 'Yes'
},
# Search Criteria, lease_monthly_future_installment_inflows
{
'doctype': 'Search Criteria',
'name': 'lease_monthly_future_installment_inflows'
}
]

0
accounts/search_criteria/lease_over_due_list/__init__.py Normal file
View File

30
accounts/search_criteria/lease_over_due_list/lease_over_due_list.txt Normal file
View File

@ -0,0 +1,30 @@
# Search Criteria, lease_over_due_list
[
# These values are common in all dictionaries
{
'creation': '2011-07-26 18:11:47',
'docstatus': 0,
'modified': '2011-07-26 18:27:01',
'modified_by': 'Administrator',
'owner': 'Administrator'
},
# These values are common for all Search Criteria
{
'columns': 'GL Entry\x01ID,GL Entry\x01Owner,GL Entry\x01Posting Date,GL Entry\x01Aging Date,GL Entry\x01Account,GL Entry\x01Cost Center,GL Entry\x01Against,GL Entry\x01Against Voucher,GL Entry\x01Voucher Type,GL Entry\x01Voucher No,GL Entry\x01Remarks,GL Entry\x01Is Cancelled,GL Entry\x01Is Opening,GL Entry\x01Fiscal Year,GL Entry\x01Company',
'criteria_name': 'Lease Over Due List',
'doc_type': 'GL Entry',
'doctype': 'Search Criteria',
'filters': "{'GL Entry\x01Voucher Type':'','GL Entry\x01Is Cancelled':'','GL Entry\x01Is Opening':'','GL Entry\x01Fiscal Year':''}",
'module': 'Accounts',
'name': '__common__',
'standard': 'Yes'
},
# Search Criteria, lease_over_due_list
{
'doctype': 'Search Criteria',
'name': 'lease_over_due_list'
}
]

0
accounts/search_criteria/lease_overdue_age_wise/__init__.py Normal file
View File

30
accounts/search_criteria/lease_overdue_age_wise/lease_overdue_age_wise.txt Normal file
View File

@ -0,0 +1,30 @@
# Search Criteria, lease_overdue_age_wise
[
# These values are common in all dictionaries
{
'creation': '2011-07-27 13:14:29',
'docstatus': 0,
'modified': '2011-07-27 13:14:29',
'modified_by': 'Administrator',
'owner': 'Administrator'
},
# These values are common for all Search Criteria
{
'columns': 'GL Entry\x01ID,GL Entry\x01Owner,GL Entry\x01Posting Date,GL Entry\x01Aging Date,GL Entry\x01Account,GL Entry\x01Cost Center,GL Entry\x01Against,GL Entry\x01Against Voucher,GL Entry\x01Voucher Type,GL Entry\x01Voucher No,GL Entry\x01Remarks,GL Entry\x01Is Cancelled,GL Entry\x01Is Opening,GL Entry\x01Fiscal Year,GL Entry\x01Company',
'criteria_name': 'Lease Overdue Age Wise',
'doc_type': 'GL Entry',
'doctype': 'Search Criteria',
'filters': "{'GL Entry\x01Voucher Type':'','GL Entry\x01Is Cancelled':'','GL Entry\x01Is Opening':'','GL Entry\x01Fiscal Year':''}",
'module': 'Accounts',
'name': '__common__',
'standard': 'Yes'
},
# Search Criteria, lease_overdue_age_wise
{
'doctype': 'Search Criteria',
'name': 'lease_overdue_age_wise'
}
]

0
accounts/search_criteria/lease_receipt_summary_year_to_date/__init__.py Normal file
View File

33
accounts/search_criteria/lease_receipt_summary_year_to_date/lease_receipt_summary_year_to_date.txt Normal file
View File

@ -0,0 +1,33 @@
# Search Criteria, lease_receipt_summary_year_to_date
[
# These values are common in all dictionaries
{
'creation': '2011-07-27 13:14:29',
'docstatus': 0,
'modified': '2011-07-27 13:14:29',
'modified_by': 'Administrator',
'owner': 'Administrator'
},
# These values are common for all Search Criteria
{
'columns': 'GL Entry\x01ID,GL Entry\x01Owner,GL Entry\x01Posting Date,GL Entry\x01Aging Date,GL Entry\x01Account,GL Entry\x01Cost Center,GL Entry\x01Against,GL Entry\x01Against Voucher,GL Entry\x01Voucher Type,GL Entry\x01Voucher No,GL Entry\x01Remarks,GL Entry\x01Is Cancelled,GL Entry\x01Is Opening,GL Entry\x01Fiscal Year,GL Entry\x01Company',
'criteria_name': 'Lease Receipt Summary (Year to date)',
'doc_type': 'GL Entry',
'doctype': 'Search Criteria',
'filters': "{'GL Entry\x01Voucher Type':'','GL Entry\x01Is Cancelled':'','GL Entry\x01Is Opening':'','GL Entry\x01Fiscal Year':''}",
'module': 'Accounts',
'name': '__common__',
'page_len': 50,
'sort_by': '`tabGL Entry`.`company`',
'sort_order': 'DESC',
'standard': 'Yes'
},
# Search Criteria, lease_receipt_summary_year_to_date
{
'doctype': 'Search Criteria',
'name': 'lease_receipt_summary_year_to_date'
}
]

0
accounts/search_criteria/lease_receipts_client_wise/__init__.py Normal file
View File

30
accounts/search_criteria/lease_receipts_client_wise/lease_receipts_client_wise.txt Normal file
View File

@ -0,0 +1,30 @@
# Search Criteria, lease_receipts_client_wise
[
# These values are common in all dictionaries
{
'creation': '2011-07-27 13:14:29',
'docstatus': 0,
'modified': '2011-07-27 13:14:29',
'modified_by': 'Administrator',
'owner': 'Administrator'
},
# These values are common for all Search Criteria
{
'columns': 'GL Entry\x01ID,GL Entry\x01Owner,GL Entry\x01Posting Date,GL Entry\x01Aging Date,GL Entry\x01Account,GL Entry\x01Cost Center,GL Entry\x01Against,GL Entry\x01Against Voucher,GL Entry\x01Voucher Type,GL Entry\x01Voucher No,GL Entry\x01Remarks,GL Entry\x01Is Cancelled,GL Entry\x01Is Opening,GL Entry\x01Fiscal Year,GL Entry\x01Company',
'criteria_name': 'Lease Receipts Client wise',
'doc_type': 'GL Entry',
'doctype': 'Search Criteria',
'filters': "{'GL Entry\x01Voucher Type':'','GL Entry\x01Is Cancelled':'','GL Entry\x01Is Opening':'','GL Entry\x01Fiscal Year':''}",
'module': 'Accounts',
'name': '__common__',
'standard': 'Yes'
},
# Search Criteria, lease_receipts_client_wise
{
'doctype': 'Search Criteria',
'name': 'lease_receipts_client_wise'
}
]

0
accounts/search_criteria/lease_yearly_future_installment_inflows/__init__.py Normal file
View File

30
accounts/search_criteria/lease_yearly_future_installment_inflows/lease_yearly_future_installment_inflows.txt Normal file
View File

@ -0,0 +1,30 @@
# Search Criteria, lease_yearly_future_installment_inflows
[
# These values are common in all dictionaries
{
'creation': '2011-07-27 13:14:29',
'docstatus': 0,
'modified': '2011-07-27 13:14:29',
'modified_by': 'Administrator',
'owner': 'Administrator'
},
# These values are common for all Search Criteria
{
'columns': 'GL Entry\x01ID,GL Entry\x01Owner,GL Entry\x01Posting Date,GL Entry\x01Aging Date,GL Entry\x01Account,GL Entry\x01Cost Center,GL Entry\x01Against,GL Entry\x01Against Voucher,GL Entry\x01Voucher Type,GL Entry\x01Voucher No,GL Entry\x01Remarks,GL Entry\x01Is Cancelled,GL Entry\x01Is Opening,GL Entry\x01Fiscal Year,GL Entry\x01Company',
'criteria_name': 'Lease Yearly Future Installment Inflows',
'doc_type': 'GL Entry',
'doctype': 'Search Criteria',
'filters': "{'GL Entry\x01Voucher Type':'','GL Entry\x01Is Cancelled':'','GL Entry\x01Is Opening':'','GL Entry\x01Fiscal Year':''}",
'module': 'Accounts',
'name': '__common__',
'standard': 'Yes'
},
# Search Criteria, lease_yearly_future_installment_inflows
{
'doctype': 'Search Criteria',
'name': 'lease_yearly_future_installment_inflows'
}
]

27
accounts/utils/__init__.py Normal file
View File

@ -0,0 +1,27 @@
from webnotes.model.doc import make_autoname, Document, addchild
# Posts JV
def post_jv(data):
jv = Document('Journal Voucher')
jv.voucher_type = data.get('voucher_type')
jv.naming_series = data.get('naming_series')
jv.voucher_date = data.get('cheque_date')
jv.posting_date = data.get('cheque_date')
jv.cheque_no = data.get('cheque_number')
jv.cheque_date = data.get('cheque_date')
jv.fiscal_year = data.get('fiscal_year') # To be modified to take care
jv.company = data.get('company')
jv.save(1)
jc = addchild(jv,'entries','Journal Voucher Detail',0)
jc.account = data.get('debit_account')
jc.debit = data.get('amount')
jc.save()
jc = addchild(jv,'entries','Journal Voucher Detail',0)
jc.account = data.get('credit_account')
jc.credit = data.get('amount')
jc.save()
return jv.name

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

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

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

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

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

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

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

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

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

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

1
buying/search_criteria/pending_po_items_to_receive/pending_po_items_to_receive.py
View File

@ -1,2 +1,3 @@
msgprint(colwidths)
colwidths[col_idx['Pending Quantity To Receive']] = '200px'
colwidths[col_idx['Pending Amount To Receive']] = '200px'

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

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

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

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

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

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

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

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

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

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

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

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

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

@ -5,7 +5,7 @@
{
'creation': '2010-08-08 17:09:20',
'docstatus': 0,
'modified': '2011-07-14 16:07:20',
'modified': '2011-07-27 13:10:28',
'modified_by': 'Administrator',
'owner': 'Administrator'
},
@ -21,7 +21,7 @@
'server_code_error': ' ',
'show_in_menu': 0,
'subject': 'For %(employee_name)s, %(designation)s',
'version': 392
'version': 393
},
# These values are common for all DocField
@ -55,19 +55,7 @@
'cancel': 0,
'create': 0,
'doctype': 'DocPerm',
'match': 'owner',
'permlevel': 0,
'role': 'Employee',
'submit': 0,
'write': 0
},
# DocPerm
{
'amend': 0,
'cancel': 0,
'create': 0,
'doctype': 'DocPerm',
'idx': 1,
'match': 'owner',
'permlevel': 0,
'role': 'Employee',
@ -80,7 +68,7 @@
'amend': 0,
'create': 1,
'doctype': 'DocPerm',
'idx': 3,
'idx': 2,
'permlevel': 0,
'role': 'HR User',
'submit': 1,
@ -93,7 +81,7 @@
'cancel': 1,
'create': 1,
'doctype': 'DocPerm',
'idx': 4,
'idx': 3,
'permlevel': 0,
'role': 'HR Manager',
'submit': 1,
@ -103,7 +91,7 @@
# DocPerm
{
'doctype': 'DocPerm',
'idx': 5,
'idx': 4,
'permlevel': 1,
'role': 'HR User'
},
@ -111,7 +99,7 @@
# DocPerm
{
'doctype': 'DocPerm',
'idx': 6,
'idx': 5,
'permlevel': 1,
'role': 'HR Manager'
},
@ -150,7 +138,7 @@
'options': 'Employee',
'permlevel': 0,
'reqd': 1,
'search_index': 0
'search_index': 1
},
# DocField
@ -180,7 +168,7 @@
'options': 'Department',
'permlevel': 1,
'reqd': 0,
'search_index': 1
'search_index': 0
},
# DocField
@ -195,7 +183,7 @@
'oldfieldtype': 'Link',
'options': 'Designation',
'permlevel': 1,
'search_index': 1
'search_index': 0
},
# DocField
@ -210,7 +198,7 @@
'oldfieldtype': 'Link',
'options': 'Branch',
'permlevel': 1,
'search_index': 1
'search_index': 0
},
# DocField
@ -225,7 +213,7 @@
'oldfieldtype': 'Link',
'options': 'Grade',
'permlevel': 1,
'search_index': 1
'search_index': 0
},
# DocField
@ -287,7 +275,7 @@
'options': 'Fiscal Year',
'permlevel': 0,
'reqd': 1,
'search_index': 1
'search_index': 0
},
# DocField

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

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

2
patches/erpnext_structure_cleanup.py
View File

@ -195,6 +195,6 @@ def run_patches():
sync_mapper()
delete_unwanted_modules()
# landed cost wizard link in stock
reload_doc('stock', 'Module Def', 'stock')
reload_doc('stock', 'Module Def', 'Stock')
sql("commit")

49
patches/index_patch.py
View File

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

144
patches/patch.py
View File

@ -1,7 +1,7 @@
# REMEMBER to update this
# ========================
last_patch = 327
last_patch = 332
#-------------------------------------------
@ -46,7 +46,7 @@ def execute(patch_no):
for d in path_list:
doclist = eval(open(d,'r').read())
webnotes.conn.sql("update `tab%s` set module = '%s' where name = '%s'" % (doclist[0]['doctype'], doclist[0]['module'], doclist[0]['name']))
elif patch_no==38:
import webnotes
webnotes.conn.set_global("system_message", "System Updates: Hello! You would have noticed some changes on the Home Page. As a part of our commitment to make the system more friendly and social, we have re-designed the feed so that now you will only see feed that is relevant to you (either you have created something or you have been mentioned in the document).<br><br>On the individual listings, you can add tags and also color them!<br><br>You will also get time-to-time updates from our side here. Do keep sending your feedback at support@erpnext.com.")
@ -56,7 +56,7 @@ def execute(patch_no):
pass
elif patch_no == 40:
import_from_files(record_list=[['material_management','doctype','item']])
elif patch_no == 42:
acc = sql("select name, lft, rgt from tabAccount where account_name in ('Incomes', 'Expenses')")
@ -65,7 +65,7 @@ def execute(patch_no):
elif patch_no == 43:
import webnotes.model
webnotes.model.delete_doc('Page', 'Module Manager')
# cleanup of Service, Customer Support, Utilities Modules
# -------------------------------------------------------
elif patch_no == 44:
@ -86,7 +86,7 @@ def execute(patch_no):
# remove utilities
webnotes.conn.sql('delete from `tabModule Def` where name in ("Customer Support", "Utilities")')
elif patch_no == 45:
webnotes.conn.sql('delete from tabDocField where options="Ticket Response Detail"')
@ -125,7 +125,7 @@ def execute(patch_no):
elif patch_no == 56:
sql("delete from `tabModule Def Item` where parent = 'CRM' and doc_type = 'Reports' and doc_name = 'Delivery Note' and display_name = 'Territory, Item Group wise GP'")
elif patch_no == 57:
import_from_files(record_list=[['crm','doctype','sales_order_detail']])
elif patch_no == 58:
# module def patches
@ -133,24 +133,24 @@ def execute(patch_no):
sql("delete from `tabModule Def Item` where doc_type in ('Separator', 'Setup Forms', 'More Reports')")
sql("delete from `tabModule Def Item` where doc_name = 'Project Activity'")
sql("update `tabModule Def` set module_label = 'People', disabled='No', is_hidden='No' where name = 'My Company'")
# insert new module items
from webnotes.model.doc import make_autoname
if not sql("select name from `tabModule Def Item` where parent='Projects' and doc_name='Ticket'"):
sql("""insert into `tabModule Def Item`
(name, parent, parenttype, parentfield, docstatus, doc_type, doc_name, display_name, idx) values
sql("""insert into `tabModule Def Item`
(name, parent, parenttype, parentfield, docstatus, doc_type, doc_name, display_name, idx) values
(%s, 'Projects', 'Module Def', 'items', 0, 'Forms', 'Ticket', 'Task', 1)""", make_autoname('MDI.#####'))
if not sql("select name from `tabModule Def Item` where parent='Projects' and doc_name='Timesheet'"):
sql("""insert into `tabModule Def Item`
(name, parent, parenttype, parentfield, docstatus, doc_type, doc_name, display_name, idx) values
sql("""insert into `tabModule Def Item`
(name, parent, parenttype, parentfield, docstatus, doc_type, doc_name, display_name, idx) values
(%s, 'Projects', 'Module Def', 'items', 0, 'Forms', 'Timesheet', 'Timesheet', 2)""", make_autoname('MDI.#####'))
if not sql("select name from `tabModule Def Item` where parent='Projects' and doc_name='Projects'"):
sql("""insert into `tabModule Def Item`
(name, parent, parenttype, parentfield, docstatus, doc_type, doc_name, display_name, idx) values
sql("""insert into `tabModule Def Item`
(name, parent, parenttype, parentfield, docstatus, doc_type, doc_name, display_name, idx) values
(%s, 'Projects', 'Module Def', 'items', 0, 'Pages', 'Projects', 'Gantt Chart', 1)""", make_autoname('MDI.#####'))
elif patch_no == 59:
webnotes.conn.set_value('Control Panel',None,'mail_footer','')
webnotes.conn.set_global('global_mail_footer','<div style="margin-top:8px; padding: 8px; font-size: 11px; text-align:right; border-top: 1px solid #AAA">Sent via <a href="https://www.erpnext.com">ERPNext</a></div>')
@ -160,16 +160,16 @@ def execute(patch_no):
sql("delete from `tabTDS Category Account` where company not in (select name from tabCompany)")
elif patch_no == 62:
# Import Supplier Quotation
import_from_files(record_list=[['srm','doctype','supplier_quotation']])
# Adding Status Filter
sql("update tabDocType set search_fields = concat('status,',search_fields) where name IN ('Delivery Note','Leave Transaction')")
# Import Other Charges
import_from_files(record_list=[['setup','doctype','other_charges']])
elif patch_no == 63:
sql("update `tabDocField` set permlevel = 1 where fieldname in ('return_date', 'return_details') and parent = 'Sales and Purchase Return Wizard'")
import_from_files(record_list = [['accounts', 'doctype', 'rv_detail'], ['material_management', 'doctype', 'sales_and_purchase_return_wizard'], ['material_management', 'doctype', 'stock_entry']])
elif patch_no == 64:
sql("update tabDocField set `hidden` = 1, `print_hide` = 1, `report_hide` = 1 where options in ('RFQ','Supplier Quotation')")
@ -183,7 +183,7 @@ def execute(patch_no):
import webnotes
webnotes.conn.set_global("system_message", """<h3>UI Updates</h3>Based on user feedback, we have made a couple of changes in the UI:<ul><li>Sidebar menus are now collapsable</li><li>Forms are now scrollable (we removed the confusing tabs)</li><li>Feed is a lot more descriptive</li></ul>Do send us your feedback!""")
webnotes.conn.set_global("system_message_id", "4")
sql("update `tabModule Def Item` set doc_type = 'Setup Forms' where doc_name in ('TDS Payment', 'TDS Return Acknowledgement', 'Form 16A', 'Period Closing Voucher', 'IT Checklist')")
from webnotes.session_cache import clear_cache
clear_cache(webnotes.session['user'])
@ -212,7 +212,7 @@ def execute(patch_no):
for d in fld_map:
emp_obj.doc.fields[d] = prof_obj.doc.fields[d]
emp_obj.doc.current_accommodation_type = prof_obj.doc.present_accommodation_type
# address
per_addr = cstr(e[2]) + '\n' + cstr(e[3]) + '\n' + cstr(e[4]) + '\n' + cstr(e[5]) + ', ' + cstr(e[6]) + '\n' + 'PIN - ' + cstr(e[7]) + '\n' + 'Ph. No' + cstr(e[8])
cur_addr = cstr(e[9]) + '\n' + cstr(e[10]) + '\n' + cstr(e[11]) + '\n' + cstr(e[12]) + ', ' + cstr(e[13]) + '\n' + 'PIN - ' + cstr(e[14]) + '\n' + 'Ph. No' + cstr(e[15])
@ -244,7 +244,7 @@ def execute(patch_no):
elif patch_no == 70:
# update search criteria module -> System
sql("update tabDocType set module='System' where name='Search Criteria'")
# Cleanups to Contact
sql("update tabDocField set fieldtype='Data' where options='Designation' and parent='Contact'")
sql("update tabDocField set fieldtype='Data' where options='Department' and parent='Contact'")
@ -254,10 +254,10 @@ def execute(patch_no):
from webnotes.modules.import_module import import_from_files
import_from_files(record_list=[['tools','doctype','contact']])
# remove last_contact_date from Lead
sql("delete from tabDocField where fieldname='last_contact_date' and parent='Lead'")
elif patch_no == 71:
# Make Stock Qty and Conversion Factor field editable. Also no need to mention Conversion factor in table can do it directly
sql("update `tabDocField` set `permlevel` = 0, `width` = '100px', `trigger` = 'Client' where parent IN ('PO Detail','Purchase Receipt Detail') and fieldname in ('stock_qty','conversion_factor')")
@ -266,18 +266,18 @@ def execute(patch_no):
elif patch_no == 72:
# Core Patch
# ----------
from webnotes.modules.import_module import import_from_files
# import module def
import_from_files(record_list = [['core', 'Module Def', 'Core']])
elif patch_no == 73:
# set module in DocTypes
sql("update tabDocType set module='Core' where name in ('DocType', 'DocField', 'DocPerm', 'Role', 'UserRole', 'Profile', 'Print Format', 'DocFormat', 'Control Panel', 'Event', 'Event Role', 'Event User', 'DefaultValue', 'Default Home Page', 'File', 'File Group', 'File Data', 'Letter Head', 'Module Def', 'Module Def Item', 'Module Def Role', 'Page', 'Page Role', 'Search Criteria', 'DocType Label', 'DocType Mapper', 'Field Mapper Detail', 'Table Mapper Detail')")
# set module in Page
sql("update tabPage set module='Core' where name='Login Page'")
# move file browser to Tools
sql("update tabPage set module='Tools' where name='File Browser'")
sql("update tabDocType set module='Tools' where name='File Browser Control'")
@ -351,7 +351,7 @@ def execute(patch_no):
p.add_permission('Salary Slip', 'Employee', 1, read = 1, match = 'owner')
elif patch_no == 79:
# Import Modules
import_from_files(record_list=[['payroll','doctype','leave_application'],['payroll','doctype','leave_allocation'],['payroll','doctype','leave_control_panel'],['payroll','doctype','holiday_list'],['payroll','doctype','holiday_list_detail'],['payroll','Module Def','Payroll']])
elif patch_no == 80:
# Holiday List
@ -405,7 +405,7 @@ def execute(patch_no):
elif patch_no == 81:
# Import Modules
import_from_files(record_list=[['payroll','Module Def','Payroll']])
elif patch_no == 82:
sql("update tabDocType set search_fields = 'employee,leave_type,total_leaves_allocated,fiscal_year' where name = 'Leave Allocation'")
@ -432,13 +432,13 @@ def execute(patch_no):
sql("update tabDocPerm set `match` = '' where parent = 'Leave Application' and role = 'HR User'")
elif patch_no == 86:
# Import Modules
import_from_files(record_list=[['payroll','doctype','leave_type']])
elif patch_no == 87:
sql("update `tabLeave Type` set is_lwp = 1 where name = 'Leave Without Pay'")
elif patch_no == 88:
# Import Modules
import_from_files(record_list=[['payroll','doctype','leave_allocation']])
elif patch_no == 89:
sql("delete from `tabModule Def Item` where doc_type = 'Setup Forms' and doc_name in ('Payroll Rule', 'IT Checklist', 'Employee Profile') and parent = 'Payroll'")
@ -457,10 +457,10 @@ def execute(patch_no):
sql("update `tabTable Mapper Detail` set validation_logic = 'qty > ifnull(billed_qty,0) and docstatus = 1' where parent = 'Sales Order-Receivable Voucher' and from_table = 'Sales Order Detail'")
sql("update `tabField Mapper Detail` set from_field = 'customer' where to_field = 'customer' and parent = 'Sales Order-Receivable Voucher'")
elif patch_no == 94:
import_from_files(record_list=[['crm','doctype','sms_center']])
elif patch_no == 95:
import_from_files(record_list=[['mapper','DocType Mapper','Sales Order-Receivable Voucher'], ['mapper','DocType Mapper','Delivery Note-Receivable Voucher']])
elif patch_no == 96:
sql("delete from `tabModule Def Item` where doc_type = 'Reports' and display_name = 'Cenvat Credit - Input or Capital Goods' and parent = 'Accounts'")
@ -490,7 +490,7 @@ def execute(patch_no):
elif patch_no == 103:
sql("update tabDocField set fieldname = '' where fieldtype = 'HTML'")
elif patch_no == 104:
import_from_files(record_list=[['payroll','search_criteria','stdsrch_00001'],['payroll','search_criteria','stdsrch_00002'],['payroll','search_criteria','stdsrch_00003'],['payroll','Module Def','Payroll'],['payroll','doctype','leave_application'],['payroll','doctype','leave_allocation']])
elif patch_no == 105:
# Employee Leave Balance
@ -535,7 +535,7 @@ def execute(patch_no):
# patch for timesheet cleanup
from webnotes.model import delete_doc
delete_doc('DocType', 'Timesheet Detail')
from webnotes.modules.import_module import import_from_files
import_from_files(record_list = [['Projects', 'DocType', 'Timesheet'], ['Projects', 'DocType', 'Timesheet Detail'], ['Projects', 'DocType', 'Activity Type']])
@ -543,7 +543,7 @@ def execute(patch_no):
# again!
from webnotes.model import delete_doc
delete_doc('DocType', 'Timesheet Detail')
from webnotes.modules.import_module import import_from_files
import_from_files(record_list = [['Projects', 'DocType', 'Timesheet Detail']])
elif patch_no == 117:
@ -646,13 +646,13 @@ def execute(patch_no):
elif patch_no == 142:
# fixes to letter head and personalize
from webnotes.model import delete_doc
delete_doc('DocType', 'Batch Settings')
delete_doc('DocType', 'Batch Settings Detail')
delete_doc('DocType', 'Social Badge')
delete_doc('Page', 'Personalize Page')
delete_doc('DocType', 'Personalize Page Control')
import_from_files(record_list=[['core','doctype','letter_head'], ['setup','doctype','personalize']])
elif patch_no == 144:
webnotes.conn.sql("update tabDocField set fieldtype='Code' where parent='Letter Head' and fieldname='content'")
@ -917,7 +917,7 @@ def execute(patch_no):
reload_doc('knowledge_base', 'page', 'questions')
reload_doc('knowledge_base', 'Module Def', 'Knowledge Base')
sql("update `tabModule Def` set disabled='No' where name='Knowledge Base'")
elif patch_no == 229:
elif patch_no == 229:
reload_doc('knowledge_base', 'page', 'question_view')
elif patch_no == 230:
reload_doc('srm', 'doctype', 'indent')
@ -933,7 +933,7 @@ def execute(patch_no):
elif patch_no == 234:
sql("update `tabTable Mapper Detail` set validation_logic = 'docstatus=1' where parent = 'Sales Order-Indent' and from_table = 'Sales Order Detail'")
elif patch_no == 235:
for sc in sql("""select name from `tabSearch Criteria` where ifnull(name,'')
for sc in sql("""select name from `tabSearch Criteria` where ifnull(name,'')
like 'srch%' or ifnull(name,'') like '%stdsrch'"""):
try:
get_obj('Search Criteria', sc[0]).rename()
@ -951,7 +951,7 @@ def execute(patch_no):
elif patch_no == 239:
reload_doc('core', 'doctype', 'docfield')
reload_doc('core', 'doctype', 'doctype')
from patches.feed_patch import set_subjects_and_tagfields
set_subjects_and_tagfields()
elif patch_no == 240:
@ -1026,7 +1026,7 @@ def execute(patch_no):
sql("update `tabItem` set description_html = replace(description_html, 'http://46.4.50.84/v170-test/', '')")
elif patch_no == 257:
from patches.customer_address import run_old_data_sync_patch
run_old_data_sync_patch()
run_old_data_sync_patch()
elif patch_no == 258:
sql("update tabDocField set `default`=NULL where fieldname = 'naming_series'")
elif patch_no == 259:
@ -1050,7 +1050,7 @@ def execute(patch_no):
elif patch_no == 263:
ol = ['','Open','To Reply','Waiting for Customer','Hold','Closed']
sql("update tabDocField set options=%s where parent=%s and fieldname=%s", ('\n'.join(ol), 'Support Ticket', 'status'))
elif patch_no == 264:
elif patch_no == 264:
sql("delete from tabDocField where parent = 'Customer Issue' and (fieldname = 'issue_in' or fieldname = 'issue_category')")
sql("update tabDocField set options=NULL where parent='Support Ticket' and label = 'Send'")
elif patch_no == 266:
@ -1077,12 +1077,12 @@ def execute(patch_no):
reload_doc('crm','doctype','sales_order')
reload_doc('material_management','doctype','delivery_note')
sql("delete from tabDocField where fieldname='per_amt_billed' and parent in ('Sales Order', 'Delivery Note')")
sql("""update `tabSales Order` set delivery_status = if(ifnull(per_delivered,0) < 0.001, 'Not Delivered',
sql("""update `tabSales Order` set delivery_status = if(ifnull(per_delivered,0) < 0.001, 'Not Delivered',
if(per_delivered >= 99.99, 'Fully Delivered', 'Partly Delivered'))""")
sql("""update `tabSales Order` set billing_status = if(ifnull(per_billed,0) < 0.001, 'Not Billed',
sql("""update `tabSales Order` set billing_status = if(ifnull(per_billed,0) < 0.001, 'Not Billed',
if(per_billed >= 99.99, 'Fully Billed', 'Partly Billed'))""")
sql("""update `tabDelivery Note` set billing_status = if(ifnull(per_billed,0) < 0.001, 'Not Billed',
sql("""update `tabDelivery Note` set billing_status = if(ifnull(per_billed,0) < 0.001, 'Not Billed',
if(per_billed >= 99.99, 'Fully Billed', 'Partly Billed'))""")
elif patch_no == 272:
from webnotes.model import delete_doc
@ -1116,7 +1116,7 @@ def execute(patch_no):
rec = sql("select voucher_type, voucher_no, ifnull(is_cancelled, 'No') from `tab%s` where modified >= '2011-06-15 01:00:00' group by voucher_no" % t)
for d in rec:
sql("update `tab%s` set docstatus = %s where name = '%s'" % (d[0], d[2]=='No' and 1 or 2, d[1]))
other_dt = ['Enquiry', 'Quotation', 'Sales Order', 'Indent', 'Purchase Order', 'Production Order', 'Customer Issue', 'Installation Note']
for dt in other_dt:
rec = sql("select name, status from `tab%s` where modified >= '2011-06-15 01:00:00'" % dt)
@ -1151,9 +1151,9 @@ def execute(patch_no):
reload_doc('accounts', 'doctype', 'payable_voucher')
elif patch_no == 289:
sql("update `tabDocType` set subject = 'From %(supplier_name)s worth %(grand_total)s due on %(due_date)s | %(outstanding_amount)s outstanding' where name = 'Payable Voucher'")
sql("update `tabDocType` set search_fields = 'status,transaction_date,customer,lead,order_type' where name = 'Quotation'")
sql("update `tabDocType` set search_fields = 'status,transaction_date,customer,lead,order_type' where name = 'Quotation'")
elif patch_no == 290:
count = sql("""SELECT * FROM `tabModule Def`
count = sql("""SELECT * FROM `tabModule Def`
WHERE `module_name` LIKE 'Home'""")
if not count:
md = Document('Module Def')
@ -1236,14 +1236,14 @@ def execute(patch_no):
rec = sql("select voucher_type, voucher_no, ifnull(is_cancelled, 'No') from `tab%s` where modified >= '2011-07-06 10:00:00' group by voucher_no" % t)
for d in rec:
sql("update `tab%s` set docstatus = %s where name = '%s'" % (d[0], d[2]=='No' and 1 or 2, d[1]))
other_dt = ['Enquiry', 'Quotation', 'Sales Order', 'Indent', 'Purchase Order', 'Production Order', 'Customer Issue', 'Installation Note']
for dt in other_dt:
rec = sql("select name, status from `tab%s` where modified >= '2011-07-06 10:00:00'" % dt)
for r in rec:
sql("update `tab%s` set docstatus = %s where name = '%s'" % (dt, (r[1] in ['Submitted', 'Closed'] and 1 or r[1]=='Cancelled' and 2 or 0), r[0]))
dt_list = ['Delivery Note', 'Purchase Receipt']
for dt in dt_list:
sql("update `tab%s` set status = 'Submitted' where docstatus = 1 and modified >='2011-07-06 10:00:00'" % dt)
@ -1254,7 +1254,7 @@ def execute(patch_no):
tbl = sql("select options from `tabDocField` where fieldtype = 'Table' and parent = '%s'" % d)
for t in tbl:
sql("update `tab%s` t1, `tab%s` t2 set t1.docstatus = t2.docstatus where t1.parent = t2.name" % (t[0], d))
elif patch_no == 314:
# delete double feed
sql("delete from tabFeed where subject like 'New %'")
@ -1273,7 +1273,7 @@ def execute(patch_no):
elif patch_no == 316:
pass
elif patch_no == 317:
sql("update `tabPage` set name = 'profile-settings' where page_name = 'Profile Settings'")
sql("update `tabPage` set name = 'profile-settings' where page_name = 'Profile Settings'")
elif patch_no == 318:
reload_doc('utilities', 'doctype', 'bulk_rename_tool')
elif patch_no == 319:
@ -1300,7 +1300,7 @@ def execute(patch_no):
elif patch_no == 327:
# patch for support email settings now moved to email settings
reload_doc('setup','doctype','email_settings')
# map fields from support to email settings
field_map = {
'support_email': 'email',
@ -1311,14 +1311,40 @@ def execute(patch_no):
'sync_support_mails': 'integrate_incoming',
'signature': 'support_signature'
}
for key in field_map:
webnotes.conn.set_value('Email Settings',None,key, \
webnotes.conn.get_value('Support Email Settings',None,field_map[key]))
# delete support email settings
from webnotes.model import delete_doc
delete_doc('DocType', 'Support Email Settings')
reload_doc('support','doctype','support_ticket')
sql("delete from tabDocField where fieldname='problem_description' and parent='Support Ticket'")
sql("delete from tabDocField where fieldname='problem_description' and parent='Support Ticket'")
elif patch_no == 328:
if webnotes.conn.get_value('Control Panel', None, 'account_id') != 'axjanak2011':
sql("delete from `tabDocField` where fieldname = 'supplier_status' and parent = 'Supplier'")
elif patch_no == 329:
reload_doc('utilities', 'doctype', 'rename_tool')
reload_doc('utilities', 'doctype', 'bulk_rename_tool')
elif patch_no == 330:
reload_doc('accounts', 'doctype', 'lease_agreement')
reload_doc('accounts', 'doctype', 'lease_installment')
reload_doc('accounts', 'search_criteria', 'lease_agreement_list')
reload_doc('accounts', 'search_criteria', 'lease_monthly_future_installment_inflows')
reload_doc('accounts', 'search_criteria', 'lease_overdue_age_wise')
reload_doc('accounts', 'search_criteria', 'lease_overdue_list')
reload_doc('accounts', 'search_criteria', 'lease_receipts_client_wise')
reload_doc('accounts', 'search_criteria', 'lease_receipt_summary_year_to_date')
reload_doc('accounts', 'search_criteria', 'lease_yearly_future_installment_inflows')
reload_doc('accounts', 'Module Def', 'Accounts')
elif patch_no == 331:
p = get_obj('Patch Util')
# permission
p.add_permission('Lease Agreement', 'Accounts Manager', 0, read = 1, write=1,submit=1, cancel=1,amend=1)
p.add_permission('Lease Agreement', 'Accounts Manager', 1, read = 1)
elif patch_no == 332:
sql("update `tabDocField` set permlevel=1, hidden = 1 where parent = 'Bulk Rename Tool' and fieldname = 'file_list'")

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@ -90,7 +90,8 @@
'oldfieldname': 'item_group',
'oldfieldtype': 'Link',
'options': 'Item Group',
'print_hide': 1
'print_hide': 1,
'search_index': 0
},
# DocField
@ -104,7 +105,8 @@
'oldfieldname': 'brand',
'oldfieldtype': 'Link',
'options': 'Brand',
'print_hide': 1
'print_hide': 1,
'search_index': 0
},
# DocField
@ -140,6 +142,7 @@
'label': 'UOM',
'oldfieldname': 'uom',
'oldfieldtype': 'Link',
'options': 'UOM'
'options': 'UOM',
'search_index': 0
}
]

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

@ -201,7 +201,7 @@
'oldfieldtype': 'Data',
'permlevel': 1,
'reqd': 0,
'search_index': 1
'search_index': 0
},
# DocField
@ -257,7 +257,7 @@
'permlevel': 0,
'print_hide': 1,
'reqd': 1,
'search_index': 1
'search_index': 0
},
# DocField
@ -292,7 +292,8 @@
'oldfieldname': 'inst_date',
'oldfieldtype': 'Date',
'permlevel': 0,
'reqd': 1
'reqd': 1,
'search_index': 1
},
# DocField
@ -340,7 +341,7 @@
'permlevel': 0,
'print_hide': 1,
'reqd': 1,
'search_index': 1,
'search_index': 0,
'trigger': 'Client'
},

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

0
setup/doctype/upload_accounts_transactions/__init__.py Normal file
View File

18
setup/doctype/upload_accounts_transactions/upload_accounts_transactions.js Normal file
View File

@ -0,0 +1,18 @@
//--------- ONLOAD -------------
cur_frm.cscript.onload = function(doc, cdt, cdn) {
}
cur_frm.cscript.refresh = function(doc, cdt, cdn) {
if(!doc.file_list) {
set_field_options('Upload Accounts Transactions Help', '<div class="help_box">To upload transactions, please attach a (.csv) file with 5 columns - <b>Date, Transaction Number, Account, Debit Amount, Credit Amount</b> (no headings necessary). See attachments box in the right column</div>')
} else {
set_field_options('Upload Accounts Transactions Help', '<div class="help_box">To update transactions from the attachment, please click on "Upload Accounts Transactions"</div>')
}
}
cur_frm.cscript['Upload Accounts Transactions'] = function(doc, cdt, cdn) {
if(confirm("This action will append all transactions and cannot be un-done. Are you sure you want to continue?")) {
$c_obj([doc], 'upload_accounts_transactions', '', function(r, rt) { });
}
}

103
setup/doctype/upload_accounts_transactions/upload_accounts_transactions.py Normal file
View File

@ -0,0 +1,103 @@
# Please edit this list and import only required elements
import webnotes
from webnotes.utils import add_days, add_months, add_years, cint, cstr, date_diff, default_fields, flt, fmt_money, formatdate, generate_hash, getTraceback, get_defaults, get_first_day, get_last_day, getdate, has_common, month_name, now, nowdate, replace_newlines, sendmail, set_default, str_esc_quote, user_format, validate_email_add
from webnotes.model import db_exists
from webnotes.model.doc import Document, addchild, removechild, getchildren, make_autoname, SuperDocType
from webnotes.model.doclist import getlist, copy_doclist
from webnotes.model.code import get_obj, get_server_obj, run_server_obj, updatedb, check_syntax
from webnotes import session, form, is_testing, msgprint, errprint
set = webnotes.conn.set
sql = webnotes.conn.sql
get_value = webnotes.conn.get_value
in_transaction = webnotes.conn.in_transaction
convert_to_lists = webnotes.conn.convert_to_lists
# -----------------------------------------------------------------------------------------
class DocType:
def __init__(self, d, dl):
self.doc, self.doclist = d, dl
self.cl = []
# upload transactions
def upload_accounts_transactions(self):
import csv
data = csv.reader(self.get_csv_data().splitlines())
abbr = sql("select concat(' - ',abbr) as abbr from tabCompany where name=%s",self.doc.company)
updated = 0
jv_name=''
# jv = Document('Journal Voucher')
global line,jv,name,jv_go
for line in data:
if len(line)>=7: #Minimum no of fields
if line[3]!=jv_name: #Create JV
if jv_name!='':
jv_go = get_obj('Journal Voucher',name, with_children=1)
jv_go.validate()
jv_go.on_submit()
jv_name=line[3]
jv = Document('Journal Voucher')
jv.voucher_type = line[0]
jv.naming_series = line[1]
jv.voucher_date = formatdate(line[2])
jv.posting_date = formatdate(line[2])
# jv.name = line[3]
jv.fiscal_year = self.doc.fiscal_year
jv.company = self.doc.company
jv.remark = len(line)==8 and line[3]+' '+line[7] or line[3]+' Uploaded Record'
jv.docstatus=1
jv.save(1)
name=jv.name
jc = addchild(jv,'entries','Journal Voucher Detail',0)
jc.account = line[4]+abbr[0][0]
jc.cost_center=len(line)==9 and line[8] or self.doc.default_cost_center
if line[5]!='':
jc.debit = line[5]
else:
jc.credit = line[6]
jc.save()
else: #Create JV Child
jc = addchild(jv,'entries','Journal Voucher Detail',0)
jc.account = line[4]+abbr[0][0]
jc.cost_center=len(line)==9 and line[8] or self.doc.default_cost_center
if line[5]!='':
jc.debit = line[5]
else:
jc.credit = line[6]
jc.save()
else:
msgprint("[Ignored] Incorrect format: %s" % str(line))
if jv_name!='':
jv_go = get_obj('Journal Voucher',name, with_children=1)
jv_go.validate()
jv_go.on_submit()
msgprint("<b>%s</b> items updated" % updated)
# clear prices
def clear_prices(self):
cnt = sql("select count(*) from `tabRef Rate Detail` where price_list_name = %s", self.doc.name)
sql("delete from `tabRef Rate Detail` where price_list_name = %s", self.doc.name)
msgprint("%s prices cleared" % cnt[0][0])
# Update CSV data
def get_csv_data(self):
if not self.doc.file_list:
msgprint("File not attached!")
raise Exception
fid = self.doc.file_list.split(',')[1]
from webnotes.utils import file_manager
fn, content = file_manager.get_file(fid)
if not type(content) == str:
content = content.tostring()
return content

126
setup/doctype/upload_accounts_transactions/upload_accounts_transactions.txt Normal file
View File

@ -0,0 +1,126 @@
# DocType, Upload Accounts Transactions
[
# These values are common in all dictionaries
{
'creation': '2011-07-18 14:56:48',
'docstatus': 0,
'modified': '2011-07-19 12:19:13',
'modified_by': 'Administrator',
'owner': 'Administrator'
},
# These values are common for all DocType
{
'_last_update': '1310985428',
'allow_attach': 1,
'colour': 'White:FFF',
'doctype': 'DocType',
'issingle': 1,
'max_attachments': 1,
'module': 'Setup',
'name': '__common__',
'section_style': 'Simple',
'show_in_menu': 1,
'version': 5
},
# These values are common for all DocField
{
'doctype': 'DocField',
'name': '__common__',
'parent': 'Upload Accounts Transactions',
'parentfield': 'fields',
'parenttype': 'DocType',
'permlevel': 0
},
# These values are common for all DocPerm
{
'cancel': 1,
'create': 1,
'doctype': 'DocPerm',
'execute': 1,
'idx': 1,
'name': '__common__',
'parent': 'Upload Accounts Transactions',
'parentfield': 'permissions',
'parenttype': 'DocType',
'permlevel': 0,
'read': 1,
'role': 'Accounts Manager',
'submit': 1,
'write': 1
},
# DocType, Upload Accounts Transactions
{
'doctype': 'DocType',
'name': 'Upload Accounts Transactions'
},
# DocPerm
{
'doctype': 'DocPerm'
},
# DocField
{
'doctype': 'DocField',
'fieldtype': 'HTML',
'idx': 1,
'label': 'Usage',
'options': '<div class="help_box">\n<b>Upload Account Transactions Help</b>\n<p>To update the account transactions, upload a CSV file with five columns Date, Transaction Number, Account Name, Credit and Debit amount and click on the "Upload Account Transactions" button. The system will add the transactions.\n</div>'
},
# DocField
{
'doctype': 'DocField',
'fieldname': 'fiscal_year',
'fieldtype': 'Link',
'idx': 2,
'label': 'Fiscal Year',
'options': 'Fiscal Year',
'reqd': 1
},
# DocField
{
'doctype': 'DocField',
'fieldname': 'company',
'fieldtype': 'Link',
'idx': 3,
'label': 'Company',
'options': 'Company',
'reqd': 1
},
# DocField
{
'doctype': 'DocField',
'fieldname': 'default_cost_center',
'fieldtype': 'Link',
'idx': 4,
'label': 'Default Cost Center',
'options': 'Cost Center',
'reqd': 1
},
# DocField
{
'doctype': 'DocField',
'fieldname': 'file_list',
'fieldtype': 'Small Text',
'hidden': 1,
'idx': 5,
'label': 'File List'
},
# DocField
{
'doctype': 'DocField',
'fieldtype': 'Button',
'idx': 6,
'label': 'Upload Accounts Transactions'
}
]

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

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

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

@ -183,6 +183,7 @@ SetupData = function(cnty){
['Country',1,'Country','','Country master'],
['State',1,'State','','State master'],
['Rename Tool',3,'Rename Tool','','Rename a record'],
['Bulk Rename Tool',3,'Bulk Rename Tool','','Rename multiple records at a time'],
['Activty Type',1,'Activity Type','','Types of activities that you can select in your Timesheet'],
['City',1,'City','','City master']]};

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

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

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

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

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

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

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

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

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

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

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

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

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