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

Conflicts: erpnext/accounts/doctype/c_form/c_form.txt erpnext/patches/patch_list.py erpnext/setup/doctype/permission_control/permission_control.py
2012-04-09 12:14:53 +05:30
parent 85eb840ab4 3525d92cfb
commit 87a2c5cc69
10 changed files with 103 additions and 18 deletions
--- a/erpnext/patches/patch_list.py
+++ b/erpnext/patches/patch_list.py
@@ -261,5 +261,10 @@ patch_list = [
 		'patch_module': 'patches.mar_2012',
 		'patch_file': 'usertags',
 		'description': 'Adds _user_tags columns to tables' 
-	}
+	},
+	{
+		'patch_module': 'patches.april_2012',
+		'patch_file': 'reload_c_form',
+		'description': 'Added attchemnt option and total field'
+	},
 ]