[FIX]Payment in kind

Merged Gastón Bertolani requested to merge 12.0-fix-payment-in-kind into 12.0-stage

Merge request reports