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
/
cust_main
/
Billing.pm
diff --git
a/FS/FS/cust_main/Billing.pm
b/FS/FS/cust_main/Billing.pm
index
08b10c1
..
a5a38fd
100644
(file)
--- a/
FS/FS/cust_main/Billing.pm
+++ b/
FS/FS/cust_main/Billing.pm
@@
-1027,10
+1027,10
@@
sub _make_lines {
|| $cust_pkg->expire > $cmp_time )
)
{
|| $cust_pkg->expire > $cmp_time )
)
{
-
+
warn " bill setup\n" if $DEBUG > 1;
warn " bill setup\n" if $DEBUG > 1;
- unless (
$cust_pkg->waive_setup
) {
+ unless (
$cust_pkg->waive_setup
) {
$lineitems++;
$setup = eval { $cust_pkg->calc_setup( $time, \@details, \%setup_param ) };
$lineitems++;
$setup = eval { $cust_pkg->calc_setup( $time, \@details, \%setup_param ) };
@@
-1052,6
+1052,11
@@
sub _make_lines {
}
}
}
}
+ if ($cust_pkg->waive_setup && $part_pkg->plan eq "prorate") {
+ $lineitems++;
+ $setup = 0 if $part_pkg->prorate_setup($cust_pkg, $time);
+ }
+
if ( $cust_pkg->get('setup') ) {
# don't change it
} elsif ( $cust_pkg->get('start_date') ) {
if ( $cust_pkg->get('setup') ) {
# don't change it
} elsif ( $cust_pkg->get('start_date') ) {