EST-338: Add adjustment flag to invoice item; more refactoring