issue #21684: alternate approach to fix triggering bug
issue #21684: move order number and date higher
issue #21684: update todos
Merge remote-tracking branch 'XTUPLE/master' into 21684-invoice
Issue #21628: Fixed display of commission
fix build
Issue #21628: Fixed display on commission
merge Travis
merge
Merge branch '21628' of github.com:lynnaloo/xtuple into 21664-billing-cash-receipt
Merge branch '21684-invoice' of github.com:shackbarth/xtuple into 21664-billing-cash-receipt

Conflicts:
	enyo-client/extensions/source/billing/database/source/xt/views/cashrcpt_receivable.sql