[T2635] Avoid duplicated checks on account.payment.order

Merged Macarena Meldi requested to merge T2635 into 15.0

Merge request reports