confict fix
diff --git a/erpnext/accounts/doctype/gl_control/gl_control.py b/erpnext/accounts/doctype/gl_control/gl_control.py
index bab8626..5365bbc 100644
--- a/erpnext/accounts/doctype/gl_control/gl_control.py
+++ b/erpnext/accounts/doctype/gl_control/gl_control.py
@@ -506,10 +506,10 @@
Create recurring invoices on specific date by copying the original one
and notify the concerned people
"""
- rv = sql("""select name, recurring_id from `tabReceivable Voucher` where ifnull(convert_into_recurring_invoice, 0) = 1
+ rv = webnotes.conn.sql("""select name, recurring_id from `tabReceivable Voucher` where ifnull(convert_into_recurring_invoice, 0) = 1
and next_date = %s and next_date <= end_date order by next_date desc""", nowdate())
for d in rv:
- if not sql("""select name from `tabReceivable Voucher` where posting_date = %s and recurring_id = %s""", (nowdate(), d[1])):
+ if not webnotes.conn.sql("""select name from `tabReceivable Voucher` where posting_date = %s and recurring_id = %s""", (nowdate(), d[1])):
prev_rv = get_obj('Receivable Voucher', d[0], with_children=1)
new_rv = create_new_invoice(prev_rv)
diff --git a/erpnext/accounts/doctype/journal_voucher/journal_voucher.txt b/erpnext/accounts/doctype/journal_voucher/journal_voucher.txt
index 104d3d1..0d67374 100644
--- a/erpnext/accounts/doctype/journal_voucher/journal_voucher.txt
+++ b/erpnext/accounts/doctype/journal_voucher/journal_voucher.txt
@@ -5,15 +5,25 @@
{
'creation': '2010-08-08 17:09:06',
'docstatus': 0,
- 'modified': '2011-07-28 15:28:12',
+ 'modified': '2012-01-19 14:15:53',
'modified_by': 'Administrator',
'owner': 'Administrator'
},
+ # These values are common for all DocField
+ {
+ 'doctype': 'DocField',
+ 'name': '__common__',
+ 'parent': 'Journal Voucher',
+ 'parentfield': 'fields',
+ 'parenttype': 'DocType'
+ },
+
# These values are common for all DocType
{
'_last_update': '1311251040',
'colour': 'White:FFF',
+ 'default_print_format': 'Standard',
'doctype': 'DocType',
'module': 'Accounts',
'name': '__common__',
@@ -23,15 +33,15 @@
'show_in_menu': 0,
'subject': ' ',
'tag_fields': 'voucher_type',
- 'version': 309
+ 'version': 311
},
- # These values are common for all DocField
+ # These values are common for all DocFormat
{
- 'doctype': 'DocField',
+ 'doctype': 'DocFormat',
'name': '__common__',
'parent': 'Journal Voucher',
- 'parentfield': 'fields',
+ 'parentfield': 'formats',
'parenttype': 'DocType'
},
@@ -57,7 +67,6 @@
'cancel': 0,
'create': 0,
'doctype': 'DocPerm',
- 'idx': 1,
'permlevel': 1,
'role': 'Accounts Manager',
'submit': 0,
@@ -70,7 +79,6 @@
'cancel': 1,
'create': 1,
'doctype': 'DocPerm',
- 'idx': 2,
'permlevel': 0,
'role': 'Accounts Manager',
'submit': 1,
@@ -83,7 +91,6 @@
'cancel': 1,
'create': 1,
'doctype': 'DocPerm',
- 'idx': 3,
'permlevel': 0,
'role': 'Accounts User',
'submit': 1,
@@ -96,18 +103,28 @@
'cancel': 0,
'create': 0,
'doctype': 'DocPerm',
- 'idx': 4,
'permlevel': 1,
'role': 'Accounts User',
'submit': 0,
'write': 0
},
+ # DocFormat
+ {
+ 'doctype': 'DocFormat',
+ 'format': 'Payment Receipt Voucher'
+ },
+
+ # DocFormat
+ {
+ 'doctype': 'DocFormat',
+ 'format': 'Cheque Printing Format'
+ },
+
# DocField
{
'doctype': 'DocField',
'fieldtype': 'Section Break',
- 'idx': 1,
'label': 'Basic Info',
'oldfieldtype': 'Section Break',
'permlevel': 0
@@ -117,7 +134,6 @@
{
'doctype': 'DocField',
'fieldtype': 'Section Break',
- 'idx': 2,
'label': '1. Select Series and Dates',
'oldfieldtype': 'Section Break',
'options': 'Simple',
@@ -128,7 +144,6 @@
{
'doctype': 'DocField',
'fieldtype': 'Column Break',
- 'idx': 3,
'oldfieldtype': 'Column Break',
'permlevel': 0,
'width': '50%'
@@ -139,12 +154,11 @@
'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',
+ 'options': '\nJournal Entry\nBank Voucher\nCash Voucher\nCredit Card Voucher\nDebit Note\nCredit Note\nContra Voucher\nExcise Voucher\nWrite Off Voucher',
'permlevel': 0,
'print_hide': 0,
'search_index': 1
@@ -157,7 +171,6 @@
'doctype': 'DocField',
'fieldname': 'write_off_amount',
'fieldtype': 'Currency',
- 'idx': 5,
'label': 'Write Off Amount <=',
'permlevel': 0,
'print_hide': 1,
@@ -172,7 +185,6 @@
'doctype': 'DocField',
'fieldname': 'write_off_based_on',
'fieldtype': 'Select',
- 'idx': 6,
'label': 'Write Off Based On',
'options': 'Accounts Receivable\nAccounts Payable',
'permlevel': 0,
@@ -187,7 +199,6 @@
'doctype': 'DocField',
'fieldname': 'naming_series',
'fieldtype': 'Select',
- 'idx': 7,
'label': 'Series',
'no_copy': 1,
'oldfieldname': 'naming_series',
@@ -205,7 +216,6 @@
'doctype': 'DocField',
'fieldname': 'voucher_date',
'fieldtype': 'Date',
- 'idx': 8,
'in_filter': 1,
'label': 'Voucher Date',
'no_copy': 1,
@@ -223,7 +233,6 @@
'doctype': 'DocField',
'fieldname': 'posting_date',
'fieldtype': 'Date',
- 'idx': 9,
'in_filter': 1,
'label': 'Posting Date',
'no_copy': 1,
@@ -239,7 +248,6 @@
'doctype': 'DocField',
'fieldname': 'due_date',
'fieldtype': 'Date',
- 'idx': 10,
'label': 'Due Date',
'oldfieldname': 'due_date',
'oldfieldtype': 'Date',
@@ -253,7 +261,6 @@
'doctype': 'DocField',
'fieldname': 'amendment_date',
'fieldtype': 'Date',
- 'idx': 11,
'label': 'Amendment Date',
'no_copy': 1,
'oldfieldname': 'amendment_date',
@@ -267,7 +274,6 @@
'doctype': 'DocField',
'fieldname': 'amended_from',
'fieldtype': 'Link',
- 'idx': 12,
'label': 'Amended From',
'no_copy': 1,
'oldfieldname': 'amended_from',
@@ -283,7 +289,6 @@
'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,
@@ -295,7 +300,6 @@
{
'doctype': 'DocField',
'fieldtype': 'Column Break',
- 'idx': 14,
'oldfieldtype': 'Column Break',
'permlevel': 0,
'width': '50%'
@@ -306,7 +310,6 @@
'doctype': 'DocField',
'fieldname': 'cheque_no',
'fieldtype': 'Data',
- 'idx': 15,
'in_filter': 1,
'label': 'Cheque No',
'no_copy': 1,
@@ -321,7 +324,6 @@
'doctype': 'DocField',
'fieldname': 'cheque_date',
'fieldtype': 'Date',
- 'idx': 16,
'label': 'Cheque Date',
'no_copy': 1,
'oldfieldname': 'cheque_date',
@@ -334,7 +336,6 @@
'doctype': 'DocField',
'fieldname': 'clearance_date',
'fieldtype': 'Date',
- 'idx': 17,
'in_filter': 1,
'label': 'Clearance Date',
'no_copy': 1,
@@ -350,7 +351,6 @@
'doctype': 'DocField',
'fieldname': 'user_remark',
'fieldtype': 'Small Text',
- 'idx': 18,
'in_filter': 1,
'label': 'User Remark',
'no_copy': 1,
@@ -365,7 +365,6 @@
'doctype': 'DocField',
'fieldname': 'remark',
'fieldtype': 'Small Text',
- 'idx': 19,
'label': 'Remark',
'no_copy': 1,
'oldfieldname': 'remark',
@@ -378,7 +377,6 @@
{
'doctype': 'DocField',
'fieldtype': 'Section Break',
- 'idx': 20,
'label': '2. Add / Edit GL Entries',
'oldfieldtype': 'Section Break',
'options': 'Simple',
@@ -387,10 +385,10 @@
# DocField
{
+ 'allow_on_submit': 1,
'doctype': 'DocField',
'fieldname': 'entries',
'fieldtype': 'Table',
- 'idx': 21,
'label': 'Entries',
'oldfieldname': 'entries',
'oldfieldtype': 'Table',
@@ -403,7 +401,6 @@
{
'doctype': 'DocField',
'fieldtype': 'Button',
- 'idx': 22,
'label': 'Get Balance',
'oldfieldtype': 'Button',
'permlevel': 0,
@@ -415,7 +412,6 @@
'doctype': 'DocField',
'fieldname': 'total_debit',
'fieldtype': 'Currency',
- 'idx': 23,
'in_filter': 1,
'label': 'Total Debit',
'no_copy': 1,
@@ -429,7 +425,6 @@
'doctype': 'DocField',
'fieldname': 'total_credit',
'fieldtype': 'Currency',
- 'idx': 24,
'in_filter': 1,
'label': 'Total Credit',
'no_copy': 1,
@@ -443,7 +438,6 @@
'doctype': 'DocField',
'fieldname': 'difference',
'fieldtype': 'Currency',
- 'idx': 25,
'label': 'Difference',
'no_copy': 1,
'oldfieldname': 'difference',
@@ -456,7 +450,6 @@
{
'doctype': 'DocField',
'fieldtype': 'Section Break',
- 'idx': 26,
'label': 'Addtional Info',
'oldfieldtype': 'Section Break',
'permlevel': 0
@@ -466,7 +459,6 @@
{
'doctype': 'DocField',
'fieldtype': 'Column Break',
- 'idx': 27,
'oldfieldtype': 'Column Break',
'permlevel': 0,
'width': '50%'
@@ -477,7 +469,6 @@
'doctype': 'DocField',
'fieldname': 'bill_no',
'fieldtype': 'Data',
- 'idx': 28,
'label': 'Bill No',
'oldfieldname': 'bill_no',
'oldfieldtype': 'Data',
@@ -490,7 +481,6 @@
'doctype': 'DocField',
'fieldname': 'bill_date',
'fieldtype': 'Date',
- 'idx': 29,
'label': 'Bill Date',
'oldfieldname': 'bill_date',
'oldfieldtype': 'Date',
@@ -505,7 +495,6 @@
'doctype': 'DocField',
'fieldname': 'is_opening',
'fieldtype': 'Select',
- 'idx': 30,
'in_filter': 1,
'label': 'Is Opening',
'oldfieldname': 'is_opening',
@@ -522,7 +511,6 @@
'doctype': 'DocField',
'fieldname': 'aging_date',
'fieldtype': 'Date',
- 'idx': 31,
'label': 'Aging Date',
'no_copy': 0,
'oldfieldname': 'aging_date',
@@ -536,7 +524,6 @@
'doctype': 'DocField',
'fieldname': 'cancel_reason',
'fieldtype': 'Data',
- 'idx': 32,
'label': 'Cancel Reason',
'no_copy': 1,
'oldfieldname': 'cancel_reason',
@@ -551,7 +538,6 @@
'fieldname': 'pay_to_recd_from',
'fieldtype': 'Data',
'hidden': 0,
- 'idx': 33,
'label': 'Pay To / Recd From',
'no_copy': 1,
'permlevel': 0,
@@ -565,7 +551,6 @@
'fieldname': 'total_amount',
'fieldtype': 'Data',
'hidden': 0,
- 'idx': 34,
'label': 'Total Amount',
'no_copy': 1,
'permlevel': 1,
@@ -579,7 +564,6 @@
'fieldname': 'total_amount_in_words',
'fieldtype': 'Data',
'hidden': 0,
- 'idx': 35,
'label': 'Total Amount in Words',
'no_copy': 1,
'permlevel': 1,
@@ -591,7 +575,6 @@
{
'doctype': 'DocField',
'fieldtype': 'Column Break',
- 'idx': 36,
'oldfieldtype': 'Column Break',
'permlevel': 0,
'width': '50%'
@@ -602,7 +585,6 @@
'doctype': 'DocField',
'fieldname': 'fiscal_year',
'fieldtype': 'Select',
- 'idx': 37,
'in_filter': 1,
'label': 'Fiscal Year',
'oldfieldname': 'fiscal_year',
@@ -619,7 +601,6 @@
'doctype': 'DocField',
'fieldname': 'company',
'fieldtype': 'Link',
- 'idx': 38,
'in_filter': 1,
'label': 'Company',
'oldfieldname': 'company',
@@ -638,7 +619,6 @@
'doctype': 'DocField',
'fieldname': 'select_print_heading',
'fieldtype': 'Link',
- 'idx': 39,
'label': 'Select Print Heading',
'no_copy': 1,
'oldfieldname': 'select_print_heading',
@@ -654,7 +634,6 @@
{
'doctype': 'DocField',
'fieldtype': 'Section Break',
- 'idx': 40,
'oldfieldtype': 'Section Break',
'options': 'Simple',
'permlevel': 0
@@ -665,7 +644,6 @@
'allow_on_submit': 1,
'doctype': 'DocField',
'fieldtype': 'Button',
- 'idx': 41,
'label': 'View Ledger Entry',
'oldfieldtype': 'Button',
'permlevel': 0,
@@ -677,7 +655,6 @@
{
'doctype': 'DocField',
'fieldtype': 'Section Break',
- 'idx': 42,
'label': 'TDS',
'oldfieldtype': 'Section Break',
'permlevel': 0,
@@ -690,7 +667,6 @@
'doctype': 'DocField',
'fieldname': 'tds_applicable',
'fieldtype': 'Select',
- 'idx': 43,
'in_filter': 1,
'label': 'TDS Applicable',
'no_copy': 1,
@@ -709,7 +685,6 @@
'fieldname': 'tds_category',
'fieldtype': 'Select',
'hidden': 0,
- 'idx': 44,
'in_filter': 1,
'label': 'TDS Category',
'no_copy': 1,
@@ -729,7 +704,6 @@
'fieldname': 'supplier_account',
'fieldtype': 'Link',
'hidden': 0,
- 'idx': 45,
'label': 'Supplier Account',
'no_copy': 1,
'oldfieldname': 'supplier_account',
@@ -745,7 +719,6 @@
'colour': 'White:FFF',
'doctype': 'DocField',
'fieldtype': 'Button',
- 'idx': 46,
'label': 'Get TDS',
'no_copy': 0,
'oldfieldtype': 'Button',
@@ -760,7 +733,6 @@
'doctype': 'DocField',
'fieldname': 'tax_code',
'fieldtype': 'Link',
- 'idx': 47,
'label': 'TDS Account Head',
'no_copy': 1,
'oldfieldname': 'tax_code',
@@ -775,7 +747,6 @@
'doctype': 'DocField',
'fieldname': 'rate',
'fieldtype': 'Currency',
- 'idx': 48,
'label': 'Rate',
'no_copy': 1,
'oldfieldname': 'rate',
@@ -790,7 +761,6 @@
'doctype': 'DocField',
'fieldname': 'ded_amount',
'fieldtype': 'Currency',
- 'idx': 49,
'label': 'Amount',
'no_copy': 1,
'oldfieldname': 'ded_amount',
diff --git a/erpnext/patches/jan_mar_2012/allocated_to_profile.py b/erpnext/patches/jan_mar_2012/allocated_to_profile.py
new file mode 100644
index 0000000..ac95c2b
--- /dev/null
+++ b/erpnext/patches/jan_mar_2012/allocated_to_profile.py
@@ -0,0 +1,20 @@
+def execute():
+ """
+ Changes allocated_to option to Profile in
+ DocType Customer Issue
+ """
+ import webnotes
+ webnotes.conn.sql("""
+ UPDATE `tabDocField`
+ SET options='Profile'
+ WHERE fieldname='allocated_to'
+ """)
+
+ webnotes.conn.sql("""
+ DELETE from `tabDocField`
+ WHERE parent='Customer Issue'
+ AND label='Make Maintenance Visit'
+ """)
+
+ from webnotes.modules.module_manager import reload_doc
+ reload_doc('support', 'doctype', 'customer_issue')
diff --git a/erpnext/patches/jan_mar_2012/jan_production_patches.py b/erpnext/patches/jan_mar_2012/jan_production_patches.py
index f868cea..9f730c9 100644
--- a/erpnext/patches/jan_mar_2012/jan_production_patches.py
+++ b/erpnext/patches/jan_mar_2012/jan_production_patches.py
@@ -6,4 +6,6 @@
"""
from webnotes.modules.module_manager import reload_doc
- reload_doc('stock', 'doctype', 'stock_entry_detail')
+ reload_doc('stock', 'doctype', 'stock_entry_detail')
+ reload_doc('stock', 'doctype', 'item_supplier')
+ reload_doc('stock', 'doctype', 'item')
diff --git a/erpnext/patches/jan_mar_2012/remove_get_tds_button.py b/erpnext/patches/jan_mar_2012/remove_get_tds_button.py
new file mode 100644
index 0000000..268c9ef
--- /dev/null
+++ b/erpnext/patches/jan_mar_2012/remove_get_tds_button.py
@@ -0,0 +1,14 @@
+def execute():
+ """
+ Remove One Get TDS button, which is appearing twice in JV
+ """
+ import webnotes
+ webnotes.conn.sql("""
+ DELETE from `tabDocField`
+ WHERE parent='Journal Voucher'
+ AND label='Get TDS'
+ AND fieldtype='Button'
+ """)
+
+ from webnotes.modules.module_manager import reload_doc
+ reload_doc('accounts', 'doctype', 'journal_voucher')
diff --git a/erpnext/patches/patch_list.py b/erpnext/patches/patch_list.py
index d9a8219..fe4f09c 100644
--- a/erpnext/patches/patch_list.py
+++ b/erpnext/patches/patch_list.py
@@ -23,5 +23,16 @@
'patch_module': 'patches.jan_mar_2012',
'patch_file': 'jan_production_patches',
'description': 'Fixes after Major changes in production module'
- }
+ },
+ {
+ 'patch_module': 'patches.jan_mar_2012',
+ 'patch_file': 'allocated_to_profile',
+ 'description': """Change Options to "Profile" for fieldname "allocated_to"
+ as this is giving improper values in Permission Engine"""
+ },
+ {
+ 'patch_module': 'patches.jan_mar_2012',
+ 'patch_file': 'remove_get_tds_button',
+ 'description': "Remove One Get TDS button, which is appearing twice in JV"
+ },
]
diff --git a/erpnext/stock/doctype/item/item.txt b/erpnext/stock/doctype/item/item.txt
index c670700..d6ac71b 100644
--- a/erpnext/stock/doctype/item/item.txt
+++ b/erpnext/stock/doctype/item/item.txt
@@ -5,14 +5,14 @@
{
'creation': '2010-08-08 17:09:05',
'docstatus': 0,
- 'modified': '2011-12-20 11:15:42',
+ 'modified': '2012-01-17 18:39:39',
'modified_by': 'Administrator',
'owner': 'Administrator'
},
# These values are common for all DocType
{
- '_last_update': '1323333040',
+ '_last_update': '1325570647',
'allow_attach': 1,
'allow_trash': 1,
'autoname': 'field:item_code',
@@ -29,7 +29,7 @@
'show_in_menu': 0,
'subject': '%(item_name)s',
'tag_fields': 'item_group',
- 'version': 162
+ 'version': 164
},
# These values are common for all DocField
@@ -624,6 +624,34 @@
# DocField
{
'doctype': 'DocField',
+ 'fieldname': 'manufacturer',
+ 'fieldtype': 'Data',
+ 'label': 'Manufacturer',
+ 'permlevel': 0
+ },
+
+ # DocField
+ {
+ 'doctype': 'DocField',
+ 'fieldname': 'manufacturer_part_no',
+ 'fieldtype': 'Data',
+ 'label': 'Manufacturer Part Number',
+ 'permlevel': 0
+ },
+
+ # DocField
+ {
+ 'doctype': 'DocField',
+ 'fieldname': 'item_supplier_details',
+ 'fieldtype': 'Table',
+ 'label': 'Item Supplier Details',
+ 'options': 'Item Supplier',
+ 'permlevel': 0
+ },
+
+ # DocField
+ {
+ 'doctype': 'DocField',
'fieldtype': 'Section Break',
'label': 'Sales Details',
'oldfieldtype': 'Section Break',
diff --git a/erpnext/stock/doctype/item_supplier/__init__.py b/erpnext/stock/doctype/item_supplier/__init__.py
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/erpnext/stock/doctype/item_supplier/__init__.py
diff --git a/erpnext/stock/doctype/item_supplier/item_supplier.txt b/erpnext/stock/doctype/item_supplier/item_supplier.txt
new file mode 100644
index 0000000..609c1e9
--- /dev/null
+++ b/erpnext/stock/doctype/item_supplier/item_supplier.txt
@@ -0,0 +1,58 @@
+# DocType, Item Supplier
+[
+
+ # These values are common in all dictionaries
+ {
+ 'creation': '2012-01-17 18:36:35',
+ 'docstatus': 0,
+ 'modified': '2012-01-17 18:40:37',
+ 'modified_by': 'Administrator',
+ 'owner': 'Administrator'
+ },
+
+ # These values are common for all DocType
+ {
+ 'colour': 'White:FFF',
+ 'doctype': 'DocType',
+ 'istable': 1,
+ 'module': 'Stock',
+ 'name': '__common__',
+ 'section_style': 'Simple',
+ 'show_in_menu': 0,
+ 'version': 3
+ },
+
+ # These values are common for all DocField
+ {
+ 'doctype': 'DocField',
+ 'name': '__common__',
+ 'parent': 'Item Supplier',
+ 'parentfield': 'fields',
+ 'parenttype': 'DocType',
+ 'permlevel': 0
+ },
+
+ # DocType, Item Supplier
+ {
+ 'doctype': 'DocType',
+ 'name': 'Item Supplier'
+ },
+
+ # DocField
+ {
+ 'doctype': 'DocField',
+ 'fieldname': 'supplier',
+ 'fieldtype': 'Link',
+ 'label': 'Supplier',
+ 'options': 'Supplier'
+ },
+
+ # DocField
+ {
+ 'doctype': 'DocField',
+ 'fieldname': 'supplier_part_no',
+ 'fieldtype': 'Data',
+ 'label': 'Supplier Part Number',
+ 'width': '200px'
+ }
+]
\ No newline at end of file
diff --git a/erpnext/support/doctype/customer_issue/customer_issue.txt b/erpnext/support/doctype/customer_issue/customer_issue.txt
index 122f92d..b19a1a8 100644
--- a/erpnext/support/doctype/customer_issue/customer_issue.txt
+++ b/erpnext/support/doctype/customer_issue/customer_issue.txt
@@ -5,15 +5,16 @@
{
'creation': '2010-08-08 17:08:57',
'docstatus': 0,
- 'modified': '2011-05-27 18:30:14',
+ 'modified': '2012-01-19 12:29:40',
'modified_by': 'Administrator',
'owner': 'harshada@webnotestech.com'
},
# These values are common for all DocType
{
- '_last_update': '1308741898',
+ '_last_update': '1325570647',
'colour': 'White:FFF',
+ 'default_print_format': 'Standard',
'doctype': 'DocType',
'module': 'Support',
'name': '__common__',
@@ -23,7 +24,7 @@
'show_in_menu': 0,
'subject': '%(complaint)s By %(complaint_raised_by)s on %(issue_date)s',
'tag_fields': 'status',
- 'version': 96
+ 'version': 97
},
# These values are common for all DocField
@@ -55,7 +56,6 @@
{
'create': 1,
'doctype': 'DocPerm',
- 'idx': 1,
'permlevel': 0,
'role': 'Guest',
'write': 1
@@ -67,7 +67,6 @@
'cancel': 1,
'create': 1,
'doctype': 'DocPerm',
- 'idx': 2,
'permlevel': 0,
'role': 'System Manager',
'submit': 1,
@@ -77,7 +76,6 @@
# DocPerm
{
'doctype': 'DocPerm',
- 'idx': 3,
'permlevel': 1,
'role': 'System Manager'
},
@@ -88,7 +86,6 @@
'cancel': 1,
'create': 1,
'doctype': 'DocPerm',
- 'idx': 4,
'permlevel': 0,
'role': 'Maintenance Manager',
'submit': 1,
@@ -98,7 +95,6 @@
# DocPerm
{
'doctype': 'DocPerm',
- 'idx': 5,
'permlevel': 1,
'role': 'Maintenance Manager'
},
@@ -109,7 +105,6 @@
'cancel': 1,
'create': 1,
'doctype': 'DocPerm',
- 'idx': 6,
'permlevel': 0,
'role': 'Maintenance User',
'submit': 1,
@@ -119,7 +114,6 @@
# DocPerm
{
'doctype': 'DocPerm',
- 'idx': 7,
'permlevel': 1,
'role': 'Maintenance User'
},
@@ -128,7 +122,6 @@
{
'doctype': 'DocField',
'fieldtype': 'Section Break',
- 'idx': 1,
'label': 'Customer Issue',
'oldfieldtype': 'Section Break',
'permlevel': 0
@@ -139,7 +132,6 @@
'doctype': 'DocField',
'fieldname': 'naming_series',
'fieldtype': 'Select',
- 'idx': 2,
'in_filter': 0,
'label': 'Series',
'no_copy': 1,
@@ -158,7 +150,6 @@
'doctype': 'DocField',
'fieldname': 'status',
'fieldtype': 'Select',
- 'idx': 3,
'in_filter': 1,
'label': 'Status',
'no_copy': 1,
@@ -167,7 +158,7 @@
'options': '\nOpen\nClosed\nWork In Progress\nCancelled',
'permlevel': 0,
'reqd': 1,
- 'search_index': 0
+ 'search_index': 1
},
# DocField
@@ -176,7 +167,6 @@
'doctype': 'DocField',
'fieldname': 'complaint_date',
'fieldtype': 'Date',
- 'idx': 4,
'in_filter': 1,
'label': 'Issue Date',
'oldfieldname': 'complaint_date',
@@ -191,7 +181,6 @@
'doctype': 'DocField',
'fieldname': 'complaint_raised_by',
'fieldtype': 'Data',
- 'idx': 5,
'label': 'Raised By',
'oldfieldname': 'complaint_raised_by',
'oldfieldtype': 'Data',
@@ -203,7 +192,6 @@
'doctype': 'DocField',
'fieldname': 'from_company',
'fieldtype': 'Data',
- 'idx': 6,
'label': 'From Company',
'oldfieldname': 'from_company',
'oldfieldtype': 'Data',
@@ -215,7 +203,6 @@
'doctype': 'DocField',
'fieldname': 'service_address',
'fieldtype': 'Small Text',
- 'idx': 7,
'label': 'Service Address',
'oldfieldname': 'service_address',
'oldfieldtype': 'Small Text',
@@ -226,7 +213,6 @@
{
'doctype': 'DocField',
'fieldtype': 'Column Break',
- 'idx': 8,
'oldfieldtype': 'Column Break',
'permlevel': 0,
'width': '50%'
@@ -238,7 +224,6 @@
'doctype': 'DocField',
'fieldname': 'customer',
'fieldtype': 'Link',
- 'idx': 9,
'in_filter': 1,
'label': 'Customer',
'oldfieldname': 'customer',
@@ -256,7 +241,6 @@
'doctype': 'DocField',
'fieldname': 'customer_address',
'fieldtype': 'Link',
- 'idx': 10,
'label': 'Customer Address',
'options': 'Address',
'permlevel': 0,
@@ -268,7 +252,6 @@
'doctype': 'DocField',
'fieldname': 'contact_person',
'fieldtype': 'Link',
- 'idx': 11,
'label': 'Contact Person',
'options': 'Contact',
'permlevel': 0,
@@ -280,7 +263,6 @@
'doctype': 'DocField',
'fieldname': 'customer_name',
'fieldtype': 'Data',
- 'idx': 12,
'label': 'Name',
'permlevel': 1
},
@@ -290,7 +272,6 @@
'doctype': 'DocField',
'fieldname': 'address_display',
'fieldtype': 'Small Text',
- 'idx': 13,
'label': 'Address',
'permlevel': 1
},
@@ -300,7 +281,6 @@
'doctype': 'DocField',
'fieldname': 'contact_display',
'fieldtype': 'Small Text',
- 'idx': 14,
'label': 'Contact',
'permlevel': 1
},
@@ -310,7 +290,6 @@
'doctype': 'DocField',
'fieldname': 'contact_mobile',
'fieldtype': 'Data',
- 'idx': 15,
'label': 'Mobile No',
'permlevel': 1
},
@@ -320,7 +299,6 @@
'doctype': 'DocField',
'fieldname': 'contact_email',
'fieldtype': 'Data',
- 'idx': 16,
'label': 'Contact Email',
'permlevel': 1
},
@@ -331,7 +309,6 @@
'doctype': 'DocField',
'fieldname': 'territory',
'fieldtype': 'Link',
- 'idx': 17,
'in_filter': 1,
'label': 'Territory',
'oldfieldname': 'territory',
@@ -340,7 +317,7 @@
'permlevel': 0,
'print_hide': 1,
'reqd': 0,
- 'search_index': 0
+ 'search_index': 1
},
# DocField
@@ -348,7 +325,6 @@
'doctype': 'DocField',
'fieldname': 'customer_group',
'fieldtype': 'Link',
- 'idx': 18,
'label': 'Customer Group',
'options': 'Customer Group',
'permlevel': 0,
@@ -362,7 +338,6 @@
'doctype': 'DocField',
'fieldname': 'company',
'fieldtype': 'Link',
- 'idx': 19,
'in_filter': 1,
'label': 'Company',
'oldfieldname': 'company',
@@ -371,7 +346,7 @@
'permlevel': 0,
'print_hide': 1,
'reqd': 1,
- 'search_index': 0,
+ 'search_index': 1,
'trigger': 'Client'
},
@@ -380,7 +355,6 @@
'doctype': 'DocField',
'fieldname': 'fiscal_year',
'fieldtype': 'Select',
- 'idx': 20,
'in_filter': 1,
'label': 'Fiscal Year',
'oldfieldname': 'fiscal_year',
@@ -389,7 +363,7 @@
'permlevel': 0,
'print_hide': 1,
'reqd': 1,
- 'search_index': 0
+ 'search_index': 1
},
# DocField
@@ -398,7 +372,6 @@
'fieldname': 'amended_from',
'fieldtype': 'Data',
'hidden': 1,
- 'idx': 21,
'label': 'Amended From',
'no_copy': 1,
'oldfieldname': 'amended_from',
@@ -414,7 +387,6 @@
'fieldname': 'amendment_date',
'fieldtype': 'Date',
'hidden': 1,
- 'idx': 22,
'label': 'Amendment Date',
'no_copy': 1,
'oldfieldname': 'amendment_date',
@@ -428,7 +400,6 @@
{
'doctype': 'DocField',
'fieldtype': 'Section Break',
- 'idx': 23,
'label': 'Issue Details',
'oldfieldtype': 'Section Break',
'options': 'Simple',
@@ -440,7 +411,6 @@
'doctype': 'DocField',
'fieldname': 'serial_no',
'fieldtype': 'Link',
- 'idx': 24,
'label': 'Serial No',
'options': 'Serial No',
'permlevel': 0,
@@ -453,7 +423,6 @@
'doctype': 'DocField',
'fieldname': 'item_code',
'fieldtype': 'Link',
- 'idx': 25,
'in_filter': 1,
'label': 'Item Code',
'oldfieldname': 'item_code',
@@ -472,7 +441,6 @@
'doctype': 'DocField',
'fieldname': 'item_name',
'fieldtype': 'Data',
- 'idx': 26,
'label': 'Item Name',
'oldfieldname': 'item_name',
'oldfieldtype': 'Data',
@@ -486,7 +454,6 @@
'doctype': 'DocField',
'fieldname': 'description',
'fieldtype': 'Small Text',
- 'idx': 27,
'label': 'Description',
'oldfieldname': 'description',
'oldfieldtype': 'Small Text',
@@ -499,7 +466,6 @@
'doctype': 'DocField',
'fieldname': 'complaint',
'fieldtype': 'Small Text',
- 'idx': 28,
'label': 'Issue',
'no_copy': 1,
'oldfieldname': 'complaint',
@@ -512,7 +478,6 @@
{
'doctype': 'DocField',
'fieldtype': 'Column Break',
- 'idx': 29,
'oldfieldtype': 'Column Break',
'permlevel': 0,
'width': '50%'
@@ -525,7 +490,6 @@
'fieldname': 'warranty_amc_status',
'fieldtype': 'Select',
'hidden': 0,
- 'idx': 30,
'in_filter': 1,
'label': 'Warranty / AMC Status',
'options': '\nUnder Warranty\nOut of Warranty\nUnder AMC\nOut of AMC',
@@ -537,7 +501,6 @@
'doctype': 'DocField',
'fieldname': 'warranty_expiry_date',
'fieldtype': 'Date',
- 'idx': 31,
'label': 'Warranty Expiry Date',
'permlevel': 0
},
@@ -547,7 +510,6 @@
'doctype': 'DocField',
'fieldname': 'amc_expiry_date',
'fieldtype': 'Date',
- 'idx': 32,
'label': 'AMC Expiry Date',
'permlevel': 0
},
@@ -557,13 +519,12 @@
'doctype': 'DocField',
'fieldname': 'allocated_on',
'fieldtype': 'Date',
- 'idx': 33,
'in_filter': 1,
'label': 'Allocated On',
'oldfieldname': 'allocated_on',
'oldfieldtype': 'Date',
'permlevel': 0,
- 'search_index': 0
+ 'search_index': 1
},
# DocField
@@ -571,21 +532,19 @@
'doctype': 'DocField',
'fieldname': 'allocated_to',
'fieldtype': 'Link',
- 'idx': 34,
'in_filter': 1,
'label': 'Allocated To',
'oldfieldname': 'allocated_to',
'oldfieldtype': 'Link',
- 'options': 'Sales Person',
+ 'options': 'Profile',
'permlevel': 0,
- 'search_index': 0
+ 'search_index': 1
},
# DocField
{
'doctype': 'DocField',
'fieldtype': 'Section Break',
- 'idx': 35,
'label': 'Resolution Detail',
'oldfieldtype': 'Section Break',
'options': 'Simple',
@@ -597,7 +556,6 @@
'doctype': 'DocField',
'fieldname': 'resolution_details',
'fieldtype': 'Text',
- 'idx': 36,
'label': 'Resolution Details',
'no_copy': 1,
'oldfieldname': 'resolution_details',
@@ -609,7 +567,6 @@
{
'doctype': 'DocField',
'fieldtype': 'Column Break',
- 'idx': 37,
'oldfieldtype': 'Column Break',
'permlevel': 0,
'width': '50%'
@@ -620,14 +577,13 @@
'doctype': 'DocField',
'fieldname': 'resolution_date',
'fieldtype': 'Date',
- 'idx': 38,
'in_filter': 1,
'label': 'Resolution Date',
'no_copy': 1,
'oldfieldname': 'resolution_date',
'oldfieldtype': 'Date',
'permlevel': 0,
- 'search_index': 0
+ 'search_index': 1
},
# DocField
@@ -635,7 +591,6 @@
'doctype': 'DocField',
'fieldname': 'resolved_by',
'fieldtype': 'Link',
- 'idx': 39,
'in_filter': 1,
'label': 'Resolved By',
'no_copy': 1,
@@ -643,7 +598,7 @@
'oldfieldtype': 'Link',
'options': 'Sales Person',
'permlevel': 0,
- 'search_index': 0
+ 'search_index': 1
},
# DocField
@@ -653,7 +608,6 @@
'depends_on': 'eval:!doc.__islocal',
'doctype': 'DocField',
'fieldtype': 'Section Break',
- 'idx': 40,
'label': 'Next Steps',
'oldfieldtype': 'Section Break',
'permlevel': 0
@@ -665,7 +619,6 @@
'colour': 'White:FFF',
'doctype': 'DocField',
'fieldtype': 'Button',
- 'idx': 41,
'label': 'Make Maintenance Visit',
'oldfieldtype': 'Button',
'permlevel': 0,
diff --git a/erpnext/support/doctype/support_ticket/support_ticket.py b/erpnext/support/doctype/support_ticket/support_ticket.py
index e6d9118..bdf3c9a 100644
--- a/erpnext/support/doctype/support_ticket/support_ticket.py
+++ b/erpnext/support/doctype/support_ticket/support_ticket.py
@@ -24,7 +24,7 @@
response = self.doc.new_response + '\n\n[Please do not change the subject while responding.]'
# add last response to new response
- response += self.last_response()
+ response += unicode(self.last_response(), 'utf-8')
signature = webnotes.conn.get_value('Email Settings',None,'support_signature')
if signature:
@@ -36,7 +36,7 @@
recipients = [self.doc.raised_by], \
sender=webnotes.conn.get_value('Email Settings',None,'support_email'), \
subject=subject, \
- msg=response)
+ msg=response.encode('utf-8'))
self.doc.new_response = None
webnotes.conn.set(self.doc,'status','Waiting for Customer')