[freeside-commits] freeside/FS/FS/part_pkg flat.pm, 1.53.2.5, 1.53.2.6

[Ivan,,,]

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

Modified Files:
      Tag: FREESIDE_2_1_BRANCH
	flat.pm 
Log Message:
fix prorates & recurring fees with recur_Common-using packages, RT#11993

Index: flat.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/part_pkg/flat.pm,v
retrieving revision 1.53.2.5
retrieving revision 1.53.2.6
diff -u -w -d -r1.53.2.5 -r1.53.2.6
--- flat.pm	12 Feb 2011 04:56:27 -0000	1.53.2.5
+++ flat.pm	14 Mar 2011 22:42:41 -0000	1.53.2.6
@@ -1,19 +1,16 @@
 package FS::part_pkg::flat;
 
 use strict;
-use vars qw( @ISA %info
-             %usage_recharge_fields @usage_recharge_fieldorder
+use base qw( FS::part_pkg 
+             FS::part_pkg::prorate_Mixin
+             FS::part_pkg::discount_Mixin
            );
+use vars qw( %info %usage_recharge_fields @usage_recharge_fieldorder );
 use Tie::IxHash;
 use List::Util qw(min); # max);
 #use FS::Record qw(qsearch);
 use FS::UI::bytecount;
 use FS::Conf;
-use FS::part_pkg;
-
- at ISA = qw(FS::part_pkg 
-          FS::part_pkg::prorate_Mixin
-          FS::part_pkg::discount_Mixin);
 
 tie my %temporalities, 'Tie::IxHash',
   'upcoming'  => "Upcoming (future)",