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/accounts/doctype/sales_invoice/sales_invoice.py
	erpnext/patches/patch_list.py
	public/js/report-legacy.js
This commit is contained in:
Rushabh Mehta
2012-07-26 15:46:13 +02:00
parent 9b8fca9d75 adc6c7c02b
commit 0fa628bf86
13 changed files with 114 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
erpnext/patches/patch_list.py
View File

@@ -516,4 +516,9 @@ patch_list = [
'patch_file': 'unicode_conf',
'description': "appends from __future__ import unicode_literals to py files if necessary"
},
]
{
'patch_module': 'patches.july_2012',
'patch_file': 'sync_trial_balance',
'description': "sync trial balance"
},
]