Discount calculation doesn't include the occupancy modifier

1. The calculation of a discount by percent or an amount uses only the base rate and not the occupancy modifiers. It doesn't make sense.

2. In my opinion the occupancy modifier tab in the settings should be before the discount tabs, because it changes the base rate on a per night basis and the discounts works on a all night basis.