Anand Doshi cb39e0878e Merge remote-tracking branch 'webnotes/develop' into 4.0.0-wip ... Conflicts: config.json erpnext/accounts/utils.py erpnext/patches/patch_list.py erpnext/stock/doctype/price_list/price_list.txt erpnext/stock/doctype/warehouse/warehouse.py portal/templates/sale.html portal/utils.py selling/doctype/sales_order/templates/pages/order.py selling/utils/cart.py selling/utils/product.py utilities/demo/demo_docs/Fiscal_Year.csv utilities/demo/make_demo.py		2014-01-24 21:44:36 +05:30
..
__init__.py	moved modules inside erpnext folder	2013-12-11 10:43:52 +05:30
setup_wizard.css	moved modules inside erpnext folder	2013-12-11 10:43:52 +05:30
setup_wizard.js	Moved patches and fixed method routing in pages	2013-12-27 13:43:40 +05:30
setup_wizard.py	Merge remote-tracking branch 'webnotes/develop' into 4.0.0-wip	2014-01-24 21:44:36 +05:30
setup_wizard.txt	moved modules inside erpnext folder	2013-12-11 10:43:52 +05:30
test_setup_data.py	moved modules inside erpnext folder	2013-12-11 10:43:52 +05:30
test_setup_wizard.py	install, web serving, session booting webnotes/wnframework#351	2013-12-12 19:12:19 +05:30