projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'patch-6' of https://github.com/gjones2/Freeside (#13854 as this bug...
[freeside.git]
/
FS
/
FS
/
access_user.pm
diff --git
a/FS/FS/access_user.pm
b/FS/FS/access_user.pm
index
4d72c2e
..
509cc09
100644
(file)
--- a/
FS/FS/access_user.pm
+++ b/
FS/FS/access_user.pm
@@
-511,14
+511,16
@@
sub default_customer_view {
}
}
-=item spreadsheet_format
+=item spreadsheet_format
[ OVERRIDE ]
Returns a hashref of this user's Excel spreadsheet download settings:
'extension' (xls or xlsx), 'class' (Spreadsheet::WriteExcel or
Returns a hashref of this user's Excel spreadsheet download settings:
'extension' (xls or xlsx), 'class' (Spreadsheet::WriteExcel or
-Excel::Writer::XLSX), and 'mime_type'.
+Excel::Writer::XLSX), and 'mime_type'. If OVERRIDE is 'XLS' or 'XLSX',
+use that instead of the user's setting.
=cut
=cut
+# is there a better place to put this?
my %formats = (
XLS => {
extension => '.xls',
my %formats = (
XLS => {
extension => '.xls',
@@
-535,10
+537,12
@@
my %formats = (
sub spreadsheet_format {
my $self = shift;
sub spreadsheet_format {
my $self = shift;
+ my $override = shift;
- my $f = $self->option('spreadsheet_format')
- || $conf->config('spreadsheet_format')
- || 'XLS';
+ my $f = $override
+ || $self->option('spreadsheet_format')
+ || $conf->config('spreadsheet_format')
+ || 'XLS';
$formats{$f};
}
$formats{$f};
}