[freeside-commits] branch master updated. ea1f12bb5c5764f784e884fa8d7c37e5cd0b28e0

Ivan ivan at 420.am
Wed Jan 25 22:34:47 PST 2017


The branch, master has been updated
       via  ea1f12bb5c5764f784e884fa8d7c37e5cd0b28e0 (commit)
      from  0aaf7f8b540c21b10799d122c9a9399da6460a47 (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 ea1f12bb5c5764f784e884fa8d7c37e5cd0b28e0
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Wed Jan 25 22:34:42 2017 -0800

    can't find any indication this did anything back to 3.x

diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index b3654b9..4bc7404 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -3584,13 +3584,6 @@ and customer address. Include units.',
   },
 
   {
-    'key'         => 'voip-cust_cdr_spools',
-    'section'     => 'deprecated',
-    'description' => 'Deprecated, used to enable the per-customer option for individual CDR spools.',
-    'type'        => 'checkbox',
-  },
-
-  {
     'key'         => 'voip-cust_cdr_squelch',
     'section'     => 'telephony_invoicing',
     'description' => 'Enable the per-customer option for not printing CDR on invoices.',
diff --git a/FS/FS/part_pkg/voip_inbound.pm b/FS/FS/part_pkg/voip_inbound.pm
index 15af706..e9ab1f7 100644
--- a/FS/FS/part_pkg/voip_inbound.pm
+++ b/FS/FS/part_pkg/voip_inbound.pm
@@ -206,9 +206,6 @@ sub calc_usage {
     if $self->recur_temporality eq 'preceding'
     && ( $last_bill eq '' || $last_bill == 0 );
 
-  my $spool_cdr = $cust_pkg->cust_main->spool_cdr;
-
-
   my $charges = 0;
 
 #  my $downstream_cdr = '';
diff --git a/httemplate/edit/cust_main/billing.html b/httemplate/edit/cust_main/billing.html
index 649c4c9..5714f9a 100644
--- a/httemplate/edit/cust_main/billing.html
+++ b/httemplate/edit/cust_main/billing.html
@@ -224,14 +224,6 @@ function toggle(obj) {
 %   # CDR flags / options
 %   ###
 
-% if ( $conf->exists('voip-cust_cdr_spools') ) { 
-      <TR>
-       <TD COLSPAN="2"><INPUT TYPE="checkbox" NAME="spool_cdr" VALUE="Y" <% $cust_main->spool_cdr eq "Y" ? 'CHECKED' : '' %>> <% mt('Spool CDRs') |h %></TD>
-      </TR>
-% } else { 
-      <INPUT TYPE="hidden" NAME="spool_cdr" VALUE="<% $cust_main->spool_cdr %>">
-% }
-
 % if ( $conf->exists('voip-cust_cdr_squelch') ) { 
       <TR>
        <TD COLSPAN="2"><INPUT TYPE="checkbox" NAME="squelch_cdr" VALUE="Y" <% $cust_main->squelch_cdr eq "Y" ? 'CHECKED' : '' %>> <% mt($conf->exists('voip-cdr_email') ? 'Omit CDRs from printed invoices' : 'Omit CDRs from invoices') |h %></TD>
diff --git a/httemplate/view/cust_main/billing.html b/httemplate/view/cust_main/billing.html
index 49dbeae..bd589d7 100644
--- a/httemplate/view/cust_main/billing.html
+++ b/httemplate/view/cust_main/billing.html
@@ -200,13 +200,6 @@ set_display_recurring(<% encode_json({'display_recurring' => [ $cust_main->displ
   </TD>
 </TR>
 
-% if ( $conf->exists('voip-cust_cdr_spools') ) { 
-  <TR>
-    <TH ALIGN="right"><% mt('Spool CDRs') |h %></TH>
-    <TD><% $cust_main->spool_cdr ? $yes : $no %></TD>
-  </TR>
-% } 
-
 % if ( $conf->exists('voip-cust_cdr_squelch') ) { 
   <TR>
     <TH ALIGN="right"><% mt($conf->exists('voip-cdr_email') ? 'Print CDRs' : 'Show CDRs') |h %></TH>

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

Summary of changes:
 FS/FS/Conf.pm                          |    7 -------
 FS/FS/part_pkg/voip_inbound.pm         |    3 ---
 httemplate/edit/cust_main/billing.html |    8 --------
 httemplate/view/cust_main/billing.html |    7 -------
 4 files changed, 25 deletions(-)




More information about the freeside-commits mailing list