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

Conflicts: erpnext/stock/doctype/item/item.txt
2012-08-07 15:07:56 +05:30
parent a742d32c96 f6624257ad
commit 16ad50f641
24 changed files with 330 additions and 55 deletions
--- a/erpnext/patches/patch_list.py
+++ b/erpnext/patches/patch_list.py
@@ -541,4 +541,8 @@ patch_list = [
 		'patch_module': 'patches.july_2012',
 		'patch_file': 'supplier_quotation',
 	},
+	{
+		'patch_module': 'patches.august_2012',
+		'patch_file': 'report_supplier_quotations',
+	},
 ]