Merge branch 'master' into production

Conflicts:
	patches/patch_list.py
	production/doctype/bom_explosion_item/bom_explosion_item.txt

manufacturing/doctype/bom/bom.txt

@@ -19,7 +19,6 @@
   "hide_heading": 0, 
   "issingle": 0, 
   "name": "__common__", 
-  "default_print_format": "Standard", 
   "allow_rename": 0, 
   "doctype": "DocType", 
   "is_submittable": 1, 

manufacturing/doctype/bom_item/bom_item.txt

@@ -13,7 +13,6 @@
 	# These values are common for all DocType
 	{
 		'colour': u'White:FFF',
-		'default_print_format': u'Standard',
 		'doctype': 'DocType',
 		'istable': 1,
 		'module': u'Manufacturing',

manufacturing/doctype/bom_operation/bom_operation.txt

@@ -13,7 +13,6 @@
 	# These values are common for all DocType
 	{
 		'colour': u'White:FFF',
-		'default_print_format': u'Standard',
 		'doctype': 'DocType',
 		'istable': 1,
 		'module': u'Manufacturing',

manufacturing/doctype/production_order/production_order.txt

@@ -9,7 +9,6 @@
  {
   "is_submittable": 1, 
   "in_create": 0, 
-  "default_print_format": "Standard", 
   "doctype": "DocType", 
   "module": "Manufacturing", 
   "name": "__common__"

manufacturing/doctype/production_plan_item/production_plan_item.txt

@@ -10,7 +10,6 @@
   "istable": 1, 
   "autoname": "PPID/.#####", 
   "name": "__common__", 
-  "default_print_format": "Standard", 
   "doctype": "DocType", 
   "module": "Manufacturing"
  }, 

manufacturing/doctype/production_plan_sales_order/production_plan_sales_order.txt

@@ -10,7 +10,6 @@
   "istable": 1, 
   "autoname": "PP/.SO/.#####", 
   "name": "__common__", 
-  "default_print_format": "Standard", 
   "doctype": "DocType", 
   "module": "Manufacturing"
  }, 

manufacturing/doctype/production_planning_tool/production_planning_tool.txt

@@ -10,7 +10,6 @@
   "read_only": 1, 
   "issingle": 1, 
   "in_create": 1, 
-  "default_print_format": "Standard", 
   "doctype": "DocType", 
   "module": "Manufacturing", 
   "name": "__common__"

manufacturing/doctype/workstation/workstation.txt

@@ -17,7 +17,6 @@
 		'allow_trash': 1,
 		'autoname': u'field:workstation_name',
 		'colour': u'White:FFF',
-		'default_print_format': u'Standard',
 		'doctype': 'DocType',
 		'document_type': u'Master',
 		'module': u'Manufacturing',