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

..

doctype

[feature] reorder level checking through scheduler

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

locale

updated language and separated slickgrid files

2013-02-25 11:05:27 +05:30

page

[setup home] combined Update Application, Backup Manager and Scheduler Error Log under Setup > Administration

2013-05-15 12:24:50 +05:30

__init__.py

install from txt files, part 1

2013-01-16 17:48:17 +05:30

utils.py

[buying, selling] [refactor] get item details

2013-05-15 21:15:57 +05:30