Merge branch 'master' of github.com:webnotes/erpnext into stock_reco
Conflicts:
patches/patch_list.py
stock/report/stock_ledger/stock_ledger.txt
diff --git a/patches/patch_list.py b/patches/patch_list.py
index e842e16..0b6c3f8 100644
--- a/patches/patch_list.py
+++ b/patches/patch_list.py
@@ -586,4 +586,12 @@
'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',
+ },
]
\ No newline at end of file