HOTFIX 2015.3, 2015.4 - Added ##MFGPARTNUMBER## and ##MFGNAME## merges for order items

Added ##MFGPARTNUMBER## and##MFGNAME##merges for order items. This allows for the Added ##MFGPARTNUMBER## and ##MFGNAME## merge code to work on the order view page.