Fix: [ bug #1411 ] Unable to set an expedition note if invoices module is not enabled
Merge branch 'bug-1411' of github.com:marcosgdf/dolibarr into
marcosgdf-bug-1411

Conflicts:
	ChangeLog
Merge branch 'marcosgdf-bug-1411' into 3.5