[freeside-commits] freeside/FS/FS/part_pkg torrus_bw_percentile.pm, 1.2, 1.3 torrus_bw_usage.pm, 1.2, 1.3 torrus_Common.pm, 1.10, 1.11 flat.pm, 1.61, 1.62 voip_cdr.pm, 1.115, 1.116 voip_inbound.pm, 1.6, 1.7 cdr_termination.pm, 1.8, 1.9

[Ivan,,,]

Update of /home/cvs/cvsroot/freeside/FS/FS/part_pkg
In directory wavetail.420.am:/tmp/cvs-serv21800/FS/FS/part_pkg

Modified Files:
	torrus_bw_percentile.pm torrus_bw_usage.pm torrus_Common.pm 
	flat.pm voip_cdr.pm voip_inbound.pm cdr_termination.pm 
Log Message:
torrus: default to "preceding" behavior, RT#10574

Index: torrus_bw_usage.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/part_pkg/torrus_bw_usage.pm,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -d -r1.2 -r1.3
--- torrus_bw_usage.pm	24 Jan 2011 03:06:01 -0000	1.2
+++ torrus_bw_usage.pm	8 Apr 2011 01:00:37 -0000	1.3
@@ -10,7 +10,6 @@
   'weight'    => 54.7, #:/
   'inherit_fields' => [ 'flat', 'global_Mixin' ],
   'fields' => {
-    #'recur_temporality' => { 'hidden' => 1, 'value' => 'preceding' }, #XXX do
     'recur_temporality' => { 'disabled' => 1 },
     'sync_bill_date'    => { 'disabled' => 1 },
     'cutoff_day'        => { 'disabled' => 1 },

Index: voip_cdr.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/part_pkg/voip_cdr.pm,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -w -d -r1.115 -r1.116
--- voip_cdr.pm	14 Mar 2011 22:40:50 -0000	1.115
+++ voip_cdr.pm	8 Apr 2011 01:00:37 -0000	1.116
@@ -318,7 +318,7 @@
   my $last_bill = $cust_pkg->get('last_bill'); #->last_bill falls back to setup
 
   return 0
-    if $self->option('recur_temporality', 1) eq 'preceding'
+    if $self->recur_temporality eq 'preceding'
     && ( $last_bill eq '' || $last_bill == 0 );
 
   my $ratenum = $cust_pkg->part_pkg->option('ratenum');

Index: flat.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/part_pkg/flat.pm,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -w -d -r1.61 -r1.62
--- flat.pm	15 Mar 2011 00:04:30 -0000	1.61
+++ flat.pm	8 Apr 2011 01:00:37 -0000	1.62
@@ -123,7 +123,7 @@
   my $last_bill = $cust_pkg->get('last_bill'); #->last_bill falls back to setup
 
   return 0
-    if $self->option('recur_temporality', 1) eq 'preceding' && $last_bill == 0;
+    if $self->recur_temporality eq 'preceding' && $last_bill == 0;
 
   my $charge = $self->base_recur($cust_pkg, $sdate);
   if ( my $cutoff_day = $self->cutoff_day($cust_pkg) ) {
@@ -209,6 +209,11 @@
   $self->freq =~ /^\d+$/ && $self->freq > 0;
 }
 
+sub recur_temporality {
+  my $self = shift;
+  $self->option('recur_temporality', 1);
+}
+
 sub usage_valuehash {
   my $self = shift;
   map { $_, $self->option($_) }

Index: voip_inbound.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/part_pkg/voip_inbound.pm,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -w -d -r1.6 -r1.7
--- voip_inbound.pm	12 Feb 2011 04:56:57 -0000	1.6
+++ voip_inbound.pm	8 Apr 2011 01:00:37 -0000	1.7
@@ -202,7 +202,7 @@
   my $last_bill = $cust_pkg->get('last_bill'); #->last_bill falls back to setup
 
   return 0
-    if $self->option('recur_temporality', 1) eq 'preceding'
+    if $self->recur_temporality eq 'preceding'
     && ( $last_bill eq '' || $last_bill == 0 );
 
   my $spool_cdr = $cust_pkg->cust_main->spool_cdr;

Index: torrus_bw_percentile.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/part_pkg/torrus_bw_percentile.pm,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -d -r1.2 -r1.3
--- torrus_bw_percentile.pm	24 Jan 2011 00:10:39 -0000	1.2
+++ torrus_bw_percentile.pm	8 Apr 2011 01:00:37 -0000	1.3
@@ -10,7 +10,6 @@
   'weight'    => 54.5, #:/
   'inherit_fields' => [ 'flat', 'global_Mixin' ],
   'fields' => {
-    #'recur_temporality' => { 'hidden' => 1, 'value' => 'preceding' }, #XXX do
     'recur_temporality' => { 'disabled' => 1 },
     'sync_bill_date'    => { 'disabled' => 1 },
     'cutoff_day'        => { 'disabled' => 1 },

Index: cdr_termination.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/part_pkg/cdr_termination.pm,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -w -d -r1.8 -r1.9
--- cdr_termination.pm	24 Dec 2010 09:49:31 -0000	1.8
+++ cdr_termination.pm	8 Apr 2011 01:00:37 -0000	1.9
@@ -103,7 +103,7 @@
   my $last_bill = $cust_pkg->get('last_bill'); #->last_bill falls back to setup
 
   return 0
-    if $self->option('recur_temporality', 1) eq 'preceding'
+    if $self->recur_temporality eq 'preceding'
     && ( $last_bill eq '' || $last_bill == 0 );
 
   # termination calculations

Index: torrus_Common.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/part_pkg/torrus_Common.pm,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -w -d -r1.10 -r1.11
--- torrus_Common.pm	12 Feb 2011 04:58:35 -0000	1.10
+++ torrus_Common.pm	8 Apr 2011 01:00:37 -0000	1.11
@@ -7,6 +7,8 @@
 
 our $DEBUG = 1;
 
+sub recur_temporality { 'preceding'; }
+
 sub price_info {
     my $self = shift;
     my $str = $self->SUPER::price_info;