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
..
campaign	moved directory structure	2012-09-24 19:13:42 +05:30
customer	updated shortcuts	2012-09-28 12:33:42 +05:30
industry_type	moved directory structure	2012-09-24 19:13:42 +05:30
installation_note	dont save duplicate files	2012-09-25 18:20:36 +05:30
installation_note_item	moved directory structure	2012-09-24 19:13:42 +05:30
lead	Merge branch '1209' of github.com:webnotes/erpnext into 1209	2012-09-28 12:39:37 +05:30
opportunity	Merge branch 'master' of github.com:webnotes/erpnext into 1209	2012-10-02 14:35:20 +05:30
opportunity_item	moved directory structure	2012-09-24 19:13:42 +05:30
plot_control	dont save duplicate files	2012-09-25 18:20:36 +05:30
quotation	dont save duplicate files	2012-09-25 18:20:36 +05:30
quotation_item	moved directory structure	2012-09-24 19:13:42 +05:30
sales_and_purchase_return_item	moved directory structure	2012-09-24 19:13:42 +05:30
sales_common	dont save duplicate files	2012-09-25 18:20:36 +05:30
sales_order	Merge branch 'master' of github.com:webnotes/erpnext into 1209	2012-10-02 14:35:20 +05:30
sales_order_item	moved directory structure	2012-09-24 19:13:42 +05:30
sales_team	moved directory structure	2012-09-24 19:13:42 +05:30
shipping_address	moved directory structure	2012-09-24 19:13:42 +05:30
sms_center	dont save duplicate files	2012-09-25 18:20:36 +05:30
__init__.py	moved directory structure	2012-09-24 19:13:42 +05:30