X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Frp.pl;h=c2dcb28542bf632f4943331709b6192b053782e0;hb=19be3a57dbffa4a66be9f1cffdf5fc2a18332567;hp=f6dc985ef86a7a47136a99526c0dbada9a8faa7d;hpb=d357e8f9832f8425821f4647b1792ddd3f4f483a;p=kivitendo-erp.git
diff --git a/bin/mozilla/rp.pl b/bin/mozilla/rp.pl
index f6dc985ef..c2dcb2854 100644
--- a/bin/mozilla/rp.pl
+++ b/bin/mozilla/rp.pl
@@ -1188,10 +1188,10 @@ sub generate_income_statement {
$longfromdate = $locale->date(\%myconfig, $form->{fromdate}, 1);
$shortfromdate = $locale->date(\%myconfig, $form->{fromdate}, 0);
- $form->{this_period} = "$shortfromdate
\n$shorttodate";
+ $form->{this_period} = "$shortfromdate\n$shorttodate";
$form->{period} =
$locale->text('for Period')
- . qq|
\n$longfromdate |
+ . qq|\n$longfromdate |
. $locale->text('Bis')
. qq| $longtodate|;
}
@@ -1205,9 +1205,9 @@ sub generate_income_statement {
$longcomparetodate = $locale->date(\%myconfig, $form->{comparetodate}, 1);
$shortcomparetodate = $locale->date(\%myconfig, $form->{comparetodate}, 0);
- $form->{last_period} = "$shortcomparefromdate
\n$shortcomparetodate";
+ $form->{last_period} = "$shortcomparefromdate\n$shortcomparetodate";
$form->{period} .=
- "
\n$longcomparefromdate "
+ "\n$longcomparefromdate "
. $locale->text('Bis')
. qq| $longcomparetodate|;
}
@@ -1215,7 +1215,6 @@ sub generate_income_statement {
# setup variables for the form
@a = qw(company address businessnumber);
map { $form->{$_} = $myconfig{$_} } @a;
- $form->{address} =~ s/\\n/
/g;
$form->{templates} = $myconfig{templates};
@@ -1256,7 +1255,6 @@ sub generate_balance_sheet {
# setup company variables for the form
map { $form->{$_} = $myconfig{$_} }
(qw(company address businessnumber nativecurr));
- $form->{address} =~ s/\\n/
/g;
$form->{templates} = $myconfig{templates};
@@ -1394,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 =
@@ -1674,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|