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:
Nabin Hait 2011-11-24 14:48:13 +05:30
commit a8be65aedf
3 changed files with 87 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

127
erpnext/accounts/doctype/gl_entry/gl_entry.txt
View File

@ -3,46 +3,69 @@
# These values are common in all dictionaries # These values are common in all dictionaries
{ {
'creation': '2010-08-08 17:09:03', 'creation': '2009-05-12 16:45:56',
'docstatus': 0, 'docstatus': 0,
'modified': '2010-12-29 12:59:45', 'modified': '2011-11-24 13:02:13',
'modified_by': 'umair@iwebnotes.com', 'modified_by': 'Administrator',
'owner': 'Administrator' 'owner': 'Administrator'
}, },
# These values are common for all DocType # 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.#######', 'autoname': 'GL.#######',
'colour': 'White:FFF', 'colour': 'White:FFF',
'doctype': 'DocType', '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', 'module': 'Accounts',
'name': '__common__', 'name': '__common__',
'read_only': 0,
'read_only_onload': 0,
'search_fields': 'voucher_no,account,posting_date,against_voucher', 'search_fields': 'voucher_no,account,posting_date,against_voucher',
'section_style': 'Simple', 'section_style': 'Simple',
'server_code_error': ' ', 'server_code_error': ' ',
'show_in_menu': 0, 'show_in_menu': 0,
'version': 101 'use_template': 0,
'version': 23
}, },
# These values are common for all DocField # These values are common for all DocField
{ {
'allow_on_submit': 0,
'doctype': 'DocField', 'doctype': 'DocField',
'hidden': 0,
'name': '__common__', 'name': '__common__',
'parent': 'GL Entry', 'parent': 'GL Entry',
'parentfield': 'fields', 'parentfield': 'fields',
'parenttype': 'DocType', 'parenttype': 'DocType',
'permlevel': 0 'permlevel': 0,
'print_hide': 0,
'report_hide': 0,
'reqd': 0
}, },
# These values are common for all DocPerm # These values are common for all DocPerm
{ {
'create': 0,
'doctype': 'DocPerm', 'doctype': 'DocPerm',
'name': '__common__', 'name': '__common__',
'parent': 'GL Entry', 'parent': 'GL Entry',
'parentfield': 'permissions', 'parentfield': 'permissions',
'parenttype': 'DocType', 'parenttype': 'DocType',
'read': 1 'read': 1,
'write': 0
}, },
# DocType, GL Entry # DocType, GL Entry
@ -55,30 +78,24 @@
{ {
'amend': 0, 'amend': 0,
'cancel': 0, 'cancel': 0,
'create': 0,
'doctype': 'DocPerm', 'doctype': 'DocPerm',
'role': 'Accounts User', 'role': 'Accounts User',
'submit': 0, 'submit': 0
'write': 0
}, },
# DocPerm # DocPerm
{ {
'amend': 0, 'amend': 0,
'cancel': 0, 'cancel': 0,
'create': 0,
'doctype': 'DocPerm', 'doctype': 'DocPerm',
'idx': 1,
'permlevel': 0, 'permlevel': 0,
'role': 'Accounts Manager', 'role': 'Accounts Manager',
'submit': 0, 'submit': 0
'write': 0
}, },
# DocPerm # DocPerm
{ {
'doctype': 'DocPerm', 'doctype': 'DocPerm',
'idx': 2,
'permlevel': 0, 'permlevel': 0,
'role': 'System Manager' 'role': 'System Manager'
}, },
@ -89,9 +106,9 @@
'doctype': 'DocField', 'doctype': 'DocField',
'fieldname': 'posting_date', 'fieldname': 'posting_date',
'fieldtype': 'Date', 'fieldtype': 'Date',
'idx': 1,
'in_filter': 1, 'in_filter': 1,
'label': 'Posting Date', 'label': 'Posting Date',
'no_copy': 0,
'oldfieldname': 'posting_date', 'oldfieldname': 'posting_date',
'oldfieldtype': 'Date', 'oldfieldtype': 'Date',
'search_index': 1 'search_index': 1
@ -103,33 +120,35 @@
'doctype': 'DocField', 'doctype': 'DocField',
'fieldname': 'transaction_date', 'fieldname': 'transaction_date',
'fieldtype': 'Date', 'fieldtype': 'Date',
'idx': 2, 'in_filter': 0,
'label': 'Transaction Date', 'label': 'Transaction Date',
'no_copy': 0,
'oldfieldname': 'transaction_date', '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', 'oldfieldtype': 'Date',
'search_index': 0 '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 # DocField
{ {
'doctype': 'DocField', 'doctype': 'DocField',
'fieldname': 'account', 'fieldname': 'account',
'fieldtype': 'Link', 'fieldtype': 'Link',
'idx': 4,
'in_filter': 1, 'in_filter': 1,
'label': 'Account', 'label': 'Account',
'no_copy': 0,
'oldfieldname': 'account', 'oldfieldname': 'account',
'oldfieldtype': 'Link', 'oldfieldtype': 'Link',
'options': 'Account', 'options': 'Account',
@ -141,9 +160,9 @@
'doctype': 'DocField', 'doctype': 'DocField',
'fieldname': 'cost_center', 'fieldname': 'cost_center',
'fieldtype': 'Link', 'fieldtype': 'Link',
'idx': 5,
'in_filter': 1, 'in_filter': 1,
'label': 'Cost Center', 'label': 'Cost Center',
'no_copy': 0,
'oldfieldname': 'cost_center', 'oldfieldname': 'cost_center',
'oldfieldtype': 'Link', 'oldfieldtype': 'Link',
'options': 'Cost Center', 'options': 'Cost Center',
@ -155,10 +174,12 @@
'doctype': 'DocField', 'doctype': 'DocField',
'fieldname': 'debit', 'fieldname': 'debit',
'fieldtype': 'Currency', 'fieldtype': 'Currency',
'idx': 6, 'in_filter': 0,
'label': 'Debit Amt', 'label': 'Debit Amt',
'no_copy': 0,
'oldfieldname': 'debit', 'oldfieldname': 'debit',
'oldfieldtype': 'Currency' 'oldfieldtype': 'Currency',
'search_index': 0
}, },
# DocField # DocField
@ -166,10 +187,12 @@
'doctype': 'DocField', 'doctype': 'DocField',
'fieldname': 'credit', 'fieldname': 'credit',
'fieldtype': 'Currency', 'fieldtype': 'Currency',
'idx': 7, 'in_filter': 0,
'label': 'Credit Amt', 'label': 'Credit Amt',
'no_copy': 0,
'oldfieldname': 'credit', 'oldfieldname': 'credit',
'oldfieldtype': 'Currency' 'oldfieldtype': 'Currency',
'search_index': 0
}, },
# DocField # DocField
@ -177,11 +200,12 @@
'doctype': 'DocField', 'doctype': 'DocField',
'fieldname': 'against', 'fieldname': 'against',
'fieldtype': 'Text', 'fieldtype': 'Text',
'idx': 8,
'in_filter': 1, 'in_filter': 1,
'label': 'Against', 'label': 'Against',
'no_copy': 0,
'oldfieldname': 'against', 'oldfieldname': 'against',
'oldfieldtype': 'Text' 'oldfieldtype': 'Text',
'search_index': 0
}, },
# DocField # DocField
@ -189,9 +213,9 @@
'doctype': 'DocField', 'doctype': 'DocField',
'fieldname': 'against_voucher', 'fieldname': 'against_voucher',
'fieldtype': 'Data', 'fieldtype': 'Data',
'idx': 9,
'in_filter': 1, 'in_filter': 1,
'label': 'Against Voucher', 'label': 'Against Voucher',
'no_copy': 0,
'oldfieldname': 'against_voucher', 'oldfieldname': 'against_voucher',
'oldfieldtype': 'Data', 'oldfieldtype': 'Data',
'search_index': 0 'search_index': 0
@ -202,9 +226,9 @@
'doctype': 'DocField', 'doctype': 'DocField',
'fieldname': 'against_voucher_type', 'fieldname': 'against_voucher_type',
'fieldtype': 'Data', 'fieldtype': 'Data',
'idx': 10,
'in_filter': 0, 'in_filter': 0,
'label': 'Against Voucher Type', 'label': 'Against Voucher Type',
'no_copy': 0,
'oldfieldname': 'against_voucher_type', 'oldfieldname': 'against_voucher_type',
'oldfieldtype': 'Data', 'oldfieldtype': 'Data',
'search_index': 0 'search_index': 0
@ -215,13 +239,13 @@
'doctype': 'DocField', 'doctype': 'DocField',
'fieldname': 'voucher_type', 'fieldname': 'voucher_type',
'fieldtype': 'Select', 'fieldtype': 'Select',
'idx': 11,
'in_filter': 1, 'in_filter': 1,
'label': 'Voucher Type', 'label': 'Voucher Type',
'no_copy': 0,
'oldfieldname': 'voucher_type', 'oldfieldname': 'voucher_type',
'oldfieldtype': 'Select', 'oldfieldtype': 'Select',
'options': 'Journal Voucher\nReceivable Voucher\nPayable Voucher', 'options': 'Journal Voucher\nReceivable Voucher\nPayable Voucher',
'search_index': 0 'search_index': 1
}, },
# DocField # DocField
@ -229,9 +253,9 @@
'doctype': 'DocField', 'doctype': 'DocField',
'fieldname': 'voucher_no', 'fieldname': 'voucher_no',
'fieldtype': 'Data', 'fieldtype': 'Data',
'idx': 12,
'in_filter': 1, 'in_filter': 1,
'label': 'Voucher No', 'label': 'Voucher No',
'no_copy': 0,
'oldfieldname': 'voucher_no', 'oldfieldname': 'voucher_no',
'oldfieldtype': 'Data', 'oldfieldtype': 'Data',
'search_index': 1 'search_index': 1
@ -242,7 +266,6 @@
'doctype': 'DocField', 'doctype': 'DocField',
'fieldname': 'remarks', 'fieldname': 'remarks',
'fieldtype': 'Text', 'fieldtype': 'Text',
'idx': 13,
'in_filter': 1, 'in_filter': 1,
'label': 'Remarks', 'label': 'Remarks',
'no_copy': 1, 'no_copy': 1,
@ -256,13 +279,13 @@
'doctype': 'DocField', 'doctype': 'DocField',
'fieldname': 'is_cancelled', 'fieldname': 'is_cancelled',
'fieldtype': 'Select', 'fieldtype': 'Select',
'idx': 14,
'in_filter': 1, 'in_filter': 1,
'label': 'Is Cancelled', 'label': 'Is Cancelled',
'no_copy': 0,
'oldfieldname': 'is_cancelled', 'oldfieldname': 'is_cancelled',
'oldfieldtype': 'Select', 'oldfieldtype': 'Select',
'options': 'No\nYes', 'options': 'No\nYes',
'search_index': 0 'search_index': 1
}, },
# DocField # DocField
@ -270,13 +293,13 @@
'doctype': 'DocField', 'doctype': 'DocField',
'fieldname': 'is_opening', 'fieldname': 'is_opening',
'fieldtype': 'Select', 'fieldtype': 'Select',
'idx': 15,
'in_filter': 1, 'in_filter': 1,
'label': 'Is Opening', 'label': 'Is Opening',
'no_copy': 0,
'oldfieldname': 'is_opening', 'oldfieldname': 'is_opening',
'oldfieldtype': 'Select', 'oldfieldtype': 'Select',
'options': 'No\nYes', 'options': 'No\nYes',
'search_index': 0 'search_index': 1
}, },
# DocField # DocField
@ -284,9 +307,9 @@
'doctype': 'DocField', 'doctype': 'DocField',
'fieldname': 'is_advance', 'fieldname': 'is_advance',
'fieldtype': 'Select', 'fieldtype': 'Select',
'idx': 16,
'in_filter': 0, 'in_filter': 0,
'label': 'Is Advance', 'label': 'Is Advance',
'no_copy': 0,
'oldfieldname': 'is_advance', 'oldfieldname': 'is_advance',
'oldfieldtype': 'Select', 'oldfieldtype': 'Select',
'options': 'No\nYes', 'options': 'No\nYes',
@ -298,13 +321,13 @@
'doctype': 'DocField', 'doctype': 'DocField',
'fieldname': 'fiscal_year', 'fieldname': 'fiscal_year',
'fieldtype': 'Select', 'fieldtype': 'Select',
'idx': 17,
'in_filter': 1, 'in_filter': 1,
'label': 'Fiscal Year', 'label': 'Fiscal Year',
'no_copy': 0,
'oldfieldname': 'fiscal_year', 'oldfieldname': 'fiscal_year',
'oldfieldtype': 'Select', 'oldfieldtype': 'Select',
'options': 'link:Fiscal Year', 'options': 'link:Fiscal Year',
'search_index': 0 'search_index': 1
}, },
# DocField # DocField
@ -312,12 +335,12 @@
'doctype': 'DocField', 'doctype': 'DocField',
'fieldname': 'company', 'fieldname': 'company',
'fieldtype': 'Link', 'fieldtype': 'Link',
'idx': 18,
'in_filter': 1, 'in_filter': 1,
'label': 'Company', 'label': 'Company',
'no_copy': 0,
'oldfieldname': 'company', 'oldfieldname': 'company',
'oldfieldtype': 'Link', 'oldfieldtype': 'Link',
'options': 'Company', 'options': 'Company',
'search_index': 0 'search_index': 1
} }
] ]

9
erpnext/patches/reload_doclayer.py Normal file
View 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')

4
erpnext/setup/page/setup/setup.js
View File

@ -169,7 +169,9 @@ SetupData = function(cnty){
['Manage Users',2,'My Company','','Add / remove users and manage their roles'], ['Manage Users',2,'My Company','','Add / remove users and manage their roles'],
['Web Forms',2,'Webforms','', 'Code to embed forms in yor website'], ['Web Forms',2,'Webforms','', 'Code to embed forms in yor website'],
['Permissions Manager',2,'Permission Engine','', 'Manage all permissions from one tool (beta)'], ['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'], ['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 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'], ['SMS Center',3,'SMS Center','','Send mass sms to your leads, contacts and partners'],