Foreign Supplier who is GB VAT registered supplying goods from outside of the UK

Summary

Supplier with multiple EU VAT registrations

Content

We have a supplier which may have multiple EU VAT registrations – including a GB one – set up against this supplier.

We set up the INTRA EU GOODS BOUGHT tax classification – it now automatically applies a 20% self charge to UK VAT on supplies of GOODS  from EU suppliers. 

What we want the system to do is;

Supplier – GB VAT number (and EU VAT number)  – ship from location UK – STANDARD (Tax Rate Code)

Supplier – GB VAT number & EU VAT number – ship from location EU – INTRA EU GOODS BOUGHT (Tax Rate Code).

Has anyone done this before or could offer some guidance?