Merge branch 'master' of github.com:webnotes/erpnext
diff --git a/erpnext/accounts/doctype/gl_entry/gl_entry.txt b/erpnext/accounts/doctype/gl_entry/gl_entry.txt
index 941b182..1d84e1d 100644
--- a/erpnext/accounts/doctype/gl_entry/gl_entry.txt
+++ b/erpnext/accounts/doctype/gl_entry/gl_entry.txt
@@ -3,69 +3,48 @@
# These values are common in all dictionaries
{
- 'creation': '2009-05-12 16:45:56',
+ 'creation': '2010-08-08 17:09:03',
'docstatus': 0,
- 'modified': '2011-11-24 13:02:13',
+ 'modified': '2011-11-24 15:03:45',
'modified_by': 'Administrator',
'owner': 'Administrator'
},
# These values are common for all DocType
{
- '_last_update': '1316078407',
- 'allow_attach': 0,
- 'allow_copy': 0,
- 'allow_email': 0,
- 'allow_print': 0,
- 'allow_rename': 0,
- 'allow_trash': 0,
+ '_last_update': '1319016431',
'autoname': 'GL.#######',
'colour': 'White:FFF',
+ 'default_print_format': 'Standard',
'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,
- 'use_template': 0,
- 'version': 23
+ 'version': 103
},
# 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,
- 'print_hide': 0,
- 'report_hide': 0,
- 'reqd': 0
+ 'permlevel': 0
},
# These values are common for all DocPerm
{
- 'create': 0,
'doctype': 'DocPerm',
'name': '__common__',
'parent': 'GL Entry',
'parentfield': 'permissions',
'parenttype': 'DocType',
- 'read': 1,
- 'write': 0
+ 'read': 1
},
# DocType, GL Entry
@@ -78,19 +57,23 @@
{
'amend': 0,
'cancel': 0,
+ 'create': 0,
'doctype': 'DocPerm',
'role': 'Accounts User',
- 'submit': 0
+ 'submit': 0,
+ 'write': 0
},
# DocPerm
{
'amend': 0,
'cancel': 0,
+ 'create': 0,
'doctype': 'DocPerm',
'permlevel': 0,
'role': 'Accounts Manager',
- 'submit': 0
+ 'submit': 0,
+ 'write': 0
},
# DocPerm
@@ -108,7 +91,6 @@
'fieldtype': 'Date',
'in_filter': 1,
'label': 'Posting Date',
- 'no_copy': 0,
'oldfieldname': 'posting_date',
'oldfieldtype': 'Date',
'search_index': 1
@@ -120,12 +102,9 @@
'doctype': 'DocField',
'fieldname': 'transaction_date',
'fieldtype': 'Date',
- 'in_filter': 0,
'label': 'Transaction Date',
- 'no_copy': 0,
'oldfieldname': 'transaction_date',
- 'oldfieldtype': 'Date',
- 'search_index': 0
+ 'oldfieldtype': 'Date'
},
# DocField
@@ -135,10 +114,9 @@
'fieldtype': 'Date',
'in_filter': 1,
'label': 'Aging Date',
- 'no_copy': 0,
'oldfieldname': 'aging_date',
'oldfieldtype': 'Date',
- 'search_index': 1
+ 'search_index': 0
},
# DocField
@@ -148,7 +126,6 @@
'fieldtype': 'Link',
'in_filter': 1,
'label': 'Account',
- 'no_copy': 0,
'oldfieldname': 'account',
'oldfieldtype': 'Link',
'options': 'Account',
@@ -162,7 +139,6 @@
'fieldtype': 'Link',
'in_filter': 1,
'label': 'Cost Center',
- 'no_copy': 0,
'oldfieldname': 'cost_center',
'oldfieldtype': 'Link',
'options': 'Cost Center',
@@ -174,12 +150,9 @@
'doctype': 'DocField',
'fieldname': 'debit',
'fieldtype': 'Currency',
- 'in_filter': 0,
'label': 'Debit Amt',
- 'no_copy': 0,
'oldfieldname': 'debit',
- 'oldfieldtype': 'Currency',
- 'search_index': 0
+ 'oldfieldtype': 'Currency'
},
# DocField
@@ -187,12 +160,9 @@
'doctype': 'DocField',
'fieldname': 'credit',
'fieldtype': 'Currency',
- 'in_filter': 0,
'label': 'Credit Amt',
- 'no_copy': 0,
'oldfieldname': 'credit',
- 'oldfieldtype': 'Currency',
- 'search_index': 0
+ 'oldfieldtype': 'Currency'
},
# DocField
@@ -202,10 +172,8 @@
'fieldtype': 'Text',
'in_filter': 1,
'label': 'Against',
- 'no_copy': 0,
'oldfieldname': 'against',
- 'oldfieldtype': 'Text',
- 'search_index': 0
+ 'oldfieldtype': 'Text'
},
# DocField
@@ -215,7 +183,6 @@
'fieldtype': 'Data',
'in_filter': 1,
'label': 'Against Voucher',
- 'no_copy': 0,
'oldfieldname': 'against_voucher',
'oldfieldtype': 'Data',
'search_index': 0
@@ -228,7 +195,6 @@
'fieldtype': 'Data',
'in_filter': 0,
'label': 'Against Voucher Type',
- 'no_copy': 0,
'oldfieldname': 'against_voucher_type',
'oldfieldtype': 'Data',
'search_index': 0
@@ -241,11 +207,10 @@
'fieldtype': 'Select',
'in_filter': 1,
'label': 'Voucher Type',
- 'no_copy': 0,
'oldfieldname': 'voucher_type',
'oldfieldtype': 'Select',
'options': 'Journal Voucher\nReceivable Voucher\nPayable Voucher',
- 'search_index': 1
+ 'search_index': 0
},
# DocField
@@ -255,7 +220,6 @@
'fieldtype': 'Data',
'in_filter': 1,
'label': 'Voucher No',
- 'no_copy': 0,
'oldfieldname': 'voucher_no',
'oldfieldtype': 'Data',
'search_index': 1
@@ -281,11 +245,10 @@
'fieldtype': 'Select',
'in_filter': 1,
'label': 'Is Cancelled',
- 'no_copy': 0,
'oldfieldname': 'is_cancelled',
'oldfieldtype': 'Select',
'options': 'No\nYes',
- 'search_index': 1
+ 'search_index': 0
},
# DocField
@@ -295,11 +258,10 @@
'fieldtype': 'Select',
'in_filter': 1,
'label': 'Is Opening',
- 'no_copy': 0,
'oldfieldname': 'is_opening',
'oldfieldtype': 'Select',
'options': 'No\nYes',
- 'search_index': 1
+ 'search_index': 0
},
# DocField
@@ -309,7 +271,6 @@
'fieldtype': 'Select',
'in_filter': 0,
'label': 'Is Advance',
- 'no_copy': 0,
'oldfieldname': 'is_advance',
'oldfieldtype': 'Select',
'options': 'No\nYes',
@@ -323,11 +284,10 @@
'fieldtype': 'Select',
'in_filter': 1,
'label': 'Fiscal Year',
- 'no_copy': 0,
'oldfieldname': 'fiscal_year',
'oldfieldtype': 'Select',
'options': 'link:Fiscal Year',
- 'search_index': 1
+ 'search_index': 0
},
# DocField
@@ -337,10 +297,9 @@
'fieldtype': 'Link',
'in_filter': 1,
'label': 'Company',
- 'no_copy': 0,
'oldfieldname': 'company',
'oldfieldtype': 'Link',
'options': 'Company',
- 'search_index': 1
+ 'search_index': 0
}
]
\ No newline at end of file
diff --git a/erpnext/patches/index_patch.py b/erpnext/patches/index_patch.py
index 3ef8ec3..788b68d 100644
--- a/erpnext/patches/index_patch.py
+++ b/erpnext/patches/index_patch.py
@@ -293,3 +293,6 @@
sql("commit")
except:
continue
+
+def execute():
+ create_proper_index()
diff --git a/erpnext/production/doctype/workstation/workstation.txt b/erpnext/production/doctype/workstation/workstation.txt
index bb7cc21..dd0868d 100644
--- a/erpnext/production/doctype/workstation/workstation.txt
+++ b/erpnext/production/doctype/workstation/workstation.txt
@@ -5,16 +5,19 @@
{
'creation': '2010-08-08 17:09:31',
'docstatus': 0,
- 'modified': '2011-01-04 13:40:42',
- 'modified_by': 'rahul@webnotestech.com',
+ 'modified': '2011-11-24 14:34:41',
+ 'modified_by': 'Administrator',
'owner': 'Administrator'
},
# These values are common for all DocType
{
+ '_last_update': '1322125389',
+ 'allow_email': 0,
'allow_trash': 1,
'autoname': 'field:workstation_name',
'colour': 'White:FFF',
+ 'default_print_format': 'Standard',
'doctype': 'DocType',
'document_type': 'Master',
'module': 'Production',
@@ -22,7 +25,7 @@
'section_style': 'Simple',
'server_code_error': ' ',
'show_in_menu': 0,
- 'version': 11
+ 'version': 13
},
# These values are common for all DocField
@@ -55,7 +58,6 @@
'cancel': 1,
'create': 1,
'doctype': 'DocPerm',
- 'idx': 1,
'permlevel': 0,
'role': 'System Manager',
'write': 1
@@ -64,7 +66,6 @@
# DocPerm
{
'doctype': 'DocPerm',
- 'idx': 2,
'permlevel': 1,
'role': 'System Manager'
},
@@ -74,7 +75,6 @@
'cancel': 1,
'create': 1,
'doctype': 'DocPerm',
- 'idx': 3,
'permlevel': 0,
'role': 'Production User',
'write': 1
@@ -85,7 +85,6 @@
'cancel': 1,
'create': 1,
'doctype': 'DocPerm',
- 'idx': 4,
'permlevel': 0,
'role': 'Production User',
'write': 1
@@ -94,7 +93,6 @@
# DocPerm
{
'doctype': 'DocPerm',
- 'idx': 5,
'permlevel': 1,
'role': 'Production Manager'
},
@@ -102,7 +100,6 @@
# DocPerm
{
'doctype': 'DocPerm',
- 'idx': 6,
'permlevel': 1,
'role': 'Production User'
},
@@ -112,7 +109,6 @@
'doctype': 'DocField',
'fieldname': 'trash_reason',
'fieldtype': 'Small Text',
- 'idx': 1,
'label': 'Trash Reason',
'oldfieldname': 'trash_reason',
'oldfieldtype': 'Small Text',
@@ -124,7 +120,6 @@
'doctype': 'DocField',
'fieldname': 'workstation_name',
'fieldtype': 'Data',
- 'idx': 2,
'label': 'Workstation Name',
'oldfieldname': 'workstation_name',
'oldfieldtype': 'Data',
@@ -137,7 +132,6 @@
'doctype': 'DocField',
'fieldname': 'warehouse',
'fieldtype': 'Link',
- 'idx': 3,
'label': 'Warehouse',
'oldfieldname': 'warehouse',
'oldfieldtype': 'Link',
@@ -151,7 +145,6 @@
'doctype': 'DocField',
'fieldname': 'description',
'fieldtype': 'Text',
- 'idx': 4,
'label': 'Description',
'oldfieldname': 'description',
'oldfieldtype': 'Text',
@@ -165,7 +158,6 @@
'fieldname': 'capacity',
'fieldtype': 'Data',
'hidden': 1,
- 'idx': 5,
'label': 'Capacity',
'oldfieldname': 'capacity',
'oldfieldtype': 'Data',
@@ -179,7 +171,6 @@
'fieldname': 'capacity_units',
'fieldtype': 'Select',
'hidden': 1,
- 'idx': 6,
'label': 'Capacity Units',
'oldfieldname': 'capacity_units',
'oldfieldtype': 'Select',
@@ -194,7 +185,6 @@
'doctype': 'DocField',
'fieldname': 'hour_rate_labour',
'fieldtype': 'Currency',
- 'idx': 7,
'label': 'Hour Rate Labour',
'oldfieldname': 'hour_rate_labour',
'oldfieldtype': 'Currency',
@@ -206,7 +196,6 @@
{
'doctype': 'DocField',
'fieldtype': 'Section Break',
- 'idx': 8,
'label': 'Over Heads',
'oldfieldtype': 'Section Break',
'permlevel': 0
@@ -217,7 +206,6 @@
'doctype': 'DocField',
'fieldname': 'hour_rate_electricity',
'fieldtype': 'Currency',
- 'idx': 9,
'label': 'Hour Rate Electricity',
'oldfieldname': 'hour_rate_electricity',
'oldfieldtype': 'Currency',
@@ -229,7 +217,6 @@
'doctype': 'DocField',
'fieldname': 'hour_rate_consumable',
'fieldtype': 'Currency',
- 'idx': 10,
'label': 'Hour Rate Consumable',
'oldfieldname': 'hour_rate_consumable',
'oldfieldtype': 'Currency',
@@ -241,7 +228,6 @@
'doctype': 'DocField',
'fieldname': 'hour_rate_rent',
'fieldtype': 'Currency',
- 'idx': 11,
'label': 'Hour Rate Rent',
'oldfieldname': 'hour_rate_rent',
'oldfieldtype': 'Currency',
@@ -253,7 +239,6 @@
'doctype': 'DocField',
'fieldname': 'overhead',
'fieldtype': 'Currency',
- 'idx': 12,
'label': 'Overhead',
'oldfieldname': 'overhead',
'oldfieldtype': 'Currency',
@@ -264,7 +249,6 @@
{
'doctype': 'DocField',
'fieldtype': 'Section Break',
- 'idx': 13,
'label': 'Hour Rate',
'oldfieldtype': 'Section Break',
'permlevel': 0
@@ -275,7 +259,6 @@
'doctype': 'DocField',
'fieldname': 'hour_rate',
'fieldtype': 'Currency',
- 'idx': 14,
'label': 'Hour Rate',
'oldfieldname': 'hour_rate',
'oldfieldtype': 'Currency',
diff --git a/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.txt b/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.txt
index 27b1749..9a21130 100644
--- a/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.txt
+++ b/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.txt
@@ -5,14 +5,14 @@
{
'creation': '2010-08-08 17:09:26',
'docstatus': 0,
- 'modified': '2011-11-18 17:32:21',
+ 'modified': '2011-11-24 12:04:03',
'modified_by': 'Administrator',
'owner': 'Administrator'
},
# These values are common for all DocType
{
- '_last_update': '1321617633',
+ '_last_update': '1321617741',
'allow_attach': 1,
'autoname': 'SR/.######',
'colour': 'White:FFF',
@@ -26,7 +26,7 @@
'server_code_error': ' ',
'show_in_menu': 0,
'subject': 'Date: %(reconciliation_date)s, Time: %(reconciliation_time)s',
- 'version': 105
+ 'version': 107
},
# These values are common for all DocField
@@ -93,7 +93,7 @@
'doctype': 'DocField',
'fieldtype': 'HTML',
'label': 'Steps',
- 'options': '<div class="field_description"><b>Steps:</b><br>1. Enter Reconciliation Date and Time<br>2. Save the document<br>3. Attach csv file as per template.<br>4. Submit the document</div>',
+ 'options': '<div class="field_description"><b>Steps:</b><br>1. Enter Reconciliation Date and Time<br>2. Save the document<br>3. Attach csv file as per template.<br>4. Submit the document<br>5. Enter tilde (~) sign if no difference in qty or valuation rate</div>',
'permlevel': 0
},