A Generalised Theory of Proportionality in Collective Decision Making