Nabin Hait 3607737b5e Merge branch 'develop' of https://github.com/frappe/erpnext into multi-currency		2015-09-07 10:41:01 +05:30
..
doctype	Fixed conflict	2015-09-03 16:04:11 +05:30
fixtures/web_form	[minor] add attachment to issue via portal:	2015-06-01 17:47:03 +05:30
page	[fix] setup wizard - industry type	2015-09-07 10:11:23 +05:30
__init__.py	moved modules inside erpnext folder	2013-12-11 10:43:52 +05:30
install.py	[fixes] portal, issues, addresses etc	2015-06-01 17:15:42 +05:30
utils.py	[fix] test-case, warehouse mandatory for mix type product bundle	2015-08-04 14:49:25 +05:30