X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Frp.pl;h=9e3bc9fc9a670d9f9da524a562a7724b48bf1e67;hb=232ccb5f2622a7ecc4cfa40031aba17d7717957a;hp=f6dc985ef86a7a47136a99526c0dbada9a8faa7d;hpb=d357e8f9832f8425821f4647b1792ddd3f4f483a;p=kivitendo-erp.git
diff --git a/bin/mozilla/rp.pl b/bin/mozilla/rp.pl
index f6dc985ef..9e3bc9fc9 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};
@@ -2049,11 +2047,6 @@ sub print_form {
$form->{templates} = "$myconfig{templates}";
- # setup variables for the form
- @a = qw(company address businessnumber tel fax);
- map { $form->{$_} = $myconfig{$_} } @a;
- $form->format_string(@a);
-
$form->{IN} = "$form->{type}.html";
if ($form->{format} eq 'postscript') {
@@ -2081,7 +2074,6 @@ sub print_form {
(name, street, zipcode, city, country, contact, email,
"$form->{ct}phone", "$form->{ct}fax");
map { $form->{$_} = $ref->{$_} } @a;
- $form->format_string(@a);
$form->{ $form->{ct} } = $form->{name};
$form->{"$form->{ct}_id"} = $ref->{ctid};
@@ -2885,10 +2877,10 @@ sub generate_bwa {
$longfromdate = $locale->date(\%germandate, $form->{fromdate}, 1);
$shortfromdate = $locale->date(\%germandate, $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|;
}
@@ -2896,7 +2888,6 @@ sub generate_bwa {
# setup variables for the form
@a = qw(company address businessnumber);
map { $form->{$_} = $myconfig{$_} } @a;
- $form->{address} =~ s/\\n/
/g;
$form->{templates} = $myconfig{templates};
$form->{IN} = "bwa.html";
@@ -3065,7 +3056,7 @@ sub generate_ustva {
$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 |
@@ -3082,9 +3073,9 @@ sub generate_ustva {
$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|;
}