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

Conflicts:
	erpnext/accounts/doctype/sales_invoice/sales_invoice.txt
	public/js/all-app.js
This commit is contained in:
Anand Doshi
2012-09-10 11:31:18 +05:30
9 changed files with 135 additions and 22 deletions

View File

@@ -565,4 +565,12 @@ patch_list = [
'patch_module': 'patches.august_2012',
'patch_file': 'remove_cash_flow_statement',
},
]
{
'patch_module': 'patches.august_2012',
'patch_file': 'reload_stock_ledger',
},
{
'patch_module': 'patches.september_2012',
'patch_file': 'stock_report_permissions_for_accounts',
},
]