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
..
Deduction Type	moved directory structure	2012-09-24 19:13:42 +05:30
doctype	Merge branch 'master' of github.com:webnotes/erpnext into 1209	2012-10-02 14:35:20 +05:30
DocType Mapper	moved directory structure	2012-09-24 19:13:42 +05:30
Earning Type	moved directory structure	2012-09-24 19:13:42 +05:30
Expense Type	moved directory structure	2012-09-24 19:13:42 +05:30
Leave Type	moved directory structure	2012-09-24 19:13:42 +05:30
page	moved directory structure	2012-09-24 19:13:42 +05:30
search_criteria	moved directory structure	2012-09-24 19:13:42 +05:30
__init__.py	moved directory structure	2012-09-24 19:13:42 +05:30