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

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

0

patches/october_2012/__init__.py Normal file