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

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

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

DocType Mapper

fixes in packing slip

2013-04-16 12:29:27 +05:30

locale

Adding German translation

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

page

[report] requested qty to be ordered

2013-05-13 16:29:28 +05:30

Print Format

Other charges in currect currency fixes for all classic/modern/spartan print g=format

2013-01-25 17:24:47 +05:30

report

[report] requested qty to be transferred

2013-05-13 16:29:50 +05:30

__init__.py

install from txt files, part 1

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

stock_ledger.py

fixed conflict

2013-03-19 18:29:05 +05:30

utils.py

[feature] reorder level checking through scheduler

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