nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-05 06:28:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
	accounts/doctype/account/account.py
	erpnext/accounts/doctype/journal_voucher/journal_voucher.py
	patches/patch_list.py
	startup/event_handlers.py
This commit is contained in:
Anand Doshi
2012-10-02 14:35:20 +05:30
parent 5bc86087fd 47d8947012
commit 05aaae33ae
20 changed files with 287 additions and 503 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
patches/patch_list.py
View File

@@ -607,4 +607,8 @@ patch_list = [
'patch_module': 'patches.september_2012',
'patch_file': 'profile_delete_permission',
},
{
'patch_module': 'patches.october_2012',
'patch_file': 'update_permission',
},
]