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

Conflicts: erpnext/accounts/search_criteria/cash_flow_statement/__init__.py erpnext/accounts/search_criteria/cash_flow_statement/cash_flow_statement.py public/js/all-app.js
2012-08-31 12:09:02 +05:30
parent 62a3881837 687a655b36
commit fa97e8c783
6 changed files with 8 additions and 77 deletions
--- a/erpnext/patches/patch_list.py
+++ b/erpnext/patches/patch_list.py
@@ -561,4 +561,8 @@ patch_list = [
 		'patch_module': 'patches.august_2012',
 		'patch_file': 'repost_billed_amt',
 	},
+	{
+		'patch_module': 'patches.august_2012',
+		'patch_file': 'remove_cash_flow_statement',
+	},
 ]