Fix restrictedearea bug & delete extrafield on delete invoice