schuetz3/schuetz3-erpnext
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
	erpnext/hr/doctype/expense_claim/expense_claim.js
	erpnext/patches/patch_list.py
This commit is contained in:
Anand Doshi
2012-07-31 17:30:49 +05:30
parent ccee92e5c0 f9360ce562
commit 59d37c4bcb
7 changed files with 41 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
erpnext/patches/patch_list.py
View File

@@ -525,4 +525,8 @@ patch_list = [
'patch_module': 'patches.july_2012',
'patch_file': 'blog_guest_permission',
},
]
{
'patch_module': 'patches.july_2012',
'patch_file': 'bin_permission',
},
]