[freeside-commits] freeside/FS/FS/part_pkg prorate.pm, 1.17, 1.17.4.1 voip_inbound.pm, 1.1.2.2, 1.1.2.3

[Mark Wells]

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

Modified Files:
      Tag: FREESIDE_1_9_BRANCH
	prorate.pm voip_inbound.pm 
Log Message:
fix display bug, RT#8524

Index: prorate.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/part_pkg/prorate.pm,v
retrieving revision 1.17
retrieving revision 1.17.4.1
diff -u -w -d -r1.17 -r1.17.4.1
--- prorate.pm	13 Apr 2008 07:41:28 -0000	1.17
+++ prorate.pm	21 May 2010 03:42:20 -0000	1.17.4.1
@@ -86,7 +86,7 @@
                     },
   },
   'fieldorder' => [ 'setup_fee', 'recur_fee', 'unused_credit', 'cutoff_day',
-                    'seconds', 'upbyte', 'downbytes', 'totalbytes',
+                    'seconds', 'upbytes', 'downbytes', 'totalbytes',
                     'recharge_amount', 'recharge_seconds', 'recharge_upbytes',
                     'recharge_downbytes', 'recharge_totalbytes',
                     'usage_rollover', 'recharge_reset', 'externalid', ],

Index: voip_inbound.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/part_pkg/voip_inbound.pm,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -w -d -r1.1.2.2 -r1.1.2.3
--- voip_inbound.pm	21 May 2010 03:28:49 -0000	1.1.2.2
+++ voip_inbound.pm	21 May 2010 03:42:20 -0000	1.1.2.3
@@ -163,7 +163,6 @@
                        use_duration
                        output_format usage_mandate summarize_usage usage_section
                        bill_every_call
-                       count_available_phones
                      )
                   ],
   'weight' => 40,
@@ -366,15 +365,8 @@
 #  to indicate it represents a line
 sub calc_units {    
   my($self, $cust_pkg ) = @_;
-  my $count = 0;
-  if ( $self->option('count_available_phones', 1)) {
-    map { $count += ( $_->quantity || 0 ) }
-      grep { $_->part_svc->svcdb eq 'svc_phone' }
-      $cust_pkg->part_pkg->pkg_svc;
-  } else {
-    $count = 
+  my $count = 
       scalar(grep { $_->part_svc->svcdb eq 'svc_phone' } $cust_pkg->cust_svc);
-  }
   $count;
 }