[FIX]Discount and pricelist

Merged Gastón Bertolani requested to merge 11.0-discount-listprice into 11.0-stage

Merge request reports