tree 8fce4636b643fc0b173c90579b5f870ca24c1eda
parent 2023012b0e4cb9c0c40cb93bd6bf95029a841ace
parent ac24d0fa986431980510a2e0ba0487831788a576
author Anand Doshi <anand@erpnext.com> 1372746032 +0530
committer Anand Doshi <anand@erpnext.com> 1372746032 +0530

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

Conflicts:
	accounts/doctype/sales_invoice/sales_invoice.py
	accounts/doctype/sales_invoice_item/sales_invoice_item.txt
	buying/doctype/supplier_quotation/supplier_quotation.js
	patches/patch_list.py