Merge branch 'master' into latest

erpnext/patches/jan_mar_2012/jan_production_patches.py

@@ -7,3 +7,5 @@ def execute():
 	from webnotes.modules.module_manager import reload_doc
 
 	reload_doc('stock', 'doctype', 'stock_entry_detail')
+	reload_doc('stock', 'doctype', 'item_supplier')
+	reload_doc('stock', 'doctype', 'item')

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
@@ -621,6 +621,34 @@
 		'permlevel': 0
 	},
 
+	# 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',

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'
+	}
+]

erpnext/support/doctype/support_ticket/support_ticket.py

@@ -24,7 +24,7 @@ class DocType(TransactionBase):
 		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: