Map company country by name or code. Fix double push of invoice on line ...

...modification