RP-1786: add variant to invoice
fix merge conflicts