brotherton-erpnext/projects
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
..
doctype Merge branch 'master' of github.com:webnotes/erpnext into wsgi 2013-10-02 16:52:52 +05:30
page [project] [link-fix] minor 2013-09-13 10:21:46 +05:30
report [license] [minor] Updated License Text in all js and py files 2013-08-05 14:59:54 +05:30
__init__.py install from txt files, part 1 2013-01-16 17:48:17 +05:30
utils.py [license] [minor] Updated License Text in all js and py files 2013-08-05 14:59:54 +05:30