projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
remove extraneous index on upgrade_journal.ugradenum
[freeside.git]
/
FS
/
FS
/
TemplateItem_Mixin.pm
diff --git
a/FS/FS/TemplateItem_Mixin.pm
b/FS/FS/TemplateItem_Mixin.pm
index
f9ab51a
..
8b0e16a
100644
(file)
--- 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 {
=cut
sub desc {
- my
$self = shift
;
+ my
( $self, $locale ) = @_
;
if ( $self->pkgnum > 0 ) {
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/;
} 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,
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",
});
}
'order_by' => "ORDER BY $order_by",
});
}