Ability to enter Expiry date when Receiving stock in WMS

Would love the ability to enter the Expiry date in the Expiry date field when receiving stock via WMS.  Currently when the Expiry date field is activated, it is only available in the PO screen in Purchases and not available in the WMS module.

This would assist us to receive stock using the WMS module and to be able to record the Expiry Date.

Current workaround is to use Batch/Serial number field instead, but that can be problematic if we have both a batch number and an expiry date.