From f46f64806e39e562d4e3577bac98e07c298754a4 Mon Sep 17 00:00:00 2001 From: Philip Reetz Date: Thu, 4 Jan 2007 11:27:21 +0000 Subject: [PATCH] Formatierungen in der Kontenliste, Summensaldenliste und AR und AP Aging geaendert, wenn Nullwerte --- bin/mozilla/ca.pl | 9 ++++----- bin/mozilla/rp.pl | 28 ++++++++++++++-------------- 2 files changed, 18 insertions(+), 19 deletions(-) diff --git a/bin/mozilla/ca.pl b/bin/mozilla/ca.pl index 45c8cc755..e499abe70 100644 --- a/bin/mozilla/ca.pl +++ b/bin/mozilla/ca.pl @@ -413,13 +413,12 @@ sub list_transactions { # construct link to source $href = "{module}.pl?path=$form->{path}&action=edit&id=$ca->{id}&login=$form->{login}&password=$form->{password}&callback=$callback>$ca->{reference}"; - + my $debit = ($ca->{debit} != 0) ? $form->format_amount(\%myconfig, $ca->{debit}, 2, " ") : " "; $column_data{debit} = - "" - . $form->format_amount(\%myconfig, $ca->{debit}, 2, " ") . ""; + "$debit"; + my $credit = ($ca->{credit} != 0) ? $form->format_amount(\%myconfig, $ca->{credit}, 2, " ") : " "; $column_data{credit} = - "" - . $form->format_amount(\%myconfig, $ca->{credit}, 2, " ") . ""; + "$credit"; $form->{balance} += $ca->{amount}; $column_data{balance} = diff --git a/bin/mozilla/rp.pl b/bin/mozilla/rp.pl index 9e3bc9fc9..cf5bad33a 100644 --- a/bin/mozilla/rp.pl +++ b/bin/mozilla/rp.pl @@ -1392,8 +1392,8 @@ sub list_accounts { $ml = ($ref->{category} =~ /(A|C|E)/) ? -1 : 1; - $debit = $form->format_amount(\%myconfig, $ref->{debit}, 2, " "); - $credit = $form->format_amount(\%myconfig, $ref->{credit}, 2, " "); + $debit = ($ref->{debit} != 0) ? $form->format_amount(\%myconfig, $ref->{debit}, 2, " ") : " "; + $credit = ($ref->{credit} != 0) ? $form->format_amount(\%myconfig, $ref->{credit}, 2, " ") : " "; $begbalance = $form->format_amount(\%myconfig, $ref->{balance} * $ml, 2, " "); $endbalance = @@ -1672,14 +1672,14 @@ sub aging { $i++; if ($subtotal) { - $c0subtotal = - $form->format_amount(\%myconfig, $c0subtotal, 2, " "); - $c30subtotal = - $form->format_amount(\%myconfig, $c30subtotal, 2, " "); - $c60subtotal = - $form->format_amount(\%myconfig, $c60subtotal, 2, " "); - $c90subtotal = - $form->format_amount(\%myconfig, $c90subtotal, 2, " "); + $c0subtotal = ($c0subtotal != 0) ? + $form->format_amount(\%myconfig, $c0subtotal, 2, " ") : ""; + $c30subtotal = ($c30subtotal != 0) ? + $form->format_amount(\%myconfig, $c30subtotal, 2, " ") : ""; + $c60subtotal = ($c60subtotal != 0) ? + $form->format_amount(\%myconfig, $c60subtotal, 2, " ") : ""; + $c90subtotal = ($c90subtotal != 0) ? + $form->format_amount(\%myconfig, $c90subtotal, 2, " ") : ""; } $column_data{ct} = qq| |; @@ -1735,10 +1735,10 @@ sub aging { $c60total += $ref->{c60}; $c90total += $ref->{c90}; - $ref->{c0} = $form->format_amount(\%myconfig, $ref->{c0}, 2, " "); - $ref->{c30} = $form->format_amount(\%myconfig, $ref->{c30}, 2, " "); - $ref->{c60} = $form->format_amount(\%myconfig, $ref->{c60}, 2, " "); - $ref->{c90} = $form->format_amount(\%myconfig, $ref->{c90}, 2, " "); + $ref->{c0} = ($ref->{c0} != 0) ? $form->format_amount(\%myconfig, $ref->{c0}, 2, " ") : ""; + $ref->{c30} = ($ref->{c30} != 0) ? $form->format_amount(\%myconfig, $ref->{c30}, 2, " ") : ""; + $ref->{c60} = ($ref->{c60} != 0) ? $form->format_amount(\%myconfig, $ref->{c60}, 2, " ") : ""; + $ref->{c90} = ($ref->{c90} != 0) ? $form->format_amount(\%myconfig, $ref->{c90}, 2, " ") : ""; $href = qq|$ref->{module}.pl?path=$form->{path}&action=edit&id=$ref->{id}&login=$form->{login}&password=$form->{password}&callback=| -- 2.20.1