mirror of
https://github.com/frappe/erpnext.git
synced 2026-05-25 07:54:46 +00:00
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:
@@ -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',
|
||||
},
|
||||
]
|
||||
Reference in New Issue
Block a user