X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Foe.pl;h=6941424866cccd7dcb0f0fbcc21a70e9bf6a3e83;hb=ddc3bbb167d3010b0058efa8f90936d15be76c2e;hp=2ceecc16c9174f7eca4e93a440f654014a7765bc;hpb=0ba6b37cdd6dfd05924c29068aacde7fa2cb85bd;p=kivitendo-erp.git
diff --git a/bin/mozilla/oe.pl b/bin/mozilla/oe.pl
index 2ceecc16c..694142486 100644
--- a/bin/mozilla/oe.pl
+++ b/bin/mozilla/oe.pl
@@ -284,7 +284,6 @@ sub order_links {
sub prepare_order {
$lxdebug->enter_sub();
- $form->{format} = "pdf" unless ($form->{print_and_save} && $form->{format});
$form->{media} = "screen";
$form->{formname} = $form->{type} unless $form->{formname};
@@ -433,11 +432,12 @@ sub form_header {
"";
} else {
$form->{selectshipto} .=
- "";
+ "";
}
}
} else {
+ $form->{selectshipto} = $form->unquote($form->{selectshipto});
$form->{selectshipto} =~ s/ selected//g;
if ($form->{shipto_id} ne "") {
$form->{selectshipto} =~ s/value=$form->{shipto_id}/value=$form->{shipto_id} selected/;
@@ -446,9 +446,9 @@ sub form_header {
$shipto = qq|
| . $locale->text('Shipping Address') . qq| |
- |
- |;
-
+ | |;
+ $form->{selectshipto} = $form->quote($form->{selectshipto});
+ $shipto .= qq| |;
@@ -494,13 +494,8 @@ sub form_header {
$vclabel = ucfirst $form->{vc};
$vclabel = $locale->text($vclabel);
- $terms = qq|
-
- | . $locale->text('Terms: Net') . qq| |
- {terms}> |
- . $locale->text('days') . qq| |
-
-|;
+ $terms = qq||;
if ($form->{business}) {
$business = qq|
@@ -539,26 +534,21 @@ sub form_header {
foreach $item (@{ $form->{TAXZONE} }) {
if ($item->{id} == $form->{taxzone_id}) {
$form->{selecttaxzone} .=
- "";
+ "";
} else {
$form->{selecttaxzone} .=
- "";
+ "";
}
}
} else {
$form->{selecttaxzone} =~ s/ selected//g;
if ($form->{taxzone_id} ne "") {
- $form->{selecttaxzone} =~ s/value=$form->{taxzone_id}/value=$form->{taxzone_id} selected/;
+ $form->{selecttaxzone} =~ s/value=$form->{taxzone_id}>/value=$form->{taxzone_id} selected>/;
}
}
- if ($form->{rowcount} >0) {
- $form->{selecttaxzone} =~ /