The only solution I know would be to switch to a Base U of M of Bottles. This will probably not be popular with your warehouse manager. Your customers will be able order in Bottles or Units and your purchasing department will be able to order it in appropriate units. All your inventory reports and inquiries will report Bottles though.
Tim