Merge branch 'latest' of github.com:webnotes/erpnext into latest

erpnext/patches/jan_mar_2012/fix_packing_slip.py

@@ -0,0 +1,20 @@
+def execute():
+	"""
+		* Change DN to PS mapper
+			+ Set Ref doc should be submitted to 0
+			+ Set validation logic of DN PS Table mapper record to docstatus=0
+	"""
+	import webnotes
+	webnotes.conn.sql("""\
+		UPDATE `tabDocType Mapper`
+		SET ref_doc_submitted=0
+		WHERE name='Delivery Note-Packing Slip'""")
+	
+	webnotes.conn.sql("""\
+		UPDATE `tabTable Mapper Detail`
+		SET validation_logic='docstatus=0'
+		WHERE parent='Delivery Note-Packing Slip'
+		AND docstatus=0
+		AND from_table='Delivery Note'
+		AND to_table='Packing Slip'""")
+

erpnext/patches/patch_list.py

@@ -99,5 +99,10 @@ patch_list = [
 		'patch_module': 'patches.jan_mar_2012',
 		'patch_file': 'reload_item',
 		'description': 'reload item'
-	}
+	},
+	{
+		'patch_module': 'patches.jan_mar_2012',
+		'patch_file': 'fix_packing_slip',
+		'description': 'Update Mapper Delivery Note-Packing Slip'
+	},
 ]