X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/blobdiff_plain/87e190b46ddee16b2cf7a2e52e1bbc8555a41f8e..06211d74ea81c20cd935a9f35df45a6f76590692:/SL/DN.pm?ds=inline diff --git a/SL/DN.pm b/SL/DN.pm index 9702e4cf6..648645591 100644 --- a/SL/DN.pm +++ b/SL/DN.pm @@ -714,12 +714,13 @@ sub print_dunning { my $first = 1; while (my $ref = $sth->fetchrow_hashref(NAME_lc)) { if ($first) { - map({ $form->{"dn_$_"} = []; } keys(%{$ref})); + $form->{TEMPLATE_ARRAYS} = {}; + map({ $form->{TEMPLATE_ARRAYS}->{"dn_$_"} = []; } keys(%{$ref})); $first = 0; } map { $ref->{$_} = $form->format_amount($myconfig, $ref->{$_}, 2) } qw(amount netamount paid open_amount fee interest linetotal); map { $form->{$_} = $ref->{$_} } keys %$ref; - map { push @{ $form->{"dn_$_"} }, $ref->{$_}} keys %$ref; + map { push @{ $form->{TEMPLATE_ARRAYS}->{"dn_$_"} }, $ref->{$_} } keys %$ref; } $sth->finish(); @@ -837,7 +838,7 @@ sub print_invoice_for_fees { $ref = selectfirst_hashref_query($form, $dbh, $query, $form->{login}); map { $form->{"employee_${_}"} = $ref->{$_} } keys %{ $ref }; - $query = qq|SELECT * FROM acc_trans WHERE trans_id = ? ORDER BY oid ASC|; + $query = qq|SELECT * FROM acc_trans WHERE trans_id = ? ORDER BY acc_trans_id ASC|; $sth = prepare_execute_query($form, $dbh, $query, $ar_id); my ($row, $fee, $interest) = (0, 0, 0);