Merge branch 'master' of github.com:webnotes/erpnext
This commit is contained in:
Nabin Hait
commit
a8be65aedf
@ -3,46 +3,69 @@
|
||||
|
||||
# These values are common in all dictionaries
|
||||
{
|
||||
'creation': '2010-08-08 17:09:03',
|
||||
'creation': '2009-05-12 16:45:56',
|
||||
'docstatus': 0,
|
||||
'modified': '2010-12-29 12:59:45',
|
||||
'modified_by': 'umair@iwebnotes.com',
|
||||
'modified': '2011-11-24 13:02:13',
|
||||
'modified_by': 'Administrator',
|
||||
'owner': 'Administrator'
|
||||
},
|
||||
|
||||
# These values are common for all DocType
|
||||
{
|
||||
'_last_update': '1309508838',
|
||||
'_last_update': '1316078407',
|
||||
'allow_attach': 0,
|
||||
'allow_copy': 0,
|
||||
'allow_email': 0,
|
||||
'allow_print': 0,
|
||||
'allow_rename': 0,
|
||||
'allow_trash': 0,
|
||||
'autoname': 'GL.#######',
|
||||
'colour': 'White:FFF',
|
||||
'doctype': 'DocType',
|
||||
'hide_heading': 0,
|
||||
'hide_toolbar': 0,
|
||||
'in_create': 1,
|
||||
'in_dialog': 0,
|
||||
'is_transaction_doc': 0,
|
||||
'issingle': 0,
|
||||
'max_attachments': 0,
|
||||
'module': 'Accounts',
|
||||
'name': '__common__',
|
||||
'read_only': 0,
|
||||
'read_only_onload': 0,
|
||||
'search_fields': 'voucher_no,account,posting_date,against_voucher',
|
||||
'section_style': 'Simple',
|
||||
'server_code_error': ' ',
|
||||
'show_in_menu': 0,
|
||||
'version': 101
|
||||
'use_template': 0,
|
||||
'version': 23
|
||||
},
|
||||
|
||||
# These values are common for all DocField
|
||||
{
|
||||
'allow_on_submit': 0,
|
||||
'doctype': 'DocField',
|
||||
'hidden': 0,
|
||||
'name': '__common__',
|
||||
'parent': 'GL Entry',
|
||||
'parentfield': 'fields',
|
||||
'parenttype': 'DocType',
|
||||
'permlevel': 0
|
||||
'permlevel': 0,
|
||||
'print_hide': 0,
|
||||
'report_hide': 0,
|
||||
'reqd': 0
|
||||
},
|
||||
|
||||
# These values are common for all DocPerm
|
||||
{
|
||||
'create': 0,
|
||||
'doctype': 'DocPerm',
|
||||
'name': '__common__',
|
||||
'parent': 'GL Entry',
|
||||
'parentfield': 'permissions',
|
||||
'parenttype': 'DocType',
|
||||
'read': 1
|
||||
'read': 1,
|
||||
'write': 0
|
||||
},
|
||||
|
||||
# DocType, GL Entry
|
||||
@ -55,30 +78,24 @@
|
||||
{
|
||||
'amend': 0,
|
||||
'cancel': 0,
|
||||
'create': 0,
|
||||
'doctype': 'DocPerm',
|
||||
'role': 'Accounts User',
|
||||
'submit': 0,
|
||||
'write': 0
|
||||
'submit': 0
|
||||
},
|
||||
|
||||
# DocPerm
|
||||
{
|
||||
'amend': 0,
|
||||
'cancel': 0,
|
||||
'create': 0,
|
||||
'doctype': 'DocPerm',
|
||||
'idx': 1,
|
||||
'permlevel': 0,
|
||||
'role': 'Accounts Manager',
|
||||
'submit': 0,
|
||||
'write': 0
|
||||
'submit': 0
|
||||
},
|
||||
|
||||
# DocPerm
|
||||
{
|
||||
'doctype': 'DocPerm',
|
||||
'idx': 2,
|
||||
'permlevel': 0,
|
||||
'role': 'System Manager'
|
||||
},
|
||||
@ -89,9 +106,9 @@
|
||||
'doctype': 'DocField',
|
||||
'fieldname': 'posting_date',
|
||||
'fieldtype': 'Date',
|
||||
'idx': 1,
|
||||
'in_filter': 1,
|
||||
'label': 'Posting Date',
|
||||
'no_copy': 0,
|
||||
'oldfieldname': 'posting_date',
|
||||
'oldfieldtype': 'Date',
|
||||
'search_index': 1
|
||||
@ -103,33 +120,35 @@
|
||||
'doctype': 'DocField',
|
||||
'fieldname': 'transaction_date',
|
||||
'fieldtype': 'Date',
|
||||
'idx': 2,
|
||||
'in_filter': 0,
|
||||
'label': 'Transaction Date',
|
||||
'no_copy': 0,
|
||||
'oldfieldname': 'transaction_date',
|
||||
'oldfieldtype': 'Date'
|
||||
},
|
||||
|
||||
# DocField
|
||||
{
|
||||
'doctype': 'DocField',
|
||||
'fieldname': 'aging_date',
|
||||
'fieldtype': 'Date',
|
||||
'idx': 3,
|
||||
'in_filter': 1,
|
||||
'label': 'Aging Date',
|
||||
'oldfieldname': 'aging_date',
|
||||
'oldfieldtype': 'Date',
|
||||
'search_index': 0
|
||||
},
|
||||
|
||||
# DocField
|
||||
{
|
||||
'doctype': 'DocField',
|
||||
'fieldname': 'aging_date',
|
||||
'fieldtype': 'Date',
|
||||
'in_filter': 1,
|
||||
'label': 'Aging Date',
|
||||
'no_copy': 0,
|
||||
'oldfieldname': 'aging_date',
|
||||
'oldfieldtype': 'Date',
|
||||
'search_index': 1
|
||||
},
|
||||
|
||||
# DocField
|
||||
{
|
||||
'doctype': 'DocField',
|
||||
'fieldname': 'account',
|
||||
'fieldtype': 'Link',
|
||||
'idx': 4,
|
||||
'in_filter': 1,
|
||||
'label': 'Account',
|
||||
'no_copy': 0,
|
||||
'oldfieldname': 'account',
|
||||
'oldfieldtype': 'Link',
|
||||
'options': 'Account',
|
||||
@ -141,9 +160,9 @@
|
||||
'doctype': 'DocField',
|
||||
'fieldname': 'cost_center',
|
||||
'fieldtype': 'Link',
|
||||
'idx': 5,
|
||||
'in_filter': 1,
|
||||
'label': 'Cost Center',
|
||||
'no_copy': 0,
|
||||
'oldfieldname': 'cost_center',
|
||||
'oldfieldtype': 'Link',
|
||||
'options': 'Cost Center',
|
||||
@ -155,10 +174,12 @@
|
||||
'doctype': 'DocField',
|
||||
'fieldname': 'debit',
|
||||
'fieldtype': 'Currency',
|
||||
'idx': 6,
|
||||
'in_filter': 0,
|
||||
'label': 'Debit Amt',
|
||||
'no_copy': 0,
|
||||
'oldfieldname': 'debit',
|
||||
'oldfieldtype': 'Currency'
|
||||
'oldfieldtype': 'Currency',
|
||||
'search_index': 0
|
||||
},
|
||||
|
||||
# DocField
|
||||
@ -166,10 +187,12 @@
|
||||
'doctype': 'DocField',
|
||||
'fieldname': 'credit',
|
||||
'fieldtype': 'Currency',
|
||||
'idx': 7,
|
||||
'in_filter': 0,
|
||||
'label': 'Credit Amt',
|
||||
'no_copy': 0,
|
||||
'oldfieldname': 'credit',
|
||||
'oldfieldtype': 'Currency'
|
||||
'oldfieldtype': 'Currency',
|
||||
'search_index': 0
|
||||
},
|
||||
|
||||
# DocField
|
||||
@ -177,11 +200,12 @@
|
||||
'doctype': 'DocField',
|
||||
'fieldname': 'against',
|
||||
'fieldtype': 'Text',
|
||||
'idx': 8,
|
||||
'in_filter': 1,
|
||||
'label': 'Against',
|
||||
'no_copy': 0,
|
||||
'oldfieldname': 'against',
|
||||
'oldfieldtype': 'Text'
|
||||
'oldfieldtype': 'Text',
|
||||
'search_index': 0
|
||||
},
|
||||
|
||||
# DocField
|
||||
@ -189,9 +213,9 @@
|
||||
'doctype': 'DocField',
|
||||
'fieldname': 'against_voucher',
|
||||
'fieldtype': 'Data',
|
||||
'idx': 9,
|
||||
'in_filter': 1,
|
||||
'label': 'Against Voucher',
|
||||
'no_copy': 0,
|
||||
'oldfieldname': 'against_voucher',
|
||||
'oldfieldtype': 'Data',
|
||||
'search_index': 0
|
||||
@ -202,9 +226,9 @@
|
||||
'doctype': 'DocField',
|
||||
'fieldname': 'against_voucher_type',
|
||||
'fieldtype': 'Data',
|
||||
'idx': 10,
|
||||
'in_filter': 0,
|
||||
'label': 'Against Voucher Type',
|
||||
'no_copy': 0,
|
||||
'oldfieldname': 'against_voucher_type',
|
||||
'oldfieldtype': 'Data',
|
||||
'search_index': 0
|
||||
@ -215,13 +239,13 @@
|
||||
'doctype': 'DocField',
|
||||
'fieldname': 'voucher_type',
|
||||
'fieldtype': 'Select',
|
||||
'idx': 11,
|
||||
'in_filter': 1,
|
||||
'label': 'Voucher Type',
|
||||
'no_copy': 0,
|
||||
'oldfieldname': 'voucher_type',
|
||||
'oldfieldtype': 'Select',
|
||||
'options': 'Journal Voucher\nReceivable Voucher\nPayable Voucher',
|
||||
'search_index': 0
|
||||
'search_index': 1
|
||||
},
|
||||
|
||||
# DocField
|
||||
@ -229,9 +253,9 @@
|
||||
'doctype': 'DocField',
|
||||
'fieldname': 'voucher_no',
|
||||
'fieldtype': 'Data',
|
||||
'idx': 12,
|
||||
'in_filter': 1,
|
||||
'label': 'Voucher No',
|
||||
'no_copy': 0,
|
||||
'oldfieldname': 'voucher_no',
|
||||
'oldfieldtype': 'Data',
|
||||
'search_index': 1
|
||||
@ -242,7 +266,6 @@
|
||||
'doctype': 'DocField',
|
||||
'fieldname': 'remarks',
|
||||
'fieldtype': 'Text',
|
||||
'idx': 13,
|
||||
'in_filter': 1,
|
||||
'label': 'Remarks',
|
||||
'no_copy': 1,
|
||||
@ -256,13 +279,13 @@
|
||||
'doctype': 'DocField',
|
||||
'fieldname': 'is_cancelled',
|
||||
'fieldtype': 'Select',
|
||||
'idx': 14,
|
||||
'in_filter': 1,
|
||||
'label': 'Is Cancelled',
|
||||
'no_copy': 0,
|
||||
'oldfieldname': 'is_cancelled',
|
||||
'oldfieldtype': 'Select',
|
||||
'options': 'No\nYes',
|
||||
'search_index': 0
|
||||
'search_index': 1
|
||||
},
|
||||
|
||||
# DocField
|
||||
@ -270,13 +293,13 @@
|
||||
'doctype': 'DocField',
|
||||
'fieldname': 'is_opening',
|
||||
'fieldtype': 'Select',
|
||||
'idx': 15,
|
||||
'in_filter': 1,
|
||||
'label': 'Is Opening',
|
||||
'no_copy': 0,
|
||||
'oldfieldname': 'is_opening',
|
||||
'oldfieldtype': 'Select',
|
||||
'options': 'No\nYes',
|
||||
'search_index': 0
|
||||
'search_index': 1
|
||||
},
|
||||
|
||||
# DocField
|
||||
@ -284,9 +307,9 @@
|
||||
'doctype': 'DocField',
|
||||
'fieldname': 'is_advance',
|
||||
'fieldtype': 'Select',
|
||||
'idx': 16,
|
||||
'in_filter': 0,
|
||||
'label': 'Is Advance',
|
||||
'no_copy': 0,
|
||||
'oldfieldname': 'is_advance',
|
||||
'oldfieldtype': 'Select',
|
||||
'options': 'No\nYes',
|
||||
@ -298,13 +321,13 @@
|
||||
'doctype': 'DocField',
|
||||
'fieldname': 'fiscal_year',
|
||||
'fieldtype': 'Select',
|
||||
'idx': 17,
|
||||
'in_filter': 1,
|
||||
'label': 'Fiscal Year',
|
||||
'no_copy': 0,
|
||||
'oldfieldname': 'fiscal_year',
|
||||
'oldfieldtype': 'Select',
|
||||
'options': 'link:Fiscal Year',
|
||||
'search_index': 0
|
||||
'search_index': 1
|
||||
},
|
||||
|
||||
# DocField
|
||||
@ -312,12 +335,12 @@
|
||||
'doctype': 'DocField',
|
||||
'fieldname': 'company',
|
||||
'fieldtype': 'Link',
|
||||
'idx': 18,
|
||||
'in_filter': 1,
|
||||
'label': 'Company',
|
||||
'no_copy': 0,
|
||||
'oldfieldname': 'company',
|
||||
'oldfieldtype': 'Link',
|
||||
'options': 'Company',
|
||||
'search_index': 0
|
||||
'search_index': 1
|
||||
}
|
||||
]
|
||||
9
erpnext/patches/reload_doclayer.py
Normal file
9
erpnext/patches/reload_doclayer.py
Normal file
@ -0,0 +1,9 @@
|
||||
"""
|
||||
Reload DocLayer, DocLayerField and Print Format doctypes
|
||||
"""
|
||||
def execute():
|
||||
from webnotes.modules.module_manager import reload_doc
|
||||
reload_doc('core', 'doctype', 'print_format')
|
||||
reload_doc('core', 'doctype', 'doclayer')
|
||||
reload_doc('core', 'doctype', 'doclayerfield')
|
||||
reload_doc('accounts', 'doctype', 'gl_entry')
|
||||
@ -169,7 +169,9 @@ SetupData = function(cnty){
|
||||
['Manage Users',2,'My Company','','Add / remove users and manage their roles'],
|
||||
['Web Forms',2,'Webforms','', 'Code to embed forms in yor website'],
|
||||
['Permissions Manager',2,'Permission Engine','', 'Manage all permissions from one tool (beta)'],
|
||||
['Property Setter',1,'Property Setter','', 'Customize properties of a Form (DocType) or Field'],
|
||||
//['Property Setter',1,'Property Setter','', 'Customize properties of a Form (DocType) or Field'],
|
||||
['Customize Form View',3,'DocLayer','', 'Customize properties of a Form (DocType) or Field'],
|
||||
['Print Formats', 1, 'Print Format', '', 'Manage Print Formats'],
|
||||
['Letter Head',1,'Letter Head','','Manage different letter heads for Prints'],
|
||||
['SMS Settings',3,'SMS Settings','','Integrate your personalized SMS gateway which support http web service'],
|
||||
['SMS Center',3,'SMS Center','','Send mass sms to your leads, contacts and partners'],
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user