projects
/
kivitendo-erp.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
c23b106
)
Lieferschein: Ausdruck mit Gruppierung repariert.
author
Bernd Bleßmann
<bernd@kivitendo-premium.de>
Thu, 22 Jan 2015 14:22:58 +0000
(15:22 +0100)
committer
Bernd Bleßmann
<bernd@kivitendo-premium.de>
Thu, 22 Jan 2015 14:22:58 +0000
(15:22 +0100)
behebt #26.
SL/DO.pm
patch
|
blob
|
history
diff --git
a/SL/DO.pm
b/SL/DO.pm
index
584ad59
..
8fad24c
100644
(file)
--- a/
SL/DO.pm
+++ b/
SL/DO.pm
@@
-898,10
+898,12
@@
sub order_details {
next if (!$form->{"id_$i"});
if ($item->[1] ne $sameitem) {
next if (!$form->{"id_$i"});
if ($item->[1] ne $sameitem) {
- push(@{ $form->{description} }, qq|$item->[1]|);
+ push(@{ $form->{
TEMPLATE_ARRAYS}->{
description} }, qq|$item->[1]|);
$sameitem = $item->[1];
$sameitem = $item->[1];
- map({ push(@{ $form->{$_} }, "") } grep({ $_ ne "description" } @arrays));
+ map({ push(@{ $form->{TEMPLATE_ARRAYS}->{$_} }, "") } grep({ $_ ne "description" && $_ !~ /^si_/} @arrays));
+ map({ push(@{ $form->{TEMPLATE_ARRAYS}->{$_} }, []) } grep({ $_ =~ /^si_/} @arrays));
+ $si_position++;
}
$form->{"qty_$i"} = $form->parse_amount($myconfig, $form->{"qty_$i"});
}
$form->{"qty_$i"} = $form->parse_amount($myconfig, $form->{"qty_$i"});