OM Tax Code on Freight

Hi -

We recently upgraded to R12.1.3.  All of the configurations to set the freight item as taxable are complete and we are seeing the tax calculating.  However, the business is commenting that the tax code is "incorrect."

Reviewing the situation, it appears that the OM team updates the tax code on sales orders on a line-by-line basis, overriding the default tax code from the customer.  If there's no freight on the order, it's not an issue - the tax code from the SO line passes to AR and the invoice is generated with the correct tax code.  However, when freight charges are passed back to the SO from shipping, the line item "FREIGHT" is added with the original tax code for the customer, not the updated tax code of the other SO lines.