X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fca.pl;h=e499abe701c6b80319afac572576a8d3130d80bf;hb=15f549fdb43fba2d99817c659533dfa02638bf27;hp=56ae60813eb00aa44f7a87947ebfef68d33b7788;hpb=0576299f2aa98125991c4ffcd2f75073ea583d7d;p=kivitendo-erp.git

diff --git a/bin/mozilla/ca.pl b/bin/mozilla/ca.pl
index 56ae60813..e499abe70 100644
--- a/bin/mozilla/ca.pl
+++ b/bin/mozilla/ca.pl
@@ -125,14 +125,21 @@ sub chart_of_accounts {
         "<td><a href=$href&accounttype=gifi>$ca->{gifi_accno}</a>&nbsp;</td>";
       $column_data{description} = "<td>$ca->{description}</td>";
     }
-
+    my $debit = "";
+    my $credit = "";
+    if ($ca->{debit}) {
+      $debit = $form->format_amount(\%myconfig, $ca->{debit}, 2, "&nbsp;");
+    }
+    if ($ca->{credit}) {
+      $credit = $form->format_amount(\%myconfig, $ca->{credit}, 2, "&nbsp;");
+    }
     $column_data{debit} =
         "<td align=right>"
-      . $form->format_amount(\%myconfig, $ca->{debit}, 2, "&nbsp;")
+      . $debit
       . "</td>\n";
     $column_data{credit} =
         "<td align=right>"
-      . $form->format_amount(\%myconfig, $ca->{credit}, 2, "&nbsp;")
+      . $credit
       . "</td>\n";
 
     $totaldebit  += $ca->{debit};
@@ -235,8 +242,7 @@ sub list {
 	  <th align=right>| . $locale->text('Include in Report') . qq|</th>
 	  <td colspan=3>
 	  <input name=l_subtotal class=checkbox type=checkbox value=Y>&nbsp;|
-    . $locale->text('Subtotal')
-    . qq|</td>
+    . $locale->text('Subtotal') . qq|</td>
 	</tr>
       </table>
     </td>
@@ -407,13 +413,12 @@ sub list_transactions {
     # construct link to source
     $href =
       "<a href=$ca->{module}.pl?path=$form->{path}&action=edit&id=$ca->{id}&login=$form->{login}&password=$form->{password}&callback=$callback>$ca->{reference}</a>";
-
+    my $debit = ($ca->{debit} != 0) ? $form->format_amount(\%myconfig, $ca->{debit}, 2, "&nbsp;") : "&nbsp;";
     $column_data{debit} =
-      "<td align=right>"
-      . $form->format_amount(\%myconfig, $ca->{debit}, 2, "&nbsp;") . "</td>";
+      "<td align=right>$debit</td>";
+    my $credit = ($ca->{credit} != 0) ? $form->format_amount(\%myconfig, $ca->{credit}, 2, "&nbsp;") : "&nbsp;";
     $column_data{credit} =
-      "<td align=right>"
-      . $form->format_amount(\%myconfig, $ca->{credit}, 2, "&nbsp;") . "</td>";
+      "<td align=right>$credit</td>";
 
     $form->{balance} += $ca->{amount};
     $column_data{balance} =