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

Conflicts: erpnext/patches/july_2012/repost_stock_due_to_wrong_packing_list.py
2012-08-06 13:23:16 +05:30
parent 6243f29ab3 fd03762445
commit e64d900322
6 changed files with 53 additions and 43 deletions
--- a/erpnext/patches/patch_list.py
+++ b/erpnext/patches/patch_list.py
@@ -533,4 +533,8 @@ patch_list = [
 		'patch_module': 'patches.july_2012',
 		'patch_file': 'project_patch_repeat',
 	},
+	{
+		'patch_module': 'patches.july_2012',
+		'patch_file': 'repost_stock_due_to_wrong_packing_list',
+	},
 ]