4 files changed, 7 insertions, 26 deletions

diff --git a/bin/hr.pl b/bin/hr.pl
index d98d8eed..78b098c0 100755
--- a/bin/hr.pl
+++ b/bin/hr.pl
@@ -528,17 +528,6 @@ sub employee_links {
 
     for ( keys %$form ) { $form->{$_} = $form->quote( $form->{$_} ) }
 
-    $form->all_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} .=
-qq|<option value="$_->{description}--$_->{id}">$_->{description}\n|;
-        }
-    }
     if ( @{ $form->{all_deduction} } ) {
         $form->{selectdeduction} = "<option>\n";
         for ( @{ $form->{all_deduction} } ) {
@@ -742,11 +731,6 @@ sub employee_header {
 		<th align=right nowrap>| . $locale->text('BIC') . qq|</th>
 		<td><input name=bic size=11 maxlength=11 value="$form->{bic}"></td>
 	      </tr>
-		<tr>
-		<th align=right nowrap>| . $locale->text('Department') . qq|</th>
-		<td><select name="department">
-		$form->{selectdepartment}
-		</select>
 	    </table>
 	  </td>
 	</tr>
diff --git a/bin/ir.pl b/bin/ir.pl
index 37fa75fc..d892cedd 100755
--- a/bin/ir.pl
+++ b/bin/ir.pl
@@ -139,15 +139,14 @@ 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} .=
 qq|<option value="$_->{description}--$_->{id}">$_->{description}\n|;
         }
     }
-    $form->{department} = "$form->{department}--$myconfig{department_id}"
-        if $myconfig{department_id};
-
 
     if ( @{ $form->{all_language} } ) {
         $form->{selectlanguage} = "<option>\n";
@@ -274,7 +273,7 @@ sub form_header {
     for (qw(vendor department)) {
         $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/;
     }
 
     if ( $form->{selectlanguage} ) {
diff --git a/bin/is.pl b/bin/is.pl
index 6749bea7..3338018a 100755
--- a/bin/is.pl
+++ b/bin/is.pl
@@ -153,8 +153,6 @@ qq|<option value="$_->{projectnumber}--$_->{id}">$_->{projectnumber}\n|;
 qq|<option value="$_->{description}--$_->{id}">$_->{description}\n|;
         }
     }
-    $form->{department} = "$form->{department}--$myconfig{department_id}"
-        if $myconfig{department_id};
 
     $form->{employee} = "$form->{employee}--$form->{employee_id}";
 
@@ -308,7 +306,7 @@ sub form_header {
     for (qw(customer 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} =
diff --git a/bin/oe.pl b/bin/oe.pl
index 81c147cf..64732dab 100755
--- a/bin/oe.pl
+++ b/bin/oe.pl
@@ -192,6 +192,8 @@ 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} .=
@@ -370,7 +372,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} =
@@ -1510,8 +1512,6 @@ 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 );