1 files changed, 3 insertions, 3 deletions
diff --git a/bin/oe.pl b/bin/oe.pl
index 64732dab..81c147cf 100755
--- a/bin/oe.pl
+++ b/bin/oe.pl
@@ -192,8 +192,6 @@ qq|<option value="$_->{projectnumber}--$_->{id}">$_->{projectnumber}\n|;
     # departments
     if ( @{ $form->{all_department} } ) {
         $form->{selectdepartment} = "<option>\n";
-        $form->{department} = "$form->{department}--$form->{department_id}"
-          if $form->{department_id};
 
         for ( @{ $form->{all_department} } ) {
             $form->{selectdepartment} .=
@@ -372,7 +370,7 @@ sub form_header {
     for ( "$form->{vc}", "department", "employee" ) {
         $form->{"select$_"} = $form->unescape( $form->{"select$_"} );
         $form->{"select$_"} =~ s/ selected//;
-        $form->{"select$_"} =~ s/(<option value="\Q$form->{$_}\E")/$1 selected/;
+        $form->{"select$_"} =~ s/(<option value="[^"]*\Q$form->{$_}\E")/$1 selected/;
     }
 
     $form->{exchangerate} =
@@ -1512,6 +1510,8 @@ sub transactions {
     # split vendor / customer
     ( $form->{ $form->{vc} }, $form->{"$form->{vc}_id"} ) =
       split( /--/, $form->{ $form->{vc} } );
+    $form->{department} = "$form->{department}--$myconfig{department_id}"
+        if $myconfig{department_id};
 
     OE->transactions( \%myconfig, \%$form );