Surcharge or handling changes as separet line on invoice

Oracle considers all handling charges as freight and even when each order line has separate handling charge, the receivables groups it together as freight on the invoice.

Also if surcharge is applied to each line, it is shown as adjustment within OM but is not passed to AR as a separate line on the invoice. Instead the invoice is created with the final price which is list price + surcharge.

The requirement is to have a charge aplied to each order line and then to have AR show it as a separate line and not combine under freight as one for invoice. Ideally the table