Order bill entries by date, and then entry_id.
Merge branch 'develop'