Sending GLN via ED40

We recently received the ok to transmit GLN's for Bard for one of our facilities, however how we have the ED40 set up, it is not transmitting the GLN, but the location.

The error from GHX is:

Analysis: This order failed because the account number is not valid at GHX; it appears to be a MMIS system value: 2001 17043AFGO8000

I guess the question I have is should we have a different TPID for each Bard division for this to work, instead of GHX17043 in ED10? Or should the GLN be populated in the Lawson Value in the ED40 screen?

We have multiple divisions of Bard all sharing the same TPID. 

Our ED40's look like this:

1) List Name: L1_O_USE_GLN

   Lawson Value:  GHX17043

  External Value:  B

2) List Name:  USE_PURCHFROM_GLN_AS_SHIPTOX

    Lawson Value:  GHX17043

    External Value:  Y

3)  List Name:  L1_O_SHIPTO_GLN

      Lawson Value:  2001

       External Value:  1100008292083  (<-- that's the GLN)

4) List Name:  L1_O_SHIPTO_GLN

    Lawson Value:  2001     170743DFGO8000

    External Value:  1100008292083

5)  List Name:  L1_O_SHIPTO_GLN

     Lawson Value:  2001     17043AFGO8000

     External Value:  1100008292083

Thanks for any help/ideas!