Anand Doshi 05aaae33ae Merge branch 'master' of github.com:webnotes/erpnext into 1209 ... Conflicts: accounts/doctype/account/account.py erpnext/accounts/doctype/journal_voucher/journal_voucher.py patches/patch_list.py startup/event_handlers.py		2012-10-02 14:35:20 +05:30
..
__init__.py	moved directory structure	2012-09-24 19:13:42 +05:30
item_list.js	moved directory structure	2012-09-24 19:13:42 +05:30
item.js	Merge branch 'master' of github.com:webnotes/erpnext into 1209	2012-10-02 14:35:20 +05:30
item.py	dont save duplicate files	2012-09-25 18:20:36 +05:30
item.txt	moved directory structure	2012-09-24 19:13:42 +05:30
test_item.py	moved directory structure	2012-09-24 19:13:42 +05:30