projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git.freeside.biz:/home/git/freeside
[freeside.git]
/
FS
/
FS
/
part_pkg
/
prorate_Mixin.pm
diff --git
a/FS/FS/part_pkg/prorate_Mixin.pm
b/FS/FS/part_pkg/prorate_Mixin.pm
index
beae6d8
..
1a7b1ef
100644
(file)
--- a/
FS/FS/part_pkg/prorate_Mixin.pm
+++ b/
FS/FS/part_pkg/prorate_Mixin.pm
@@
-2,6
+2,7
@@
package FS::part_pkg::prorate_Mixin;
use strict;
use vars qw( %info );
use strict;
use vars qw( %info );
+use Tie::IxHash;
use Time::Local qw( timelocal timelocal_nocheck );
use Date::Format qw( time2str );
use List::Util qw( min );
use Time::Local qw( timelocal timelocal_nocheck );
use Date::Format qw( time2str );
use List::Util qw( min );
@@
-107,7
+108,8
@@
sub calc_prorate {
)
{
#warn "[calc_prorate] #".$cust_pkg->pkgnum.": running deferred setup\n";
)
{
#warn "[calc_prorate] #".$cust_pkg->pkgnum.": running deferred setup\n";
- $param->{'setup_fee'} = $self->calc_setup($cust_pkg, $$sdate, $details);
+ $param->{'setup_fee'} = $self->calc_setup($cust_pkg, $$sdate, $details)
+ unless $cust_pkg->{'Hash'}->{'waive_setup'};
$mnow = $cust_pkg->setup;
$add_period = 1;
}
$mnow = $cust_pkg->setup;
$add_period = 1;
}