projects
/
freeside.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
14c3740
)
fix mixin inheritence preventing prorate_delayed packages from billing, RT#14372
author
ivan
<ivan>
Thu, 8 Sep 2011 22:09:58 +0000
(22:09 +0000)
committer
ivan
<ivan>
Thu, 8 Sep 2011 22:09:58 +0000
(22:09 +0000)
FS/FS/part_pkg/delayed_Mixin.pm
patch
|
blob
|
history
FS/FS/part_pkg/discount_Mixin.pm
patch
|
blob
|
history
FS/FS/part_pkg/flat.pm
patch
|
blob
|
history
FS/FS/part_pkg/global_Mixin.pm
patch
|
blob
|
history
FS/FS/part_pkg/prorate_Mixin.pm
patch
|
blob
|
history
FS/FS/part_pkg/sql_external.pm
patch
|
blob
|
history
FS/FS/part_pkg/usage_Mixin.pm
patch
|
blob
|
history
diff --git
a/FS/FS/part_pkg/delayed_Mixin.pm
b/FS/FS/part_pkg/delayed_Mixin.pm
index
4228a4a
..
d28480d
100644
(file)
--- a/
FS/FS/part_pkg/delayed_Mixin.pm
+++ b/
FS/FS/part_pkg/delayed_Mixin.pm
@@
-1,5
+1,4
@@
package FS::part_pkg::delayed_Mixin;
package FS::part_pkg::delayed_Mixin;
-use base qw( FS::part_pkg );
use strict;
use vars qw(%info);
use strict;
use vars qw(%info);
diff --git
a/FS/FS/part_pkg/discount_Mixin.pm
b/FS/FS/part_pkg/discount_Mixin.pm
index
87ec3a7
..
4a9a65e
100644
(file)
--- a/
FS/FS/part_pkg/discount_Mixin.pm
+++ b/
FS/FS/part_pkg/discount_Mixin.pm
@@
-1,14
+1,12
@@
package FS::part_pkg::discount_Mixin;
use strict;
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 FS::cust_pkg;
use FS::cust_bill_pkg_discount;
-use Time::Local qw(timelocal);
-use List::Util 'min';
-@ISA = qw(FS::part_pkg);
%info = ( 'disabled' => 1 );
=head1 NAME
%info = ( 'disabled' => 1 );
=head1 NAME
diff --git
a/FS/FS/part_pkg/flat.pm
b/FS/FS/part_pkg/flat.pm
index
c1d1f56
..
5f5254d
100644
(file)
--- a/
FS/FS/part_pkg/flat.pm
+++ b/
FS/FS/part_pkg/flat.pm
@@
-1,14
+1,13
@@
package FS::part_pkg::flat;
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::discount_Mixin
+ FS::part_pkg
);
);
+
+use strict;
use vars qw( %info %usage_recharge_fields @usage_recharge_fieldorder );
use Tie::IxHash;
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;
use FS::UI::bytecount;
use FS::Conf;
diff --git
a/FS/FS/part_pkg/global_Mixin.pm
b/FS/FS/part_pkg/global_Mixin.pm
index
56f1602
..
ec2eb4e
100644
(file)
--- a/
FS/FS/part_pkg/global_Mixin.pm
+++ b/
FS/FS/part_pkg/global_Mixin.pm
@@
-1,9
+1,7
@@
package FS::part_pkg::global_Mixin;
use strict;
package FS::part_pkg::global_Mixin;
use strict;
-use vars qw(@ISA %info);
-use FS::part_pkg;
-@ISA = qw(FS::part_pkg);
+use vars qw(%info);
%info = (
'disabled' => 1,
%info = (
'disabled' => 1,
diff --git
a/FS/FS/part_pkg/prorate_Mixin.pm
b/FS/FS/part_pkg/prorate_Mixin.pm
index
a53728b
..
1bd4feb
100644
(file)
--- a/
FS/FS/part_pkg/prorate_Mixin.pm
+++ b/
FS/FS/part_pkg/prorate_Mixin.pm
@@
-1,10
+1,9
@@
package FS::part_pkg::prorate_Mixin;
use strict;
package FS::part_pkg::prorate_Mixin;
use strict;
-use vars qw(
@ISA %info
);
-use Time::Local qw(
timelocal
);
+use vars qw(
%info
);
+use Time::Local qw(
timelocal
);
-@ISA = qw(FS::part_pkg);
%info = (
'disabled' => 1,
);
%info = (
'disabled' => 1,
);
diff --git
a/FS/FS/part_pkg/sql_external.pm
b/FS/FS/part_pkg/sql_external.pm
index
c0c5725
..
aba7365
100644
(file)
--- a/
FS/FS/part_pkg/sql_external.pm
+++ b/
FS/FS/part_pkg/sql_external.pm
@@
-1,7
+1,7
@@
package FS::part_pkg::sql_external;
package FS::part_pkg::sql_external;
+use base qw( FS::part_pkg::discount_Mixin FS::part_pkg::recur_Common );
use strict;
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);
use vars qw( %info );
use DBI;
#use FS::Record qw(qsearch qsearchs);
diff --git
a/FS/FS/part_pkg/usage_Mixin.pm
b/FS/FS/part_pkg/usage_Mixin.pm
index
028fce7
..
edd0bf4
100644
(file)
--- a/
FS/FS/part_pkg/usage_Mixin.pm
+++ b/
FS/FS/part_pkg/usage_Mixin.pm
@@
-1,10
+1,8
@@
package FS::part_pkg::usage_Mixin;
use strict;
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;
use FS::UI::bytecount;
-@ISA = qw(FS::part_pkg);
# Field definitions for time and data usage, other than CDRs.
# Field definitions for time and data usage, other than CDRs.