have you tried selecting the Product/Service option on the content tab on the default sales invoice layout? because I found this has the desired effect on the P.O
