From: Moritz Bunkus <m.bunkus@linet-services.de>
Date: Wed, 22 Nov 2006 15:19:30 +0000 (+0000)
Subject: Recommit von r981 von mbunkus: USTVA: Leerzeilen/Zeilenumbrueche in der Adressangabe... 
X-Git-Tag: release-2.4.0^2~230
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=b39c8ce980f42154a4b7686de72a77789bfd1145;p=kivitendo-erp.git

Recommit von r981 von mbunkus: USTVA: Leerzeilen/Zeilenumbrueche in der Adressangabe muessen richtig escapet werden. Fix fuer Bug 311.
---

diff --git a/bin/mozilla/ustva.pl b/bin/mozilla/ustva.pl
index 709a3bc7d..a294afc58 100644
--- a/bin/mozilla/ustva.pl
+++ b/bin/mozilla/ustva.pl
@@ -147,6 +147,7 @@ sub report {
     my $temp = $form->{address};
     $temp =~ s/\\n/<br \/>/;
     ($form->{co_street}, $form->{co_city}) = split("<br \/>", $temp);
+    $form->{co_city} =~ s/\\n//g;
   }
 
   if ($form->{co_street} ne ''
@@ -990,6 +991,7 @@ sub generate_ustva {
     my $temp = $form->{address};
     $temp =~ s/\\n/<br \/>/;
     ($form->{co_street}, $form->{co_city}) = split("<br \/>", $temp);
+    $form->{co_city} =~ s/\\n//g;
   }
 
   if (   $form->{format} eq 'pdf'
@@ -1025,7 +1027,7 @@ sub generate_ustva {
     $form->{bold}    = "<b>";
     $form->{endbold} = "</b>";
     $form->{br}      = "<br>";
-    $form->{address} =~ s/\\n/<br \/>/;
+    $form->{address} =~ s/\\n/<br \/>/g;
 
   }