add discount to order model, and fixe reports
Merge branch 'develop'