projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix next-bill-ignore-time, RT#24318, RT#24476, RT#12570
[freeside.git]
/
FS
/
FS
/
cust_main
/
Billing.pm
diff --git
a/FS/FS/cust_main/Billing.pm
b/FS/FS/cust_main/Billing.pm
index
8f7038f
..
608dbe1
100644
(file)
--- a/
FS/FS/cust_main/Billing.pm
+++ b/
FS/FS/cust_main/Billing.pm
@@
-356,6
+356,11
@@
sub bill {
my $time = $options{'time'} || time;
my $invoice_time = $options{'invoice_time'} || $time;
my $time = $options{'time'} || time;
my $invoice_time = $options{'invoice_time'} || $time;
+ my $cmp_time = ( $conf->exists('next-bill-ignore-time')
+ ? day_end( $time )
+ : $time
+ );
+
$options{'not_pkgpart'} ||= {};
$options{'not_pkgpart'} = { map { $_ => 1 }
split(/\s*,\s*/, $options{'not_pkgpart'})
$options{'not_pkgpart'} ||= {};
$options{'not_pkgpart'} = { map { $_ => 1 }
split(/\s*,\s*/, $options{'not_pkgpart'})
@@
-443,7
+448,7
@@
sub bill {
my $next_bill = $cust_pkg->getfield('bill') || 0;
my $error;
my $next_bill = $cust_pkg->getfield('bill') || 0;
my $error;
- while ( $next_bill <= $time ) {
+ while ( $next_bill <= $
cmp_
time ) {
$error =
$self->_make_lines( 'part_pkg' => $part_pkg,
'cust_pkg' => $cust_pkg,
$error =
$self->_make_lines( 'part_pkg' => $part_pkg,
'cust_pkg' => $cust_pkg,
@@
-1160,6
+1165,10
@@
sub _make_lines {
return $error if $error;
}
return $error if $error;
}
+ $cust_bill_pkg->set_display( part_pkg => $part_pkg,
+ real_pkgpart => $real_pkgpart,
+ );
+
push @$cust_bill_pkgs, $cust_bill_pkg;
} #if $setup != 0 || $recur != 0
push @$cust_bill_pkgs, $cust_bill_pkg;
} #if $setup != 0 || $recur != 0
@@
-1225,6
+1234,8
@@
sub _handle_taxes {
? 'ship_'
: '';
%taxhash = map { $_ => $self->get("$prefix$_") } @loc_keys;
? 'ship_'
: '';
%taxhash = map { $_ => $self->get("$prefix$_") } @loc_keys;
+ # special case--there's no 'ship_district' field
+ $taxhash{'district'} = $self->get('district');
}
$taxhash{'taxclass'} = $part_pkg->taxclass;
}
$taxhash{'taxclass'} = $part_pkg->taxclass;
@@
-1275,12
+1286,6
@@
sub _handle_taxes {
}
}
- #what's this doing in the middle of _handle_taxes? probably should split
- #this into three parts above in _make_lines
- $cust_bill_pkg->set_display( part_pkg => $part_pkg,
- real_pkgpart => $real_pkgpart,
- );
-
my %tax_cust_bill_pkg = $cust_bill_pkg->disintegrate;
foreach my $key (keys %tax_cust_bill_pkg) {
my @taxes = @{ $taxes{$key} || [] };
my %tax_cust_bill_pkg = $cust_bill_pkg->disintegrate;
foreach my $key (keys %tax_cust_bill_pkg) {
my @taxes = @{ $taxes{$key} || [] };