X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2Fdetail_format.pm;h=be84680f9c805f1079f6d5314bd0474a499da306;hb=6a7acbedcaa251d104b9cdfc3875b5e5274f8a9a;hp=b072ff58d561830759b92201f79e0b1f0edae436;hpb=c2f7d8ba623194ad1fae37b231b2e29b33d05674;p=freeside.git diff --git a/FS/FS/detail_format.pm b/FS/FS/detail_format.pm index b072ff58d..be84680f9 100644 --- a/FS/FS/detail_format.pm +++ b/FS/FS/detail_format.pm @@ -63,13 +63,13 @@ sub new { my %opt = @_; my $locale = $opt{'locale'} || ''; - my $conf = FS::Conf->new(locale => $locale); + my $conf = FS::Conf->new({ locale => $locale }); $locale ||= $conf->config('locale') || 'en_US'; my %locale_info = FS::Locales->locale_info($locale); my $language_name = $locale_info{'name'}; - my $self = { conf => FS::Conf->new(locale => $locale), + my $self = { conf => FS::Conf->new({ locale => $locale }), csv => Text::CSV_XS->new({ binary => 1 }), inbound => ($opt{'inbound'} ? 1 : 0), buffer => ($opt{'buffer'} || []), @@ -178,6 +178,7 @@ Takes a single CDR and returns an invoice detail to describe it. By default, this maps the following fields from the CDR: +acctid => acctid rated_price => amount rated_classnum => classnum rated_seconds => duration @@ -208,6 +209,7 @@ sub single_detail { $price = 0 if $cdr->freesidestatus eq 'no-charge'; FS::cust_bill_pkg_detail->new( { + 'acctid' => $cdr->acctid, 'amount' => $price, 'classnum' => $cdr->rated_classnum, 'duration' => $cdr->rated_seconds,