Fix when invoice existent

Merged Santiago Said requested to merge FixWhenInvoiceExistent into 11.0-stage

Merge request reports