projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
make sure not to pull up anything per-service / finish optimizing bulk service view...
[freeside.git]
/
FS
/
FS
/
part_pkg
/
prorate.pm
diff --git
a/FS/FS/part_pkg/prorate.pm
b/FS/FS/part_pkg/prorate.pm
index
f6f2abd
..
320fdb6
100644
(file)
--- a/
FS/FS/part_pkg/prorate.pm
+++ b/
FS/FS/part_pkg/prorate.pm
@@
-24,8
+24,8
@@
use FS::part_pkg::flat;
'type' => 'checkbox',
},
'prorate_round_day'=> {
'type' => 'checkbox',
},
'prorate_round_day'=> {
- 'name' => '
When prorating first month, round to
'.
- '
the nearest
full day',
+ 'name' => '
Round the prorated period to the nearest
'.
+ 'full day',
'type' => 'checkbox',
},
'prorate_defer_bill'=> {
'type' => 'checkbox',
},
'prorate_defer_bill'=> {
@@
-38,14
+38,14
@@
use FS::part_pkg::flat;
'weight' => 20,
);
'weight' => 20,
);
-sub c
utoff_day
{
+sub c
alc_recur
{
my $self = shift;
my $self = shift;
-
$self->option('cutoff_day', 1) || 1
;
+
return $self->calc_prorate(@_, $self->cutoff_day) - $self->calc_discount(@_)
;
}
}
-sub c
alc_recur
{
+sub c
utoff_day
{
my $self = shift;
my $self = shift;
-
return $self->calc_prorate(@_) - $self->calc_discount(@_)
;
+
$self->option('cutoff_day', 1) || 1
;
}
1;
}
1;