projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix billing error with intro rate packages when billing dates have been edited non...
[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
a89b54d
..
9e97cc5
100644
(file)
--- a/
FS/FS/part_pkg/prorate_Mixin.pm
+++ b/
FS/FS/part_pkg/prorate_Mixin.pm
@@
-108,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;
}
@@
-204,7
+205,7
@@
sub prorate_setup {
# For some reason (probably user override), the bill date has been set even
# though the package isn't billing yet. Start billing as though that was the
# start date.
# For some reason (probably user override), the bill date has been set even
# though the package isn't billing yet. Start billing as though that was the
# start date.
- $sdate = $cust_pkg->bill;
+ $
$
sdate = $cust_pkg->bill;
$cust_pkg->setup($cust_pkg->bill);
}
# Now figure the start and end of the period that contains the start date.
$cust_pkg->setup($cust_pkg->bill);
}
# Now figure the start and end of the period that contains the start date.