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

diff --git a/FS/FS/Template_Mixin.pm b/FS/FS/Template_Mixin.pm
index 82aac00..fce1a3f 100644 (file)
--- a/FS/FS/Template_Mixin.pm
+++ b/FS/FS/Template_Mixin.pm
@@ -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;

diff --git a/FS/FS/cust_bill.pm b/FS/FS/cust_bill.pm
index a65154e..5cdae66 100644 (file)
--- a/FS/FS/cust_bill.pm
+++ b/FS/FS/cust_bill.pm
@@ -2705,7 +2705,7 @@ sub _items_previous {
 
 sub _items_credits {
   my( $self, %opt ) = @_;
-  my $trim_len = $opt{'trim_len'} || 60;
+  my $trim_len = $opt{'trim_len'} || 50;
 
   my @b;
   #credits