155 Commits

Author	SHA1	Message	Date
Rushabh Mehta	793ba6bd37	-webnotes +frappe 💥	2014-02-14 15:47:51 +05:30
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
Nabin Hait	dc15b4fa8a	Fixed conflict while merging with develop brnach	2014-01-20 16:48:49 +05:30
Nabin Hait	139aa71666	Fixed conflict while merging with master	2013-12-31 16:09:22 +05:30
Nabin Hait	d3f04d754a	General ledger path fixed	2013-12-31 16:04:48 +05:30