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

Conflicts:
	public/js/all-app.js
	public/js/all-web.js
This commit is contained in:
Anand Doshi
2012-09-26 12:24:28 +05:30
11 changed files with 441 additions and 315 deletions

View File

@@ -588,4 +588,16 @@ patch_list = [
'patch_module': 'patches.september_2012',
'patch_file': 'plot_patch',
},
{
'patch_module': 'patches.september_2012',
'patch_file': 'event_permission',
},
{
'patch_module': 'patches.september_2012',
'patch_file': 'repost_stock',
},
{
'patch_module': 'patches.september_2012',
'patch_file': 'reload_gross_profit',
},
]