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
..
setup	Merge with 3.3.8	2013-12-26 11:07:46 +05:30
setup_wizard	Merge remote-tracking branch 'webnotes/develop' into 4.0.0-wip	2014-01-24 21:44:36 +05:30
__init__.py	moved modules inside erpnext folder	2013-12-11 10:43:52 +05:30