X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=bin%2Fmozilla%2Fca.pl;h=e499abe701c6b80319afac572576a8d3130d80bf;hb=eaf4d4830c5b449170dbef0d0ad5f88863f1e8bd;hp=56ae60813eb00aa44f7a87947ebfef68d33b7788;hpb=ee072e4f077213bf6f8792ca8f0a1afebbb6282f;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 {
"
$ca->{gifi_accno} | ";
$column_data{description} = "$ca->{description} | ";
}
-
+ my $debit = "";
+ my $credit = "";
+ if ($ca->{debit}) {
+ $debit = $form->format_amount(\%myconfig, $ca->{debit}, 2, " ");
+ }
+ if ($ca->{credit}) {
+ $credit = $form->format_amount(\%myconfig, $ca->{credit}, 2, " ");
+ }
$column_data{debit} =
""
- . $form->format_amount(\%myconfig, $ca->{debit}, 2, " ")
+ . $debit
. " | \n";
$column_data{credit} =
""
- . $form->format_amount(\%myconfig, $ca->{credit}, 2, " ")
+ . $credit
. " | \n";
$totaldebit += $ca->{debit};
@@ -235,8 +242,7 @@ sub list {
| . $locale->text('Include in Report') . qq| |
|
- . $locale->text('Subtotal')
- . qq| |
+ . $locale->text('Subtotal') . qq|
@@ -407,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} =