projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Druck: Bei template-toolkit auch die globals setzen
[kivitendo-erp.git]
/
SL
/
IC.pm
diff --git
a/SL/IC.pm
b/SL/IC.pm
index
e25e13e
..
36520b9
100644
(file)
--- a/
SL/IC.pm
+++ b/
SL/IC.pm
@@
-1713,7
+1713,7
@@
sub prepare_parts_for_printing {
$sth->finish();
$sth->finish();
- my @columns = qw(ean image microfiche drawing
weight
);
+ my @columns = qw(ean image microfiche drawing);
$query = qq|SELECT id, | . join(', ', @columns) . qq|
FROM parts
$query = qq|SELECT id, | . join(', ', @columns) . qq|
FROM parts
@@
-1721,7
+1721,8
@@
sub prepare_parts_for_printing {
my %data = selectall_as_map($form, $dbh, $query, 'id', \@columns, @part_ids);
my %data = selectall_as_map($form, $dbh, $query, 'id', \@columns, @part_ids);
- map { $form->{TEMPLATE_ARRAYS}{$_} = [] } (qw(make model), @columns);
+ my %template_arrays;
+ map { $template_arrays{$_} = [] } (qw(make model), @columns);
foreach my $i (1 .. $rowcount) {
my $id = $form->{"${prefix}${i}"};
foreach my $i (1 .. $rowcount) {
my $id = $form->{"${prefix}${i}"};
@@
-1729,16
+1730,16
@@
sub prepare_parts_for_printing {
next if (!$id);
foreach (@columns) {
next if (!$id);
foreach (@columns) {
- push @{ $
form->{TEMPLATE_ARRAYS}
{$_} }, $data{$id}->{$_};
+ push @{ $
template_arrays
{$_} }, $data{$id}->{$_};
}
}
- push @{ $
form->{TEMPLATE_ARRAYS}
{make} }, [];
- push @{ $
form->{TEMPLATE_ARRAYS}
{model} }, [];
+ push @{ $
template_arrays
{make} }, [];
+ push @{ $
template_arrays
{model} }, [];
next if (!$makemodel{$id});
foreach my $ref (@{ $makemodel{$id} }) {
next if (!$makemodel{$id});
foreach my $ref (@{ $makemodel{$id} }) {
- map { push @{ $
form->{TEMPLATE_ARRAYS}
{$_}->[-1] }, $ref->{$_} } qw(make model);
+ map { push @{ $
template_arrays
{$_}->[-1] }, $ref->{$_} } qw(make model);
}
}
}
}
@@
-1749,9
+1750,10
@@
sub prepare_parts_for_printing {
my $id = $form->{"${prefix}${i}"};
next unless $id;
my $id = $form->{"${prefix}${i}"};
next unless $id;
- push @{ $
form->{TEMPLATE_ARRAYS}
{part_type} }, $parts_by_id{$id}->type;
+ push @{ $
template_arrays
{part_type} }, $parts_by_id{$id}->type;
}
}
+ return %template_arrays;
$main::lxdebug->leave_sub();
}
$main::lxdebug->leave_sub();
}