Initial rework to move REPAIR_ADJ item onto newly created invoice so that old invoices don't change
Fix beatrix test failures (missed in prevous commit)