projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
agent wholesale bulk billing: option to use cost only, disabling fallback to price...
[freeside.git]
/
FS
/
FS
/
part_pkg
/
voip_inbound.pm
diff --git
a/FS/FS/part_pkg/voip_inbound.pm
b/FS/FS/part_pkg/voip_inbound.pm
index
525db80
..
052bb7f
100644
(file)
--- a/
FS/FS/part_pkg/voip_inbound.pm
+++ b/
FS/FS/part_pkg/voip_inbound.pm
@@
-167,7
+167,7
@@
tie my %granularity, 'Tie::IxHash', FS::rate_detail::granularities();
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 usage" if $str;
$str;
}
$str .= " plus usage" if $str;
$str;
}
@@
-179,7
+179,7
@@
sub calc_recur {
my $charges = 0;
$charges += $self->calc_usage(@_);
my $charges = 0;
$charges += $self->calc_usage(@_);
- $charges += $self->calc_recur_Common(@_);
+ $charges +=
($cust_pkg->quantity || 1) *
$self->calc_recur_Common(@_);
$charges;
$charges;
@@
-218,7
+218,11
@@
sub calc_usage {
my $output_format = $self->option('output_format', 1) || 'default';
my $formatter =
my $output_format = $self->option('output_format', 1) || 'default';
my $formatter =
- FS::detail_format->new($output_format, buffer => $details, inbound => 1);
+ FS::detail_format->new($output_format,
+ buffer => $details,
+ inbound => 1,
+ locale => $cust_pkg->cust_main->locale
+ );
my $granularity = length($self->option('sec_granularity'))
? $self->option('sec_granularity')
my $granularity = length($self->option('sec_granularity'))
? $self->option('sec_granularity')
@@
-399,6
+403,7
@@
sub is_free {
# This equates svc_phone records; perhaps svc_phone should have a field
# to indicate it represents a line
# This equates svc_phone records; perhaps svc_phone should have a field
# to indicate it represents a line
+# #XXX no count_available_phones?
sub calc_units {
my($self, $cust_pkg ) = @_;
my $count =
sub calc_units {
my($self, $cust_pkg ) = @_;
my $count =