tree 349a3ba9d154fce033e65ac06af1a63e3206a677
parent 40534f076b317ff6fdfa267291410e97a96c18c2
parent 4090c78c3f8356f56df12b3ddc4ac5b3472380ec
author Anand Doshi <anand@erpnext.com> 1395994319 +0530
committer Anand Doshi <anand@erpnext.com> 1395994319 +0530

Merge remote-tracking branch 'frappe/develop' into model-cleanup

Conflicts:
	erpnext/accounts/doctype/payment_to_invoice_matching_tool/payment_to_invoice_matching_tool.py
	erpnext/accounts/doctype/sales_invoice/sales_invoice.py
	erpnext/controllers/stock_controller.py