(cherry picked from commit 17d415b105)
# Conflicts:
# erpnext/accounts/doctype/purchase_invoice/test_purchase_invoice.py
# erpnext/patches.txt
# erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json
(cherry picked from commit 17d415b105)
# Conflicts:
# erpnext/accounts/doctype/purchase_invoice/test_purchase_invoice.py
# erpnext/patches.txt
# erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json