projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of vc.linet-services.de:public/lx-office-erp
[kivitendo-erp.git]
/
SL
/
ReportGenerator.pm
diff --git
a/SL/ReportGenerator.pm
b/SL/ReportGenerator.pm
index
3f5cdeb
..
deb4e19
100644
(file)
--- a/
SL/ReportGenerator.pm
+++ b/
SL/ReportGenerator.pm
@@
-73,6
+73,12
@@
sub set_columns {
$column->{visible} = $self->{options}->{std_column_visibility} unless defined $column->{visible};
}
$column->{visible} = $self->{options}->{std_column_visibility} unless defined $column->{visible};
}
+ if( $::form->{report_generator_csv_options_for_import} ) {
+ foreach my $key (keys %{ $self->{columns} }) {
+ $self->{columns}{$key}{text} = $key;
+ }
+ }
+
$self->set_column_order(sort keys %{ $self->{columns} });
}
$self->set_column_order(sort keys %{ $self->{columns} });
}
@@
-214,7
+220,7
@@
sub get_attachment_basename {
}
sub generate_with_headers {
}
sub generate_with_headers {
- my
$self = shift
;
+ my
($self, %params) = @_
;
my $format = lc $self->{options}->{output_format};
my $form = $self->{form};
my $format = lc $self->{options}->{output_format};
my $form = $self->{form};
@@
-225,7
+231,7
@@
sub generate_with_headers {
if ($format eq 'html') {
my $title = $form->{title};
$form->{title} = $self->{title} if ($self->{title});
if ($format eq 'html') {
my $title = $form->{title};
$form->{title} = $self->{title} if ($self->{title});
- $form->header();
+ $form->header(
no_layout => $params{no_layout}
);
$form->{title} = $title;
print $self->generate_html_content();
$form->{title} = $title;
print $self->generate_html_content();
@@
-404,7
+410,8
@@
sub generate_html_content {
my $self = shift;
my $variables = $self->prepare_html_content();
my $self = shift;
my $variables = $self->prepare_html_content();
- return $self->{form}->parse_html_template($self->{options}->{html_template}, $variables);
+ my $stuff = $self->{form}->parse_html_template($self->{options}->{html_template}, $variables);
+ return $stuff;
}
sub _cm2bp {
}
sub _cm2bp {