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:
742caf9
)
fix invoicing prorate packages when bill date is edited manually before first billing...
author
Ivan Kohler
<ivan@freeside.biz>
Fri, 26 Jul 2019 18:39:54 +0000
(11:39 -0700)
committer
Ivan Kohler
<ivan@freeside.biz>
Fri, 26 Jul 2019 18:39:54 +0000
(11:39 -0700)
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
af0181a
..
2b4b597
100644
(file)
--- a/
FS/FS/part_pkg/prorate_Mixin.pm
+++ b/
FS/FS/part_pkg/prorate_Mixin.pm
@@
-189,8
+189,7
@@
set, in which case it postpones the next bill to the cutoff day.
=cut
sub prorate_setup {
=cut
sub prorate_setup {
- my $self = shift;
- my ($cust_pkg, $sdate) = @_;
+ my ($self, $cust_pkg, $time) = @_;
my @cutoff_days = $self->cutoff_day($cust_pkg);
if ( @cutoff_days and $self->option('prorate_defer_bill', 1) ) {
if ( $cust_pkg->setup ) {
my @cutoff_days = $self->cutoff_day($cust_pkg);
if ( @cutoff_days and $self->option('prorate_defer_bill', 1) ) {
if ( $cust_pkg->setup ) {
@@
-204,11
+203,11
@@
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.
- $
$sdat
e = $cust_pkg->bill;
+ $
tim
e = $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.
- my ($mnow, $mend, $mstart) = $self->_endpoints($
sdat
e, @cutoff_days);
+ my ($mnow, $mend, $mstart) = $self->_endpoints($
tim
e, @cutoff_days);
# If today is the cutoff day, set the next bill and setup both to
# midnight today, so that the customer will be billed normally for a
# month starting today.
# If today is the cutoff day, set the next bill and setup both to
# midnight today, so that the customer will be billed normally for a
# month starting today.