From: ivan <ivan>
Date: Fri, 12 Sep 2008 07:58:34 +0000 (+0000)
Subject: make the max # of indivudal services printed on invoices configurable.  RT#3904
X-Git-Tag: root_of_webpay_support~366
X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=commitdiff_plain;h=8dc7f5fd687d606943ee9c6835402e5c3d024e8f

make the max # of indivudal services printed on invoices configurable.  RT#3904
---

diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index d244dcea0..274b109db 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -2422,6 +2422,13 @@ worry that config_items is freeside-specific and icky.
     'type'        => 'text',
   },
 
+  {
+    'key'         => 'cust_bill-max_same_services',
+    'section'     => 'billing',
+    'description' => 'Maximum number of the same service to list individually on invoices before condensing to a single line listing the number of services.  Defaults to 5.',
+    'type'        => 'text',
+  },
+
 );
 
 1;
diff --git a/FS/FS/cust_pkg.pm b/FS/FS/cust_pkg.pm
index b0e27f28c..fd8b73ae8 100644
--- a/FS/FS/cust_pkg.pm
+++ b/FS/FS/cust_pkg.pm
@@ -1485,15 +1485,19 @@ sub h_labels {
 
 =item h_labels_short END_TIMESTAMP [ START_TIMESTAMP ]
 
-Like h_labels, except returns a simple flat list, and shortens long 
-(currently >5) lists of identical services to one line that lists the service
-label and the number of individual services rather than individual items.
+Like h_labels, except returns a simple flat list, and shortens long
+(currently >5 or the cust_bill-max_same_services configuration value) lists of
+identical services to one line that lists the service label and the number of
+individual services rather than individual items.
 
 =cut
 
 sub h_labels_short {
   my $self = shift;
 
+  my $conf = new FS::Conf;
+  my $max_same_services = $conf->config('cust_bill-max_same_services') || 5;
+
   my %labels;
   #tie %labels, 'Tie::IxHash';
   push @{ $labels{$_->[0]} }, $_->[1]
@@ -1502,7 +1506,7 @@ sub h_labels_short {
   foreach my $label ( keys %labels ) {
     my @values = @{ $labels{$label} };
     my $num = scalar(@values);
-    if ( $num > 5 ) {
+    if ( $num > $max_same_services ) {
       push @labels, "$label ($num)";
     } else {
       push @labels, map { "$label: $_" } @values;