Anand Doshi 4543884021 Merge branch 'edge' of github.com:webnotes/erpnext into webshop ...

Conflicts:
	accounts/doctype/sales_invoice_item/sales_invoice_item.txt
	selling/doctype/quotation/quotation.txt
	selling/doctype/quotation_item/quotation_item.txt
	selling/doctype/sales_order_item/sales_order_item.txt
	stock/doctype/delivery_note_item/delivery_note_item.txt
	stock/doctype/item/item.txt

2013-05-23 15:22:47 +05:30

..

__init__.py

Adding German translation

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

boot.py

[sales taxes and charges] renamed field cost_center_other_charges to cost_center

2013-04-19 16:21:55 +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

removed colour fields from txt files

2013-03-05 14:19:48 +05:30

observers.py

completed Time Log / Time Log Batch

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

open_count.py

completed Time Log / Time Log Batch

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

query_handlers.py

added time log batch

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

report_data_map.py

[stock] [feature] added project to stock ledger entry and updated stock balance report

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

schedule_handlers.py

[feature] reorder level checking through scheduler

2013-05-22 16:19:10 +05:30

startup.py

fixes in calendar event display on desktop

2013-03-01 14:41:32 +05:30

website.py

[website] [fix] fixes in sitemap and rss generators

2013-05-22 15:51:47 +05:30