Merge branch 'master' into latest

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')