Anand Doshi 7e9048570e Merge branch 'master' of github.com:webnotes/erpnext into wsgi ...

Conflicts:
	accounts/doctype/sales_invoice/sales_invoice.txt
	controllers/selling_controller.py
	patches/patch_list.py
	selling/doctype/lead/lead.py
	selling/doctype/opportunity/opportunity.py
	selling/doctype/quotation/quotation.py
	selling/doctype/quotation/quotation.txt
	selling/doctype/sales_order/sales_order.txt
	stock/doctype/purchase_receipt/purchase_receipt.py
	stock/doctype/serial_no/serial_no.py
	stock/doctype/stock_entry/stock_entry.py
	stock/doctype/stock_ledger_entry/stock_ledger_entry.py

2013-10-15 12:18:46 +05:30

..

css

[splash] position erpnext

2013-06-05 12:36:50 +05:30

images

[minor] [fix] get queries

2013-07-19 12:54:33 +05:30

js

Merge branch 'master' of github.com:webnotes/erpnext into wsgi

2013-10-15 12:18:46 +05:30

build.json

[website] [minor] moving to framework

2013-09-10 13:46:28 +05:30