Anand Doshi 59d8a76e60 Merge branch 'master' of github.com:webnotes/erpnext into edge ... Conflicts: hr/doctype/leave_application/locale/_messages_py.json hr/doctype/leave_block_list/locale/_messages_doc.json public/js/locale/_messages_js.json setup/doctype/email_digest/locale/_messages_doc.json setup/doctype/global_defaults/global_defaults.txt		2013-02-21 11:09:43 +05:30
..
campaign	upgraded test_runner, now can run multiple tests	2013-02-12 19:20:39 +05:30
communication_log/locale	updated language	2013-02-11 11:44:12 +05:30
customer	refactored defaults, bin material request wip	2013-02-19 15:27:31 +05:30
industry_type	upgraded test_runner, now can run multiple tests	2013-02-12 19:20:39 +05:30
installation_note	model_wrapper is now bean, refactoring defaults	2013-02-18 18:24:28 +05:30
installation_note_item	updated language	2013-02-11 11:44:12 +05:30
lead	model_wrapper is now bean, refactoring defaults	2013-02-18 18:24:28 +05:30
opportunity	model_wrapper is now bean, refactoring defaults	2013-02-18 18:24:28 +05:30
opportunity_item	updated language	2013-02-11 11:44:12 +05:30
quotation	Merge branch 'master' of github.com:webnotes/erpnext into edge	2013-02-21 11:09:43 +05:30
quotation_item	updated language	2013-02-11 11:44:12 +05:30
sales_and_purchase_return_item	updated language	2013-02-11 11:44:12 +05:30
sales_common	Merge branch 'master' of github.com:webnotes/erpnext into edge	2013-02-21 11:09:43 +05:30
sales_order	Merge branch 'master' of github.com:webnotes/erpnext into edge	2013-02-21 11:09:43 +05:30
sales_order_item	updated language	2013-02-11 11:44:12 +05:30
sales_team	updated language	2013-02-11 11:44:12 +05:30
shipping_address	updated language	2013-02-11 11:44:12 +05:30
sms_center	model_wrapper is now bean, refactoring defaults	2013-02-18 18:24:28 +05:30
__init__.py	moved directory structure	2012-09-24 19:13:42 +05:30