projects
/
freeside.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
dcd804c
)
fix regression caused by RT10481 in sql_external, RT11536
author
levinse
<levinse>
Wed, 9 Feb 2011 05:22:20 +0000
(
05:22
+0000)
committer
levinse
<levinse>
Wed, 9 Feb 2011 05:22:20 +0000
(
05:22
+0000)
FS/FS/part_pkg/recur_Common.pm
patch
|
blob
|
history
diff --git
a/FS/FS/part_pkg/recur_Common.pm
b/FS/FS/part_pkg/recur_Common.pm
index
95ae0d0
..
05e1efb
100644
(file)
--- a/
FS/FS/part_pkg/recur_Common.pm
+++ b/
FS/FS/part_pkg/recur_Common.pm
@@
-37,6
+37,7
@@
sub calc_recur_Common {
if ( $recur_method eq 'prorate' ) {
my $cutoff_day = $self->option('cutoff_day') || 1;
$charges = $self->calc_prorate(@_, $cutoff_day);
if ( $recur_method eq 'prorate' ) {
my $cutoff_day = $self->option('cutoff_day') || 1;
$charges = $self->calc_prorate(@_, $cutoff_day);
+ $charges += $param->{'override_charges'} if $param->{'override_charges'};
}
elsif ( $recur_method eq 'anniversary' and
$self->option('sync_bill_date',1) ) {
}
elsif ( $recur_method eq 'anniversary' and
$self->option('sync_bill_date',1) ) {
@@
-44,6
+45,7
@@
sub calc_recur_Common {
if ( defined($next_bill) ) {
my $cutoff_day = (localtime($next_bill))[3];
$charges = $self->calc_prorate(@_, $cutoff_day);
if ( defined($next_bill) ) {
my $cutoff_day = (localtime($next_bill))[3];
$charges = $self->calc_prorate(@_, $cutoff_day);
+ $charges += $param->{'override_charges'} if $param->{'override_charges'};
}
}
elsif ( $recur_method eq 'subscription' ) {
}
}
elsif ( $recur_method eq 'subscription' ) {