projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git.freeside.biz:/home/git/freeside
[freeside.git]
/
FS
/
FS
/
TemplateItem_Mixin.pm
diff --git
a/FS/FS/TemplateItem_Mixin.pm
b/FS/FS/TemplateItem_Mixin.pm
index
6d7ea26
..
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/;
@@
-271,10
+271,12
@@
sub cust_bill_pkg_display {
} else {
my $hashref = { 'billpkgnum' => $self->billpkgnum };
$hashref->{type} = $type if defined($type);
} else {
my $hashref = { 'billpkgnum' => $self->billpkgnum };
$hashref->{type} = $type if defined($type);
+
+ my $order_by = $self->display_table_orderby || 'billpkgdisplaynum';
@result = qsearch ({ 'table' => $self->display_table,
@result = qsearch ({ 'table' => $self->display_table,
- 'hashref' =>
{ 'billpkgnum' => $self->billpkgnum }
,
- 'order_by' =>
'ORDER BY billpkgdisplaynum'
,
+ 'hashref' =>
$hashref
,
+ 'order_by' =>
"ORDER BY $order_by"
,
});
}
});
}