projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rechnungsfunktionen gehören natürlich nach IS und nicht nach IC.
[kivitendo-erp.git]
/
bin
/
mozilla
/
ca.pl
diff --git
a/bin/mozilla/ca.pl
b/bin/mozilla/ca.pl
index
de36049
..
e499abe
100644
(file)
--- 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> </td>";
$column_data{description} = "<td>$ca->{description}</td>";
}
"<td><a href=$href&accounttype=gifi>$ca->{gifi_accno}</a> </td>";
$column_data{description} = "<td>$ca->{description}</td>";
}
-
+ 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} =
"<td align=right>"
$column_data{debit} =
"<td align=right>"
- . $
form->format_amount(\%myconfig, $ca->{debit}, 2, " ")
+ . $
debit
. "</td>\n";
$column_data{credit} =
"<td align=right>"
. "</td>\n";
$column_data{credit} =
"<td align=right>"
- . $
form->format_amount(\%myconfig, $ca->{credit}, 2, " ")
+ . $
credit
. "</td>\n";
$totaldebit += $ca->{debit};
. "</td>\n";
$totaldebit += $ca->{debit};
@@
-406,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>";
# 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, " ") : " ";
$column_data{debit} =
$column_data{debit} =
- "<td align=right>
"
-
. $form->format_amount(\%myconfig, $ca->{debit}, 2, " ") . "</td>
";
+ "<td align=right>
$debit</td>";
+
my $credit = ($ca->{credit} != 0) ? $form->format_amount(\%myconfig, $ca->{credit}, 2, " ") : "
";
$column_data{credit} =
$column_data{credit} =
- "<td align=right>"
- . $form->format_amount(\%myconfig, $ca->{credit}, 2, " ") . "</td>";
+ "<td align=right>$credit</td>";
$form->{balance} += $ca->{amount};
$column_data{balance} =
$form->{balance} += $ca->{amount};
$column_data{balance} =