Anand Doshi 70902da4da Merge branch 'master' of github.com:webnotes/erpnext into responsive ...

Conflicts:
	patches/december_2012/deprecate_tds.py
	patches/june_2012/reports_list_permission.py
	selling/doctype/sales_bom/locale/_messages_doc.json
	selling/doctype/sales_bom/locale/ar-doc.json
	selling/doctype/sales_bom/locale/de-doc.json
	selling/doctype/sales_bom/locale/es-doc.json
	selling/doctype/sales_bom/locale/fr-doc.json
	selling/doctype/sales_bom/locale/hi-doc.json
	selling/doctype/sales_bom/locale/hr-doc.json
	selling/doctype/sales_bom/locale/nl-doc.json
	selling/doctype/sales_bom/locale/pt-BR-doc.json
	selling/doctype/sales_bom/locale/pt-doc.json
	selling/doctype/sales_bom/locale/sr-doc.json
	selling/doctype/sales_bom/locale/ta-doc.json
	selling/doctype/sales_bom/locale/th-doc.json
	selling/doctype/sales_bom_item/locale/_messages_doc.json
	selling/doctype/sales_bom_item/locale/ar-doc.json
	selling/doctype/sales_bom_item/locale/de-doc.json
	selling/doctype/sales_bom_item/locale/es-doc.json
	selling/doctype/sales_bom_item/locale/fr-doc.json
	selling/doctype/sales_bom_item/locale/hi-doc.json
	selling/doctype/sales_bom_item/locale/hr-doc.json
	selling/doctype/sales_bom_item/locale/nl-doc.json
	selling/doctype/sales_bom_item/locale/pt-BR-doc.json
	selling/doctype/sales_bom_item/locale/pt-doc.json
	selling/doctype/sales_bom_item/locale/sr-doc.json
	selling/doctype/sales_bom_item/locale/ta-doc.json
	selling/doctype/sales_bom_item/locale/th-doc.json

2013-06-26 14:07:29 +05:30

..

__init__.py

Adding German translation

2013-02-27 17:36:23 +01:00

boot.py

[keyboard shortcuts] keyboard shortcuts using jquery hotkeys instead of mousetrap

2013-06-17 12:55:54 +05:30

event_handlers.py

[profile/email] [feature] added option not to send print as email body. fix in profile delete

2013-03-25 17:52:14 +05:30

install.py

[install] fixes - do not update parent doctype if in_import

2013-06-25 12:36:13 +05:30

observers.py

completed Time Log / Time Log Batch

2013-03-01 18:24:52 +05:30

open_count.py

[commit] unified notifications

2013-06-18 15:46:32 +05:30

query_handlers.py

added time log batch

2013-02-28 18:42:46 +05:30

report_data_map.py

[report][fix] stock balance

2013-06-24 17:18:24 +05:30

schedule_handlers.py

[material request on re-order level] [fixes] if error occurs, send email to the System Manager

2013-06-17 11:57:04 +05:30

website.py

[cleanup] removed Featured Item, Website Product Category, Valuation Control

2013-06-11 12:03:37 +05:30