X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/blobdiff_plain/bf3cc4b6658497e7f7d15bbe16d1795fefb7cf05..1663badaaf6535d4d966f9d812560e41c7016a6d:/SL/DN.pm diff --git a/SL/DN.pm b/SL/DN.pm index 4f0827104..758ddf4fa 100644 --- a/SL/DN.pm +++ b/SL/DN.pm @@ -693,7 +693,8 @@ sub print_dunning { ar.transdate, ar.duedate, ar.customer_id, ar.invnumber, ar.ordnumber, ar.amount, ar.netamount, ar.paid, - ar.amount - ar.paid AS open_amount + ar.amount - ar.paid AS open_amount, + ar.amount - ar.paid + da.fee + da.interest AS linetotal FROM dunning da LEFT JOIN dunning_config dcfg ON (dcfg.id = da.dunning_config_id) @@ -707,7 +708,7 @@ sub print_dunning { map({ $form->{"dn_$_"} = []; } keys(%{$ref})); $first = 0; } - map { $ref->{$_} = $form->format_amount($myconfig, $ref->{$_}, 2) } qw(amount netamount paid open_amount fee interest); + 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; }