projects
/
freeside.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
074464a
)
adjust prorate_defer_bill, #16057
author
mark
<mark>
Sat, 14 Jan 2012 23:02:42 +0000
(23:02 +0000)
committer
mark
<mark>
Sat, 14 Jan 2012 23:02:42 +0000
(23:02 +0000)
FS/FS/part_pkg/prorate_Mixin.pm
patch
|
blob
|
history
diff --git
a/FS/FS/part_pkg/prorate_Mixin.pm
b/FS/FS/part_pkg/prorate_Mixin.pm
index
33879d9
..
63b63d7
100644
(file)
--- a/
FS/FS/part_pkg/prorate_Mixin.pm
+++ b/
FS/FS/part_pkg/prorate_Mixin.pm
@@
-75,11
+75,14
@@
sub calc_prorate {
my $charge = $self->base_recur($cust_pkg, $sdate) || 0;
my $charge = $self->base_recur($cust_pkg, $sdate) || 0;
+ my $add_period = $self->option('add_full_period',1);
+
my $mnow = $$sdate;
# if this is the first bill but the bill date has been set
# (by prorate_defer_bill), calculate from the setup date,
my $mnow = $$sdate;
# if this is the first bill but the bill date has been set
# (by prorate_defer_bill), calculate from the setup date,
- # and append the setup fee to @$details.
+ # append the setup fee to @$details, and make sure to bill for
+ # a full period after the bill date.
if ( $self->option('prorate_defer_bill',1)
&& ! $cust_pkg->getfield('last_bill')
&& $cust_pkg->setup
if ( $self->option('prorate_defer_bill',1)
&& ! $cust_pkg->getfield('last_bill')
&& $cust_pkg->setup
@@
-88,6
+91,7
@@
sub calc_prorate {
#warn "[calc_prorate] #".$cust_pkg->pkgnum.": running deferred setup\n";
$param->{'setup_fee'} = $self->calc_setup($cust_pkg, $$sdate, $details);
$mnow = $cust_pkg->setup;
#warn "[calc_prorate] #".$cust_pkg->pkgnum.": running deferred setup\n";
$param->{'setup_fee'} = $self->calc_setup($cust_pkg, $$sdate, $details);
$mnow = $cust_pkg->setup;
+ $add_period = 1;
}
my ($mend, $mstart);
}
my ($mend, $mstart);
@@
-103,12
+107,8
@@
sub calc_prorate {
# or periods up to freq_override if billing for an override interval
if ( ($param->{'freq_override'} || 0) > 1 ) {
$months += $param->{'freq_override'} - 1;
# or periods up to freq_override if billing for an override interval
if ( ($param->{'freq_override'} || 0) > 1 ) {
$months += $param->{'freq_override'} - 1;
- } elsif ( ( $self->option('add_full_period',1)
- || $self->option('prorate_defer_bill',1) # necessary
- )
- && $months < $self->freq
- )
- {
+ }
+ elsif ( $add_period && $months < $self->freq) {
$months += $self->freq;
$$sdate = $self->add_freq($mstart);
}
$months += $self->freq;
$$sdate = $self->add_freq($mstart);
}