[freeside-commits] freeside/FS/FS/part_pkg delayed_Mixin.pm, 1.1.4.3, 1.1.4.4 discount_Mixin.pm, 1.1.2.7, 1.1.2.8 flat.pm, 1.53.2.9, 1.53.2.10 global_Mixin.pm, 1.1.2.2, 1.1.2.3 prorate_Mixin.pm, 1.5.2.5, 1.5.2.6 sql_external.pm, 1.11.2.3, 1.11.2.4 usage_Mixin.pm, 1.1.2.2, 1.1.2.3

[Ivan,,,]

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

Modified Files:
      Tag: FREESIDE_2_1_BRANCH
	delayed_Mixin.pm discount_Mixin.pm flat.pm global_Mixin.pm 
	prorate_Mixin.pm sql_external.pm usage_Mixin.pm 
Log Message:
fix mixin inheritence preventing prorate_delayed packages from billing, RT#14372

Index: prorate_Mixin.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/part_pkg/prorate_Mixin.pm,v
retrieving revision 1.5.2.5
retrieving revision 1.5.2.6
diff -u -w -d -r1.5.2.5 -r1.5.2.6
--- prorate_Mixin.pm	16 Jun 2011 22:07:42 -0000	1.5.2.5
+++ prorate_Mixin.pm	8 Sep 2011 22:09:57 -0000	1.5.2.6
@@ -1,10 +1,9 @@
 package FS::part_pkg::prorate_Mixin;
 
 use strict;
-use vars qw(@ISA %info);
+use vars qw( %info );
 use Time::Local qw(timelocal);
 
- at ISA = qw(FS::part_pkg);
 %info = ( 
   'disabled'  => 1,
 );

Index: usage_Mixin.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/part_pkg/usage_Mixin.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
--- usage_Mixin.pm	24 Dec 2010 09:49:50 -0000	1.1.2.2
+++ usage_Mixin.pm	8 Sep 2011 22:09:58 -0000	1.1.2.3
@@ -1,10 +1,8 @@
 package FS::part_pkg::usage_Mixin;
 
 use strict;
-use vars qw( @ISA %info );
-use FS::part_pkg;
+use vars qw( %info );
 use FS::UI::bytecount;
- at ISA = qw(FS::part_pkg);
 
 # Field definitions for time and data usage, other than CDRs.
 

Index: sql_external.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/part_pkg/sql_external.pm,v
retrieving revision 1.11.2.3
retrieving revision 1.11.2.4
diff -u -w -d -r1.11.2.3 -r1.11.2.4
--- sql_external.pm	12 Feb 2011 04:56:28 -0000	1.11.2.3
+++ sql_external.pm	8 Sep 2011 22:09:57 -0000	1.11.2.4
@@ -1,7 +1,7 @@
 package FS::part_pkg::sql_external;
+use base qw( FS::part_pkg::discount_Mixin FS::part_pkg::recur_Common );
 
 use strict;
-use base qw( FS::part_pkg::recur_Common FS::part_pkg::discount_Mixin );
 use vars qw( %info );
 use DBI;
 #use FS::Record qw(qsearch qsearchs);

Index: delayed_Mixin.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/part_pkg/delayed_Mixin.pm,v
retrieving revision 1.1.4.3
retrieving revision 1.1.4.4
diff -u -w -d -r1.1.4.3 -r1.1.4.4
--- delayed_Mixin.pm	11 Aug 2011 00:38:59 -0000	1.1.4.3
+++ delayed_Mixin.pm	8 Sep 2011 22:09:57 -0000	1.1.4.4
@@ -1,5 +1,4 @@
 package FS::part_pkg::delayed_Mixin;
-use base qw( FS::part_pkg );
 
 use strict;
 use vars qw(%info);

Index: flat.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/part_pkg/flat.pm,v
retrieving revision 1.53.2.9
retrieving revision 1.53.2.10
diff -u -w -d -r1.53.2.9 -r1.53.2.10
--- flat.pm	11 Aug 2011 00:38:59 -0000	1.53.2.9
+++ flat.pm	8 Sep 2011 22:09:57 -0000	1.53.2.10
@@ -1,14 +1,13 @@
 package FS::part_pkg::flat;
-
-use strict;
-use base qw( FS::part_pkg 
-             FS::part_pkg::prorate_Mixin
+use base qw( FS::part_pkg::prorate_Mixin
              FS::part_pkg::discount_Mixin
+             FS::part_pkg
            );
+
+use strict;
 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 List::Util qw( min );
 use FS::UI::bytecount;
 use FS::Conf;
 

Index: global_Mixin.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/part_pkg/global_Mixin.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
--- global_Mixin.pm	24 Dec 2010 09:49:49 -0000	1.1.2.2
+++ global_Mixin.pm	8 Sep 2011 22:09:57 -0000	1.1.2.3
@@ -1,9 +1,7 @@
 package FS::part_pkg::global_Mixin;
 
 use strict;
-use vars qw(@ISA %info);
-use FS::part_pkg;
- at ISA = qw(FS::part_pkg);
+use vars qw(%info);
 
 %info = (
   'disabled' => 1,

Index: discount_Mixin.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/part_pkg/discount_Mixin.pm,v
retrieving revision 1.1.2.7
retrieving revision 1.1.2.8
diff -u -w -d -r1.1.2.7 -r1.1.2.8
--- discount_Mixin.pm	27 Jun 2011 21:27:35 -0000	1.1.2.7
+++ discount_Mixin.pm	8 Sep 2011 22:09:57 -0000	1.1.2.8
@@ -1,14 +1,12 @@
 package FS::part_pkg::discount_Mixin;
 
 use strict;
-use vars qw(@ISA %info);
-use FS::part_pkg;
+use vars qw( %info );
+use Time::Local qw( timelocal );
+use List::Util  qw( min );
 use FS::cust_pkg;
 use FS::cust_bill_pkg_discount;
-use Time::Local qw(timelocal);
-use List::Util 'min';
 
- at ISA = qw(FS::part_pkg);
 %info = ( 'disabled' => 1 );
 
 =head1 NAME