R12.1.3 - Repair order logistics lines and Charge lines in same order and to be invoiced together

Hi

Step 1: We created a Repair & Return with Logistics line - RMA & Ship lines created with Order Number  X.

2.Received the RMA

3.Created a WIP job

4.Issue components and labour hours and completed the WIP job

5.Import WIP job actuals

6.Submit the Repair Charge actuals line- these are BILL ONLY LINES.Its created as separate Lines in sales order X

Untill this point it works as expected.

7.Even before shipping the logistics lines,the Charges lines are interfaced and line status becomes CLOSED while ship line status shows AWAITING SHIPPING.

What we wanted is, ONLY ONE invoice to be generated after shipping the product.