add conditions for account payment order type

Merged Ariel Caruso requested to merge 12.0-fix into 12.0-stage

Merge request reports