X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2FUI%2FWeb.pm;h=61617060e5e7b14da1cce20cb48d8b4357fbaec9;hb=9f17681a11d2e20f5baa7acf19873daf33058aa9;hp=d7f998bdf72f5962c3cca10bbed24b84fb60d659;hpb=fe4515eb37d76849dd08c62782d86bc7ba311dcd;p=freeside.git

diff --git a/FS/FS/UI/Web.pm b/FS/FS/UI/Web.pm
index d7f998bdf..61617060e 100644
--- a/FS/FS/UI/Web.pm
+++ b/FS/FS/UI/Web.pm
@@ -323,6 +323,14 @@ sub cust_header {
   @cust_header;
 }
 
+sub cust_sort_fields {
+  cust_header(@_) if( @_ or !@cust_fields );
+  #inefficientish, but tiny lists and only run once per page
+
+  map { $_ eq 'custnum' ? 'custnum' : '' } @cust_fields;
+
+}
+
 =item cust_sql_fields [ CUST_FIELDS_VALUE ]
 
 Returns a list of fields for the SELECT portion of an SQL query.
@@ -338,7 +346,7 @@ sub cust_sql_fields {
   my @fields = qw( last first company );
 #  push @fields, map "ship_$_", @fields;
 
-  cust_header(@_);
+  cust_header(@_) if( @_ or !@cust_fields );
   #inefficientish, but tiny lists and only run once per page
 
   my @location_fields;
@@ -349,6 +357,11 @@ sub cust_sql_fields {
       }
     }
   }
+  foreach my $pre ('bill_','ship_') {
+    if ( grep { $_ eq $pre.'country_full' } @cust_fields ) {
+      push @location_fields, $pre.'locationnum';
+    }
+  }
 
   foreach my $field (qw(daytime night fax payby)) {
     push @fields, $field if (grep { $_ eq $field } @cust_fields);
@@ -473,6 +486,7 @@ element.
 
 sub cust_fields_subs {
   my $unlinked_warn = 0;
+
   return map { 
     my $f = $_;
     if ( $unlinked_warn++ ) {