Invoice Create template generate
Conflicts resolved