[T-6549] [FIX] Call super only on else & use invoice policy for qty

Merged Facundo Barral requested to merge T-6549 into 15.0-stage

Merge request reports