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

General ledger path fixed

2013-12-31 16:04:48 +05:30

general_ledger.js

Fixed conflict while merging with master

2013-12-31 16:09:22 +05:30

general_ledger.py

Merge remote-tracking branch 'webnotes/develop' into 4.0.0-wip

2014-01-24 21:44:36 +05:30

general_ledger.txt

General ledger path fixed

2013-12-31 16:04:48 +05:30