nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-08-30 07:08:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
	erpnext/accounts/doctype/sales_invoice/sales_invoice.py
	erpnext/patches/patch_list.py
This commit is contained in:
Anand Doshi
2012-07-27 14:45:24 +05:30
parent 66f90687e9 85632b71c9
commit 396628e7ea
7 changed files with 33 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/patches/patch_list.py
View File

@@ -521,4 +521,8 @@ patch_list = [
'patch_file': 'sync_trial_balance',
'description': "sync trial balance"
},
{
'patch_module': 'patches.july_2012',
'patch_file': 'blog_guest_permission',
},
]