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

..

april_2013

refactor site_path

2013-09-25 12:40:33 +05:30

august_2013

[minor] fixed globals and patch for wsgi migration

2013-10-10 12:03:11 +05:30

december_2012

[production] update planned and produced ty

2013-10-11 18:31:33 +05:30

february_2013

[production] update planned and produced ty

2013-10-11 18:31:33 +05:30

january_2013

[usability] item price moved to price list

2013-09-11 13:05:24 +05:30

july_2013

[license] [minor] Updated License Text in all js and py files

2013-08-05 14:59:54 +05:30

june_2013

New Setup Wizard

2013-10-08 17:59:11 +05:30

march_2013

[fix] [minor] fixes in old patches

2013-09-25 12:52:28 +05:30

may_2013

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

2013-09-25 12:17:47 +05:30

november_2012

[license] [minor] Updated License Text in all js and py files

2013-08-05 14:59:54 +05:30

october_2012

[license] [minor] Updated License Text in all js and py files

2013-08-05 14:59:54 +05:30

october_2013

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

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

september_2012

[license] [minor] Updated License Text in all js and py files

2013-08-05 14:59:54 +05:30

september_2013

[patch] [minor] fix wrong customers in pos

2013-10-01 15:20:06 +05:30

__init__.py

moved directory structure

2012-09-24 19:13:42 +05:30

patch_list.py

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

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