[freeside-commits] branch FREESIDE_3_BRANCH updated. a1c150b4ab4f726591210331dd7eb850900d741e

Mark Wells mark at 420.am
Tue Jul 12 17:33:07 PDT 2016


The branch, FREESIDE_3_BRANCH has been updated
       via  a1c150b4ab4f726591210331dd7eb850900d741e (commit)
       via  7773547423c9cd0e8ac7915de58daacbec7ccf09 (commit)
      from  fe92beb1b4322f86815a83491723b07aca2f9b93 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit a1c150b4ab4f726591210331dd7eb850900d741e
Author: Mark Wells <mark at freeside.biz>
Date:   Tue Jul 12 17:31:33 2016 -0700

    restore location labels on invoices, but remove the 'default service location' prefix from everywhere, #71474

diff --git a/FS/FS/Template_Mixin.pm b/FS/FS/Template_Mixin.pm
index b197c6c..efe9769 100644
--- a/FS/FS/Template_Mixin.pm
+++ b/FS/FS/Template_Mixin.pm
@@ -3396,7 +3396,7 @@ sub _items_cust_bill_pkg {
             # location, and we're not grouping items by location already
             if ( $cust_pkg->locationnum != $default_locationnum
                   and !defined($locationnum) ) {
-              my $loc = $cust_pkg->location_label(no_prefix => 1);
+              my $loc = $cust_pkg->location_label;
               $loc = substr($loc, 0, $maxlength). '...'
                 if $format eq 'latex' && length($loc) > $maxlength;
               push @d, &{$escape_function}($loc);
@@ -3506,7 +3506,7 @@ sub _items_cust_bill_pkg {
             # location, and we're not grouping items by location already
             if ( $cust_pkg->locationnum != $default_locationnum
                   and !defined($locationnum) ) {
-              my $loc = $cust_pkg->location_label(no_prefix => 1);
+              my $loc = $cust_pkg->location_label;
               $loc = substr($loc, 0, $maxlength). '...'
                 if $format eq 'latex' && length($loc) > $maxlength;
               push @d, &{$escape_function}($loc);
diff --git a/FS/FS/cust_location.pm b/FS/FS/cust_location.pm
index cbb4565..4960f74 100644
--- a/FS/FS/cust_location.pm
+++ b/FS/FS/cust_location.pm
@@ -716,9 +716,12 @@ sub label_prefix {
   } elsif ( $label_prefix eq '_location' && $self->locationname ) {
     $prefix = $self->locationname;
 
-  } elsif (    ( $opt{'cust_main'} || $self->custnum )
-          && $self->locationnum == $cust_or_prospect->ship_locationnum ) {
-    $prefix = 'Default service location';
+  #} elsif (    ( $opt{'cust_main'} || $self->custnum )
+  #        && $self->locationnum == $cust_or_prospect->ship_locationnum ) {
+  #  $prefix = 'Default service location';
+  #}
+  } else {
+    $prefix = '';
   }
 
   $prefix;

commit 7773547423c9cd0e8ac7915de58daacbec7ccf09
Author: Mark Wells <mark at freeside.biz>
Date:   Tue Jul 12 15:46:47 2016 -0700

    option to show all package locations on invoice, #71474

diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index cf505de..e916678 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -3868,6 +3868,13 @@ and customer address. Include units.',
   },
 
   {
+    'key'         => 'invoice-all_pkg_addresses',
+    'section'     => 'invoicing',
+    'description' => 'Show all package addresses on invoices, even the default.',
+    'type'        => 'checkbox',
+  },
+
+  {
     'key'         => 'invoice-unitprice',
     'section'     => 'invoicing',
     'description' => 'Enable unit pricing on invoices and quantities on packages.',
diff --git a/FS/FS/Template_Mixin.pm b/FS/FS/Template_Mixin.pm
index ed4bb62..b197c6c 100644
--- a/FS/FS/Template_Mixin.pm
+++ b/FS/FS/Template_Mixin.pm
@@ -3177,7 +3177,9 @@ sub _items_cust_bill_pkg {
 
   # for location labels: use default location on the invoice date
   my $default_locationnum;
-  if ( $self->custnum ) {
+  if ( $conf->exists('invoice-all_pkg_addresses') ) {
+    $default_locationnum = 0; # treat them all as non-default
+  } elsif ( $self->custnum ) {
     my $h_cust_main;
     my @h_search = FS::h_cust_main->sql_h_search($self->_date);
     $h_cust_main = qsearchs({
@@ -3394,7 +3396,7 @@ sub _items_cust_bill_pkg {
             # location, and we're not grouping items by location already
             if ( $cust_pkg->locationnum != $default_locationnum
                   and !defined($locationnum) ) {
-              my $loc = $cust_pkg->location_label;
+              my $loc = $cust_pkg->location_label(no_prefix => 1);
               $loc = substr($loc, 0, $maxlength). '...'
                 if $format eq 'latex' && length($loc) > $maxlength;
               push @d, &{$escape_function}($loc);
@@ -3504,7 +3506,7 @@ sub _items_cust_bill_pkg {
             # location, and we're not grouping items by location already
             if ( $cust_pkg->locationnum != $default_locationnum
                   and !defined($locationnum) ) {
-              my $loc = $cust_pkg->location_label;
+              my $loc = $cust_pkg->location_label(no_prefix => 1);
               $loc = substr($loc, 0, $maxlength). '...'
                 if $format eq 'latex' && length($loc) > $maxlength;
               push @d, &{$escape_function}($loc);

-----------------------------------------------------------------------

Summary of changes:
 FS/FS/Conf.pm           |    7 +++++++
 FS/FS/Template_Mixin.pm |    4 +++-
 FS/FS/cust_location.pm  |    9 ++++++---
 3 files changed, 16 insertions(+), 4 deletions(-)




More information about the freeside-commits mailing list