projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix 'Can't call method svcdb without a package or object reference' when ordering...
[freeside.git]
/
FS
/
FS
/
cust_bill.pm
diff --git
a/FS/FS/cust_bill.pm
b/FS/FS/cust_bill.pm
index
0a1577f
..
77c571b
100644
(file)
--- a/
FS/FS/cust_bill.pm
+++ b/
FS/FS/cust_bill.pm
@@
-2362,11
+2362,13
@@
unsquelch_cdr - overrides any per customer cdr squelching when true
notice_name - overrides "Invoice" as the name of the sent document (templates from 10/2009 or newer required)
notice_name - overrides "Invoice" as the name of the sent document (templates from 10/2009 or newer required)
+locale - override customer's locale
+
=cut
#what's with all the sprintf('%10.2f')'s in here? will it cause any
# (alignment in text invoice?) problems to change them all to '%.2f' ?
=cut
#what's with all the sprintf('%10.2f')'s in here? will it cause any
# (alignment in text invoice?) problems to change them all to '%.2f' ?
-# yes: fixed width
(dot matrix)
text printing will be borked
+# yes: fixed width
/plain
text printing will be borked
sub print_generic {
my( $self, %params ) = @_;
my $conf = $self->conf;
sub print_generic {
my( $self, %params ) = @_;
my $conf = $self->conf;
@@
-2655,7
+2657,7
@@
sub print_generic {
);
#localization
);
#localization
- my $lh = FS::L10N->get_handle(
$cust_main->locale
);
+ my $lh = FS::L10N->get_handle(
$params{'locale'} || $cust_main->locale
);
$invoice_data{'emt'} = sub { &$escape_function($self->mt(@_)) };
my %info = FS::Locales->locale_info($cust_main->locale || 'en_US');
# eval to avoid death for unimplemented languages
$invoice_data{'emt'} = sub { &$escape_function($self->mt(@_)) };
my %info = FS::Locales->locale_info($cust_main->locale || 'en_US');
# eval to avoid death for unimplemented languages
@@
-3032,7
+3034,7
@@
sub print_generic {
$options{'section'} = $section if $multisection;
$options{'format'} = $format;
$options{'escape_function'} = $escape_function;
$options{'section'} = $section if $multisection;
$options{'format'} = $format;
$options{'escape_function'} = $escape_function;
- $options{'
format_function'} = sub { () }
unless $unsquelched;
+ $options{'
no_usage'} = 1
unless $unsquelched;
$options{'unsquelched'} = $unsquelched;
$options{'summary_page'} = $summarypage;
$options{'skip_usage'} =
$options{'unsquelched'} = $unsquelched;
$options{'summary_page'} = $summarypage;
$options{'skip_usage'} =
@@
-4760,6
+4762,7
@@
format: the invoice format.
escape_function: the function used to escape strings.
escape_function: the function used to escape strings.
+DEPRECATED? (expensive, mostly unused?)
format_function: the function used to format CDRs.
section: a hashref containing 'description'; if this is present,
format_function: the function used to format CDRs.
section: a hashref containing 'description'; if this is present,
@@
-4788,6
+4791,7
@@
sub _items_cust_bill_pkg {
my $format = $opt{format} || '';
my $escape_function = $opt{escape_function} || sub { shift };
my $format_function = $opt{format_function} || '';
my $format = $opt{format} || '';
my $escape_function = $opt{escape_function} || sub { shift };
my $format_function = $opt{format_function} || '';
+ my $no_usage = $opt{no_usage} || '';
my $unsquelched = $opt{unsquelched} || ''; #unused
my $section = $opt{section}->{description} if $opt{section};
my $summary_page = $opt{summary_page} || ''; #unused
my $unsquelched = $opt{unsquelched} || ''; #unused
my $section = $opt{section}->{description} if $opt{section};
my $summary_page = $opt{summary_page} || ''; #unused
@@
-4844,6
+4848,7
@@
sub _items_cust_bill_pkg {
my %details_opt = ( 'format' => $format,
'escape_function' => $escape_function,
'format_function' => $format_function,
my %details_opt = ( 'format' => $format,
'escape_function' => $escape_function,
'format_function' => $format_function,
+ 'no_usage' => $opt{'no_usage'},
);
if ( $cust_bill_pkg->pkgnum > 0 ) {
);
if ( $cust_bill_pkg->pkgnum > 0 ) {
@@
-5001,7
+5006,7
@@
sub _items_cust_bill_pkg {
#instead of omitting details entirely in this case (unwanted side
# effects), just omit CDRs
#instead of omitting details entirely in this case (unwanted side
# effects), just omit CDRs
- $details_opt{'
format_function'} = sub { () }
+ $details_opt{'
no_usage'} = 1
if $type && $type eq 'R';
push @d, $cust_bill_pkg->details(%details_opt);
if $type && $type eq 'R';
push @d, $cust_bill_pkg->details(%details_opt);