4 Commits

Author	SHA1	Message	Date
Anand Doshi	fa228e9c9b	Merge branch 'master' of github.com:webnotes/erpnext into wsgi ... Conflicts: accounts/doctype/purchase_invoice/purchase_invoice.py accounts/doctype/sales_invoice/sales_invoice.txt selling/doctype/lead/lead.txt selling/doctype/opportunity/opportunity.txt stock/doctype/warehouse/warehouse.py	2013-10-02 16:52:52 +05:30
Nabin Hait	6ec4b0c52a	[fix] [minor] display product image in shopping cart	2013-09-26 15:45:44 +05:30
Anand Doshi	de8b6aadaf	[minor] fixes for import conf	2013-09-24 17:17:39 +05:30
Rushabh Mehta	c59c4e0699	[website] [minor] moving to framework	2013-09-09 12:17:45 +05:30