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

Conflicts: accounts/doctype/payment_to_invoice_matching_tool/payment_to_invoice_matching_tool.py
2013-07-11 18:29:32 +05:30
parent 946e0de0cf cfecd2bc16
commit 34736c8d87
42 changed files with 304 additions and 489 deletions
--- a/utilities/cleanup_data.py
+++ b/utilities/cleanup_data.py
@@ -50,7 +50,7 @@ def delete_masters():
 		'Supplier Type': ['Default Supplier Type'],
 		'Supplier': '',
 		'Serial No': '',
-		'Sales Person': ['All Sales Persons'],
+		'Sales Person': ['Sales Team'],
 		'Sales Partner': '',
 		'Sales BOM': '',
 		'Salary Structure': '',