X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=bin%2Fmozilla%2Fustva.pl;h=212c3815c2962a86ce8da339b1d2a05d25626d3d;hb=4f63ea874f629459e1a73643595ab5e23e38e7f0;hp=d7ef9caeb7a188d04a544ad2c65c0ddd4de9379b;hpb=8c7e44938a661e035f62840e1e177353240ace5d;p=kivitendo-erp.git
diff --git a/bin/mozilla/ustva.pl b/bin/mozilla/ustva.pl
index d7ef9caeb..212c3815c 100644
--- a/bin/mozilla/ustva.pl
+++ b/bin/mozilla/ustva.pl
@@ -121,19 +121,14 @@ sub report {
# klären, ob $form->{company_street|_address} gesetzt sind
if ($form->{address} ne '') {
my $temp = $form->{address};
- $temp =~ s/\\n/
/;
+ $temp =~ s/\n/
/;
($form->{co_street}, $form->{co_city}) = split("
", $temp);
- $form->{co_city} =~ s/\\n//g;
+ $form->{co_city} =~ s/\n//g;
}
my $address_given =
- ($form->{co_street} ne ''
- and (
- $form->{co_zip} ne ''
- or $form->{co_city} ne ''
- )
- )
+ ($form->{co_street} && ($form->{co_zip} || $form->{co_city}))
? qq|$form->{co_street}
|
. qq|$form->{co_street1}
|
. qq|$form->{co_zip} $form->{co_city}|