Merge branch 'master' of git.freeside.biz:/home/git/freeside

diff --combined FS/FS/Template_Mixin.pm
index 17863a1,82aac00..fce1a3f
--- 1/FS/FS/Template_Mixin.pm
--- 2/FS/FS/Template_Mixin.pm
+++ b/FS/FS/Template_Mixin.pm
@@@ -1370,7 -1370,7 +1370,7 @@@ sub print_generic 
        # credits
        my $credittotal = 0;
        foreach my $credit (
 -        $self->_items_credits( 'template' => $template, 'trim_len' => 60 )
 +        $self->_items_credits( 'template' => $template, 'trim_len' => 50 )
        ) {
  
          my $total;
@@@ -3012,7 -3012,22 +3012,22 @@@ sub _items_cust_bill_pkg 
    my $maxlength = $conf->config('cust_bill-latex_lineitem_maxlength') || 50;
  
    my $cust_main = $self->cust_main;#for per-agent cust_bill-line_item-ate_style
-                                    # and location labels
+ 
+   # for location labels: use default location on the invoice date
+   my $default_locationnum;
+   if ( $self->custnum ) {
+     my $h_cust_main;
+     my @h_search = FS::h_cust_main->sql_h_search($self->_date);
+     $h_cust_main = qsearchs({
+         'table'     => 'h_cust_main',
+         'hashref'   => { custnum => $self->custnum },
+         'extra_sql' => $h_search[1],
+         'addl_from' => $h_search[3],
+     }) || $cust_main;
+     $default_locationnum = $h_cust_main->ship_locationnum;
+   } elsif ( $self->prospectnum ) {
+     $default_locationnum = $self->prospect_main->cust_location->locationnum;
+   }
  
    my @b = (); # accumulator for the line item hashes that we'll return
    my ($s, $r, $u, $d) = ( undef, undef, undef, undef );
@@@ -3197,11 -3212,10 +3212,10 @@@
  
              push @d, @svc_labels
                unless $cust_bill_pkg->pkgpart_override; #don't redisplay services
-             my $lnum = $cust_main ? $cust_main->ship_locationnum
-                                   : $self->prospect_main->locationnum;
              # show the location label if it's not the customer's default
              # location, and we're not grouping items by location already
-             if ( $cust_pkg->locationnum != $lnum and !defined($locationnum) ) {
+             if ( $cust_pkg->locationnum != $default_locationnum
+                   and !defined($locationnum) ) {
                my $loc = $cust_pkg->location_label;
                $loc = substr($loc, 0, $maxlength). '...'
                  if $format eq 'latex' && length($loc) > $maxlength;
@@@ -3299,11 -3313,10 +3313,10 @@@
              warn "$me _items_cust_bill_pkg done adding service details\n"
                if $DEBUG > 1;
  
-             my $lnum = $cust_main ? $cust_main->ship_locationnum
-                                   : $self->prospect_main->locationnum;
              # show the location label if it's not the customer's default
              # location, and we're not grouping items by location already
-             if ( $cust_pkg->locationnum != $lnum and !defined($locationnum) ) {
+             if ( $cust_pkg->locationnum != $default_locationnum
+                   and !defined($locationnum) ) {
                my $loc = $cust_pkg->location_label;
                $loc = substr($loc, 0, $maxlength). '...'
                  if $format eq 'latex' && length($loc) > $maxlength;