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

Conflicts:
	patches/patch_list.py
	stock/report/stock_ledger/stock_ledger.txt
This commit is contained in:
Anand Doshi
2013-01-14 13:28:31 +05:30
21 changed files with 238 additions and 168 deletions

View File

@@ -586,4 +586,12 @@ patch_list = [
'patch_module': 'patches.january_2013',
'patch_file': 'stock_reconciliation_patch',
},
{
'patch_module': 'patches.january_2013',
'patch_file': 'report_permission',
},
{
'patch_module': 'patches.january_2013',
'patch_file': 'give_report_permission_on_read',
},
]