More work on edit invoice func