Marc: Bugs with View Customer Invoice fixed