projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert "Merge branch 'rt_28256'"
[freeside.git]
/
FS
/
FS
/
part_pkg
/
sql_external.pm
diff --git
a/FS/FS/part_pkg/sql_external.pm
b/FS/FS/part_pkg/sql_external.pm
index
08142b0
..
be36c11
100644
(file)
--- a/
FS/FS/part_pkg/sql_external.pm
+++ b/
FS/FS/part_pkg/sql_external.pm
@@
-1,7
+1,7
@@
package FS::part_pkg::sql_external;
package FS::part_pkg::sql_external;
+use base qw( FS::part_pkg::discount_Mixin FS::part_pkg::recur_Common );
use strict;
use strict;
-use base qw( FS::part_pkg::recur_Common FS::part_pkg::discount_Mixin );
use vars qw( %info );
use DBI;
#use FS::Record qw(qsearch qsearchs);
use vars qw( %info );
use DBI;
#use FS::Record qw(qsearch qsearchs);
@@
-44,7
+44,7
@@
use DBI;
sub price_info {
my $self = shift;
sub price_info {
my $self = shift;
- my $str = $self->SUPER::price_info;
+ my $str = $self->SUPER::price_info
(@_)
;
$str .= " plus per-service charges" if $str;
$str;
}
$str .= " plus per-service charges" if $str;
$str;
}
@@
-71,7
+71,7
@@
sub calc_recur {
}
$param->{'override_charges'} = $price;
}
$param->{'override_charges'} = $price;
- $self->calc_recur_Common($cust_pkg,$sdate,$details,$param);
+
($cust_pkg->quantity || 1) *
$self->calc_recur_Common($cust_pkg,$sdate,$details,$param);
}
sub can_discount { 1; }
}
sub can_discount { 1; }