fixes: show deducted tax in purchase register
Merge branch 'master' of github.com:webnotes/erpnext
fixes in test cases and buying amount function
Merge branch 'master' of github.com:webnotes/erpnext
[patch] [fix] material rename
[patch] [fix]
set fiscal year in stock entry and stock reconciliation
Merge branch 'master' of github.com:webnotes/erpnext

Conflicts:
	patches/patch_list.py
Merge branch 'master' into edge