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

..

locale

updated language

2013-02-11 11:44:12 +05:30

__init__.py

moved directory structure

2012-09-24 19:13:42 +05:30

quotation.js

Disable rounded total feature

2013-02-20 16:25:05 +05:30

quotation.py

model_wrapper is now bean, refactoring defaults

2013-02-18 18:24:28 +05:30

quotation.txt

setting list_views

2013-01-29 17:53:29 +05:30