tree 6718d0b4d1b0050602d53f88f7d415464d31adee
parent a80f2e44315319fc3c3cbcaa7d14434ddf755da1
parent 7496b528a10867366981eace096cdef0788eceab
author Anand Doshi <anand@erpnext.com> 1380119141 +0530
committer Anand Doshi <anand@erpnext.com> 1380119141 +0530

Merge branch 'master' of github.com:webnotes/erpnext into wsgi

Conflicts:
	accounts/doctype/account/account.py
	accounts/doctype/gl_entry/gl_entry.py
	accounts/doctype/period_closing_voucher/period_closing_voucher.py
	stock/doctype/delivery_note/delivery_note.py
	stock/doctype/landed_cost_wizard/landed_cost_wizard.py
	stock/doctype/purchase_receipt/purchase_receipt.py
	stock/doctype/stock_ledger/stock_ledger.py
	stock/doctype/warehouse/warehouse.py
	stock/stock_ledger.py