X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=rt%2Fshare%2Fhtml%2FElements%2FCustomerFields;h=226378ed88867131481205237f9ca4759ec3b18e;hb=d5f8aa5cf1787238224add1a836f0d7577f3b9b7;hp=199184b69319e4b68613ca631a96c5cae9015421;hpb=6e4fd158b8a797fc4702c7aa35f24c4bbd0f550f;p=freeside.git

diff --git a/rt/share/html/Elements/CustomerFields b/rt/share/html/Elements/CustomerFields
index 199184b69..226378ed8 100644
--- a/rt/share/html/Elements/CustomerFields
+++ b/rt/share/html/Elements/CustomerFields
@@ -27,7 +27,7 @@ my @customer_fields = ( # ordered
                 my @return = ();
                 foreach my $c (ticket_cust_resolvers($Ticket)) {
                     push @return, \'<A HREF="', $c->HREF, \'">',
-                                  $c->_FreesideURILabel,
+                                  $c->AsString,
                                   \'</A>',
                                   \'<BR>';
                 }
@@ -90,16 +90,29 @@ my @customer_fields = ( # ordered
     # query/sort needed?
   },
   {
+    Name    => 'BillingAddress',
+    Label   => 'Billing Address',
+    Display => 'bill_location',
+  },
+  {
+    Name    => 'StreetAddress1',
+    Label   => 'Street Address',
+    Display => 'bill_address1',
+  },
+  {
+    Name    => 'StreetAddress2',
+    Label   => '',
+    Display => 'bill_address2',
+  },
+  {
     Name    => 'City',
     Label   => 'City',
-    Display => 'city',
-    OrderBy => 'Customer.city',
+    Display => 'bill_city',
   },
   {
     Name    => 'State',
     Label   => 'State',
-    Display => 'state',
-    OrderBy => 'Customer.state',
+    Display => 'bill_state',
   },
   {
     Name    => 'CustomerTags',