X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2FTemplateItem_Mixin.pm;h=8b0e16a2d12d5977ec74a5a2c1847e2726a9b447;hb=517ad7e0c5bd5a6329dfd3ef9c35f69afea9fc49;hp=f9ab51af6c5653a74a7cbc86b0e56038f3456366;hpb=a2ff7564f36a5db81bdba053ff70017b8f438904;p=freeside.git diff --git a/FS/FS/TemplateItem_Mixin.pm b/FS/FS/TemplateItem_Mixin.pm index f9ab51af6..8b0e16a2d 100644 --- a/FS/FS/TemplateItem_Mixin.pm +++ b/FS/FS/TemplateItem_Mixin.pm @@ -52,10 +52,10 @@ line item, and for generic taxes, simply returns "Tax". =cut sub desc { - my $self = shift; + my( $self, $locale ) = @_; if ( $self->pkgnum > 0 ) { - $self->itemdesc || $self->part_pkg->pkg; + $self->itemdesc || $self->part_pkg->pkg_locale($locale); } else { my $desc = $self->itemdesc || 'Tax'; $desc .= ' '. $self->itemcomment if $self->itemcomment =~ /\S/; @@ -275,7 +275,7 @@ sub cust_bill_pkg_display { my $order_by = $self->display_table_orderby || 'billpkgdisplaynum'; @result = qsearch ({ 'table' => $self->display_table, - 'hashref' => { 'billpkgnum' => $self->billpkgnum }, + 'hashref' => $hashref, 'order_by' => "ORDER BY $order_by", }); }