From: Moritz Bunkus <m.bunkus@linet-services.de>
Date: Fri, 16 Feb 2007 08:51:36 +0000 (+0000)
Subject: Große Codeteile entfernt, die zur Vorbereitung von Mehrlagerfähigkeit in SQL-Ledger... 
X-Git-Tag: release-2.4.2~97
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=5b60c0df87a1150394dddfdf5c4b0c130a9e004a;p=kivitendo-erp.git

Große Codeteile entfernt, die zur Vorbereitung von Mehrlagerfähigkeit in SQL-Ledger gedient haben und nie benutzt wurden.
---

diff --git a/SL/OE.pm b/SL/OE.pm
index 48ff26e30..b95098374 100644
--- a/SL/OE.pm
+++ b/SL/OE.pm
@@ -88,15 +88,7 @@ sub transactions {
 	         FROM oe o
 	         JOIN $form->{vc} ct ON (o.$form->{vc}_id = ct.id)
 		 JOIN orderitems oi ON (oi.trans_id = o.id)
-		 JOIN parts p ON (p.id = oi.parts_id)|;
-
-    if ($warehouse_id && $form->{type} eq 'ship_order') {
-      $query .= qq|
-	         JOIN inventory i ON (oi.parts_id = i.parts_id)
-		 |;
-    }
-
-    $query .= qq|
+		 JOIN parts p ON (p.id = oi.parts_id)
 	         LEFT JOIN employee e ON (o.employee_id = e.id)
 	         LEFT JOIN exchangerate ex ON (ex.curr = o.curr
 		                               AND ex.transdate = o.transdate)
@@ -508,7 +500,6 @@ Message: $form->{message}\r| if $form->{message};
 
     # adjust onhand
     &adj_onhand($dbh, $form, $ml * -1);
-    &adj_inventory($dbh, $myconfig, $form);
   }
 
   my $rc = $dbh->commit;
@@ -1254,132 +1245,6 @@ sub project_description {
   return $_;
 }
 
-sub get_warehouses {
-  $main::lxdebug->enter_sub();
-
-  my ($self, $myconfig, $form) = @_;
-
-  my $dbh = $form->dbconnect($myconfig);
-
-  # setup warehouses
-  my $query = qq|SELECT id, description
-                 FROM warehouse|;
-
-  my $sth = $dbh->prepare($query);
-  $sth->execute || $form->dberror($query);
-
-  while (my $ref = $sth->fetchrow_hashref(NAME_lc)) {
-    push @{ $form->{all_warehouses} }, $ref;
-  }
-  $sth->finish;
-
-  $dbh->disconnect;
-
-  $main::lxdebug->leave_sub();
-}
-
-sub save_inventory {
-  $main::lxdebug->enter_sub();
-
-  my ($self, $myconfig, $form) = @_;
-
-  my ($null, $warehouse_id) = split /--/, $form->{warehouse};
-  $warehouse_id *= 1;
-
-  my $employee_id;
-  ($null, $employee_id) = split /--/, $form->{employee};
-
-  my $ml = ($form->{type} eq 'ship_order') ? -1 : 1;
-
-  my $dbh = $form->dbconnect_noauto($myconfig);
-  my $sth;
-  my $wth;
-  my $serialnumber;
-  my $ship;
-
-  $query = qq|SELECT o.serialnumber, o.ship
-              FROM orderitems o
-              WHERE o.trans_id = ?
-	      AND o.id = ?
-	      FOR UPDATE|;
-  $sth = $dbh->prepare($query) || $form->dberror($query);
-
-  $query = qq|SELECT sum(i.qty)
-              FROM inventory i
-	      WHERE i.parts_id = ?
-	      AND i.warehouse_id = ?|;
-  $wth = $dbh->prepare($query) || $form->dberror($query);
-
-  for my $i (1 .. $form->{rowcount} - 1) {
-
-    $ship =
-      (abs($form->{"ship_$i"}) > abs($form->{"qty_$i"}))
-      ? $form->{"qty_$i"}
-      : $form->{"ship_$i"};
-
-    if ($warehouse_id && $form->{type} eq 'ship_order') {
-
-      $wth->execute($form->{"id_$i"}, $warehouse_id) || $form->dberror;
-
-      ($qty) = $wth->fetchrow_array;
-      $wth->finish;
-
-      if ($ship > $qty) {
-        $ship = $qty;
-      }
-    }
-
-    if ($ship != 0) {
-
-      $ship *= $ml;
-      $query = qq|INSERT INTO inventory (parts_id, warehouse_id,
-                  qty, oe_id, orderitems_id, shippingdate, employee_id)
-                  VALUES ($form->{"id_$i"}, $warehouse_id,
-		  $ship, $form->{"id"},
-		  $form->{"orderitems_id_$i"}, '$form->{shippingdate}',
-		  $employee_id)|;
-      $dbh->do($query) || $form->dberror($query);
-
-      # add serialnumber, ship to orderitems
-      $sth->execute($form->{id}, $form->{"orderitems_id_$i"})
-        || $form->dberror;
-      ($serialnumber, $ship) = $sth->fetchrow_array;
-      $sth->finish;
-
-      $serialnumber .= " " if $serialnumber;
-      $serialnumber .= qq|$form->{"serialnumber_$i"}|;
-      $ship += $form->{"ship_$i"};
-
-      $query = qq|UPDATE orderitems SET
-                  serialnumber = '$serialnumber',
-		  ship = $ship
-		  WHERE trans_id = $form->{id}
-		  AND id = $form->{"orderitems_id_$i"}|;
-      $dbh->do($query) || $form->dberror($query);
-
-      # update order with ship via
-      $query = qq|UPDATE oe SET
-                  shippingpoint = '$form->{shippingpoint}',
-                  shipvia = '$form->{shipvia}'
-		  WHERE id = $form->{id}|;
-      $dbh->do($query) || $form->dberror($query);
-
-      # update onhand for parts
-      $form->update_balance($dbh, "parts", "onhand",
-                            qq|id = $form->{"id_$i"}|,
-                            $form->{"ship_$i"} * $ml);
-
-    }
-  }
-
-  my $rc = $dbh->commit;
-  $dbh->disconnect;
-
-  $main::lxdebug->leave_sub();
-
-  return $rc;
-}
-
 sub adj_onhand {
   $main::lxdebug->enter_sub();
 
@@ -1458,185 +1323,5 @@ sub adj_onhand {
   $main::lxdebug->leave_sub();
 }
 
-sub adj_inventory {
-  $main::lxdebug->enter_sub();
-
-  my ($dbh, $myconfig, $form) = @_;
-
-  my %oid = ('Pg'     => 'oid',
-             'Oracle' => 'rowid');
-
-  # increase/reduce qty in inventory table
-  my $query = qq|SELECT oi.id, oi.parts_id, oi.ship
-                 FROM orderitems oi
-                 WHERE oi.trans_id = $form->{id}|;
-  my $sth = $dbh->prepare($query);
-  $sth->execute || $form->dberror($query);
-
-  $query = qq|SELECT $oid{$myconfig->{dbdriver}} AS oid, qty,
-                     (SELECT SUM(qty) FROM inventory
-                      WHERE oe_id = $form->{id}
-		      AND orderitems_id = ?) AS total
-	      FROM inventory
-              WHERE oe_id = $form->{id}
-	      AND orderitems_id = ?|;
-  my $ith = $dbh->prepare($query) || $form->dberror($query);
-
-  my $qty;
-  my $ml = ($form->{type} =~ /(ship|sales)_order/) ? -1 : 1;
-
-  while (my $ref = $sth->fetchrow_hashref(NAME_lc)) {
-
-    $ith->execute($ref->{id}, $ref->{id}) || $form->dberror($query);
-
-    while (my $inv = $ith->fetchrow_hashref(NAME_lc)) {
-
-      if (($qty = (($inv->{total} * $ml) - $ref->{ship})) >= 0) {
-        $qty = $inv->{qty} if ($qty > ($inv->{qty} * $ml));
-
-        $form->update_balance($dbh, "inventory", "qty",
-                              qq|$oid{$myconfig->{dbdriver}} = $inv->{oid}|,
-                              $qty * -1 * $ml);
-      }
-    }
-    $ith->finish;
-
-  }
-  $sth->finish;
-
-  # delete inventory entries if qty = 0
-  $query = qq|DELETE FROM inventory
-              WHERE oe_id = $form->{id}
-	      AND qty = 0|;
-  $dbh->do($query) || $form->dberror($query);
-
-  $main::lxdebug->leave_sub();
-}
-
-sub get_inventory {
-  $main::lxdebug->enter_sub();
-
-  my ($self, $myconfig, $form) = @_;
-
-  my ($null, $warehouse_id) = split /--/, $form->{warehouse};
-  $warehouse_id *= 1;
-
-  my $dbh = $form->dbconnect($myconfig);
-
-  my $query = qq|SELECT p.id, p.partnumber, p.description, p.onhand,
-                 pg.partsgroup
-                 FROM parts p
-		 LEFT JOIN partsgroup pg ON (p.partsgroup_id = pg.id)
-	         WHERE p.onhand > 0|;
-
-  if ($form->{partnumber}) {
-    $var = $form->like(lc $form->{partnumber});
-    $query .= "
-                 AND lower(p.partnumber) LIKE '$var'";
-  }
-  if ($form->{description}) {
-    $var = $form->like(lc $form->{description});
-    $query .= "
-                 AND lower(p.description) LIKE '$var'";
-  }
-  if ($form->{partsgroup}) {
-    $var = $form->like(lc $form->{partsgroup});
-    $query .= "
-                 AND lower(pg.partsgroup) LIKE '$var'";
-  }
-
-  $sth = $dbh->prepare($query);
-  $sth->execute || $form->dberror($query);
-
-  $query = qq|SELECT sum(i.qty), w.description, w.id
-              FROM inventory i
-	      LEFT JOIN warehouse w ON (w.id = i.warehouse_id)
-	      WHERE i.parts_id = ?
-	      AND NOT i.warehouse_id = $warehouse_id
-	      GROUP BY w.description, w.id|;
-  $wth = $dbh->prepare($query) || $form->dberror($query);
-
-  while ($ref = $sth->fetchrow_hashref(NAME_lc)) {
-
-    $wth->execute($ref->{id}) || $form->dberror;
-
-    while (($qty, $warehouse, $warehouse_id) = $wth->fetchrow_array) {
-      push @{ $form->{all_inventory} },
-        { 'id'           => $ref->{id},
-          'partnumber'   => $ref->{partnumber},
-          'description'  => $ref->{description},
-          'partsgroup'   => $ref->{partsgroup},
-          'qty'          => $qty,
-          'warehouse_id' => $warehouse_id,
-          'warehouse'    => $warehouse }
-        if $qty > 0;
-    }
-    $wth->finish;
-  }
-  $sth->finish;
-
-  $dbh->disconnect;
-
-  # sort inventory
-  @{ $form->{all_inventory} } =
-    sort { $a->{ $form->{sort} } cmp $b->{ $form->{sort} } }
-    @{ $form->{all_inventory} };
-
-  $main::lxdebug->leave_sub();
-
-  return @{ $form->{all_inventory} };
-}
-
-sub transfer {
-  $main::lxdebug->enter_sub();
-
-  my ($self, $myconfig, $form) = @_;
-
-  my $dbh = $form->dbconnect_noauto($myconfig);
-
-  my $query = qq|INSERT INTO inventory
-                 (warehouse_id, parts_id, qty, shippingdate, employee_id)
-		 VALUES (?, ?, ?, ?, ?)|;
-  $sth = $dbh->prepare($query) || $form->dberror($query);
-
-  $form->get_employee($dbh);
-
-  my @a = localtime;
-  $a[5] += 1900;
-  $a[4]++;
-  $shippingdate = "$a[5]-$a[4]-$a[3]";
-
-  for my $i (1 .. $form->{rowcount}) {
-    $qty = $form->parse_amount($myconfig, $form->{"transfer_$i"});
-
-    $qty = $form->{"qty_$i"} if ($qty > $form->{"qty_$i"});
-
-    if ($qty) {
-
-      # to warehouse
-      $sth->execute($form->{warehouse_id}, $form->{"id_$i"}, $qty,
-                    $shippingdate, $form->{employee_id})
-        || $form->dberror;
-
-      $sth->finish;
-
-      # from warehouse
-      $sth->execute($form->{"warehouse_id_$i"},
-                    $form->{"id_$i"}, $qty * -1, $shippingdate,
-                    $form->{employee_id})
-        || $form->dberror;
-
-      $sth->finish;
-    }
-  }
-
-  my $rc = $dbh->commit;
-  $dbh->disconnect;
-
-  $main::lxdebug->leave_sub();
-
-  return $rc;
-}
-
 1;
 
diff --git a/bin/mozilla/ic.pl b/bin/mozilla/ic.pl
index df330d3ac..16205a7b1 100644
--- a/bin/mozilla/ic.pl
+++ b/bin/mozilla/ic.pl
@@ -3006,7 +3006,7 @@ sub save {
       $locale->text(
         "Inventory quantity must be zero before you can set this $form->{item} obsolete!"
       ))
-      if ($form->{onhand});
+      if ($form->{onhand} * 1);
   }
 
   if (!$form->{buchungsgruppen_id}) {
@@ -3170,181 +3170,6 @@ sub delete {
   $lxdebug->leave_sub();
 }
 
-sub stock_assembly {
-  $lxdebug->enter_sub();
-
-  $form->{title} = $locale->text('Stock Assembly');
-
-  $form->header;
-
-  print qq|
-<body>
-
-<form method=post action=$form->{script}>
-
-<table width="100%">
-  <tr>
-    <th class=listtop>$form->{title}</th>
-  </tr>
-  <tr height="5"></tr>
-  <tr valign=top>
-    <td>
-      <table>
-        <tr>
-          <th align="right" nowrap="true">|
-    . $locale->text('Part Number') . qq|</th>
-          <td><input name=partnumber size=20></td>
-          <td>&nbsp;</td>
-        </tr>
-        <tr>
-          <th align="right" nowrap="true">|
-    . $locale->text('Part Description') . qq|</th>
-          <td><input name=description size=40></td>
-        </tr>
-      </table>
-    </td>
-  </tr>
-  <tr><td><hr size=3 noshade></td></tr>
-</table>
-
-<input type=hidden name=path value=$form->{path}>
-<input type=hidden name=login value=$form->{login}>
-<input type=hidden name=password value=$form->{password}>
-
-<input type=hidden name=nextsub value=list_assemblies>
-
-<br>
-<input class=submit type=submit name=action value="|
-    . $locale->text('Continue') . qq|">
-</form>
-
-</body>
-</html>
-|;
-
-  $lxdebug->leave_sub();
-}
-
-sub list_assemblies {
-  $lxdebug->enter_sub();
-
-  IC->retrieve_assemblies(\%myconfig, \%$form);
-
-  $column_header{partnumber} =
-    qq|<th class=listheading>| . $locale->text('Part Number') . qq|</th>|;
-  $column_header{description} =
-    qq|<th class=listheading>| . $locale->text('Part Description') . qq|</th>|;
-  $column_header{bin} =
-    qq|<th class=listheading>| . $locale->text('Bin') . qq|</th>|;
-  $column_header{onhand} =
-    qq|<th class=listheading>| . $locale->text('Qty') . qq|</th>|;
-  $column_header{rop} =
-    qq|<th class=listheading>| . $locale->text('ROP') . qq|</th>|;
-  $column_header{stock} =
-    qq|<th class=listheading>| . $locale->text('Add') . qq|</th>|;
-
-  @column_index = (qw(partnumber description bin onhand rop stock));
-
-  $form->{title} = $locale->text('Stock Assembly');
-
-  $form->{callback} =
-    "$form->{script}?action=stock_assembly&path=$form->{path}&login=$form->{login}&password=$form->{password}";
-
-  $form->header;
-
-  $colspan = $#column_index + 1;
-
-  print qq|
-<body>
-
-<form method=post action=$form->{script}>
-
-<table width=100%>
-  <tr>
-    <th class=listtop colspan=$colspan>$form->{title}</th>
-  </tr>
-  <tr size=5></tr>
-  <tr class=listheading>|;
-
-  map { print "\n$column_header{$_}" } @column_index;
-
-  print qq|
-  </tr>
-|;
-
-  $i = 1;
-  foreach $ref (@{ $form->{assembly_items} }) {
-
-    map { $ref->{$_} =~ s/\"/&quot;/g } qw(partnumber description);
-
-    $column_data{partnumber}  = qq|<td width=20%>$ref->{partnumber}</td>|;
-    $column_data{description} =
-      qq|<td width=50%>$ref->{description}&nbsp;</td>|;
-    $column_data{bin}    = qq|<td>$ref->{bin}&nbsp;</td>|;
-    $column_data{onhand} =
-        qq|<td align=right>|
-      . $form->format_amount(\%myconfig, $ref->{onhand})
-      . qq|</td>|;
-    $column_data{rop} =
-        qq|<td align=right>|
-      . $form->format_amount(\%myconfig, $ref->{rop})
-      . qq|</td>|;
-    $column_data{stock} = qq|<td width=10%><input name="qty_$i" size=10></td>|;
-
-    $j++;
-    $j %= 2;
-    print
-      qq|<tr class=listrow$j><input name="id_$i" type=hidden value=$ref->{id}>\n|;
-
-    map { print "\n$column_data{$_}" } @column_index;
-
-    print qq|
-    </tr>
-|;
-
-    $i++;
-
-  }
-
-  $i--;
-  print qq|
-  <tr>
-    <td colspan=6><hr size=3 noshade>
-  </tr>
-</table>
-<input name=rowcount type=hidden value="$i">
-
-<input type=hidden name=path value=$form->{path}>
-<input type=hidden name=login value=$form->{login}>
-<input type=hidden name=password value=$form->{password}>
-
-<input name=callback type=hidden value="$form->{callback}">
-
-<input type=hidden name=nextsub value=restock_assemblies>
-
-<br>
-<input class=submit type=submit name=action value="|
-    . $locale->text('Continue') . qq|">
-
-</form>
-
-</body>
-</html>
-|;
-
-  $lxdebug->leave_sub();
-}
-
-sub restock_assemblies {
-  $lxdebug->enter_sub();
-
-  $form->redirect($locale->text('Assemblies restocked!'))
-    if (IC->restock_assemblies(\%myconfig, \%$form));
-  $form->error($locale->text('Cannot stock assemblies!'));
-
-  $lxdebug->leave_sub();
-}
-
 sub price_row {
   $lxdebug->enter_sub();
 
diff --git a/bin/mozilla/io.pl b/bin/mozilla/io.pl
index 312003aec..c0fdcdad0 100644
--- a/bin/mozilla/io.pl
+++ b/bin/mozilla/io.pl
@@ -1549,20 +1549,6 @@ sub print_options {
       . $locale->text('Credit Note');
   }
 
-  if ($form->{type} eq 'ship_order') {
-    $type = qq|<select name=formname>
-	    <option value=pick_list $form->{PD}{pick_list}>|
-      . $locale->text('Pick List') . qq|
-	    <option value=packing_list $form->{PD}{packing_list}>|
-      . $locale->text('Packing List');
-  }
-
-  if ($form->{type} eq 'receive_order') {
-    $type = qq|<select name=formname>
-	    <option value=bin_list $form->{PD}{bin_list}>|
-      . $locale->text('Bin List');
-  }
-
   if ($form->{media} eq 'email') {
     $media = qq|<select name=sendmode>
 	    <option value=attachment $form->{SM}{attachment}>|
diff --git a/bin/mozilla/oe.pl b/bin/mozilla/oe.pl
index bbb90c2d6..49edb578d 100644
--- a/bin/mozilla/oe.pl
+++ b/bin/mozilla/oe.pl
@@ -205,7 +205,7 @@ sub order_links {
   $intnotes = $form->{intnotes};
 
   # get customer / vendor
-  if ($form->{type} =~ /(purchase_order|request_quotation|receive_order)/) {
+  if ($form->{type} =~ /(purchase_order|request_quotation)/) {
     IR->get_vendor(\%myconfig, \%$form);
 
     #quote all_vendor Bug 133
@@ -1248,6 +1248,7 @@ sub search {
     $ordnumber     = 'ordnumber';
     $employee      = $locale->text('Employee');
   }
+
   if ($form->{type} eq 'request_quotation') {
     $form->{title} = $locale->text('Request for Quotations');
     $form->{vc}    = 'vendor';
@@ -1255,13 +1256,7 @@ sub search {
     $ordnumber     = 'quonumber';
     $employee      = $locale->text('Employee');
   }
-  if ($form->{type} eq 'receive_order') {
-    $form->{title} = $locale->text('Receive Merchandise');
-    $form->{vc}    = 'vendor';
-    $ordlabel      = $locale->text('Order Number');
-    $ordnumber     = 'ordnumber';
-    $employee      = $locale->text('Employee');
-  }
+
   if ($form->{type} eq 'sales_order') {
     $form->{title} = $locale->text('Sales Orders');
     $form->{vc}    = 'customer';
@@ -1269,14 +1264,6 @@ sub search {
     $ordnumber     = 'ordnumber';
     $employee      = $locale->text('Salesperson');
   }
-  if ($form->{type} eq 'ship_order') {
-    $form->{title} = $locale->text('Ship Merchandise');
-    $form->{vc}    = 'customer';
-    $ordlabel      = $locale->text('Order Number');
-    $ordnumber     = 'ordnumber';
-    $employee      = $locale->text('Salesperson');
-
-  }
 
   if ($form->{type} eq 'sales_quotation') {
     $form->{title} = $locale->text('Quotations');
@@ -1286,30 +1273,6 @@ sub search {
     $employee      = $locale->text('Employee');
   }
 
-  if ($form->{type} =~ /(ship|receive)_order/) {
-    OE->get_warehouses(\%myconfig, \%$form);
-
-    # warehouse
-    if (@{ $form->{all_warehouses} }) {
-      $form->{selectwarehouse} = "<option>\n";
-      $form->{warehouse}       = qq|$form->{warehouse}--$form->{warehouse_id}|;
-
-      map {
-        $form->{selectwarehouse} .=
-          "<option>$_->{description}--$_->{id}\n"
-      } (@{ $form->{all_warehouses} });
-
-      $warehouse = qq|
-	      <tr>
-		<th align=right>| . $locale->text('Warehouse') . qq|</th>
-		<td colspan=3><select name=warehouse>$form->{selectwarehouse}</select></td>
-		<input type=hidden name=selectwarehouse value="$form->{selectwarehouse}">
-	      </tr>
-|;
-
-    }
-  }
-
   # setup vendor / customer selection
   $form->all_vc(\%myconfig, $form->{vc},
                 ($form->{vc} eq 'customer') ? "AR" : "AP");
@@ -1345,21 +1308,9 @@ sub search {
 	</tr>
 | if $form->{selectdepartment};
 
-  if ($form->{type} !~ /(ship_order|receive_order)/) {
-    $openclosed = qq|
-	      <tr>
-	        <td><input name="open" class=checkbox type=checkbox value=1 checked> |
-      . $locale->text('Open') . qq|</td>
-	        <td><input name="closed" class=checkbox type=checkbox value=1 $form->{closed}> |
-      . $locale->text('Closed') . qq|</td>
-	      </tr>
-|;
-  } else {
-
-    $openclosed = qq|
+  $openclosed = qq|
 	        <input type=hidden name="open" value=1>
 |;
-  }
 
   my $delivered;
   if (($form->{"type"} eq "sales_order") ||
@@ -1561,9 +1512,7 @@ sub orders {
   }
 
   if ($form->{vc} eq 'vendor') {
-    if ($form->{type} eq 'receive_order') {
-      $form->{title} = $locale->text('Receive Merchandise');
-    } elsif ($form->{type} eq 'purchase_order') {
+    if ($form->{type} eq 'purchase_order') {
       $form->{title} = $locale->text('Purchase Orders');
     } else {
       $form->{title} = $locale->text('Request for Quotations');
@@ -1575,9 +1524,6 @@ sub orders {
     if ($form->{type} eq 'sales_order') {
       $form->{title} = $locale->text('Sales Orders');
       $employee = $locale->text('Salesperson');
-    } elsif ($form->{type} eq 'ship_order') {
-      $form->{title} = $locale->text('Ship Merchandise');
-      $employee = $locale->text('Salesperson');
     } else {
       $form->{title} = $locale->text('Quotations');
       $employee = $locale->text('Employee');
@@ -2497,630 +2443,3 @@ sub poso {
   $lxdebug->leave_sub();
 }
 
-sub ship_receive {
-  $lxdebug->enter_sub();
-
-  &order_links;
-
-  &prepare_order;
-
-  OE->get_warehouses(\%myconfig, \%$form);
-
-  # warehouse
-  if (@{ $form->{all_warehouses} }) {
-    $form->{selectwarehouse} = "<option>\n";
-
-    map { $form->{selectwarehouse} .= "<option>$_->{description}--$_->{id}\n" }
-      (@{ $form->{all_warehouses} });
-
-    if ($form->{warehouse}) {
-      $form->{selectwarehouse} = "<option>$form->{warehouse}";
-    }
-  }
-
-  $form->{shippingdate} = $form->current_date(\%myconfig);
-  $form->{"$form->{vc}"} =~ s/--.*//;
-
-  @flds  = ();
-  @a     = ();
-  $count = 0;
-  foreach $key (keys %$form) {
-    if ($key =~ /_1$/) {
-      $key =~ s/_1//;
-      push @flds, $key;
-    }
-  }
-
-  for $i (1 .. $form->{rowcount}) {
-
-    # undo formatting from prepare_order
-    map {
-      $form->{"${_}_$i"} =
-        $form->parse_amount(\%myconfig, $form->{"${_}_$i"})
-    } qw(qty ship);
-    $n = ($form->{"qty_$i"} -= $form->{"ship_$i"});
-    if (abs($n) > 0
-        && ($form->{"inventory_accno_$i"} || $form->{"assembly_$i"})) {
-      $form->{"ship_$i"}         = "";
-      $form->{"serialnumber_$i"} = "";
-
-      push @a, {};
-      $j = $#a;
-
-      map { $a[$j]->{$_} = $form->{"${_}_$i"} } @flds;
-      $count++;
-    }
-  }
-
-  $form->redo_rows(\@flds, \@a, $count, $form->{rowcount});
-  $form->{rowcount} = $count;
-
-  &display_ship_receive;
-
-  $lxdebug->leave_sub();
-}
-
-sub display_ship_receive {
-  $lxdebug->enter_sub();
-
-  $vclabel = ucfirst $form->{vc};
-  $vclabel = $locale->text($vclabel);
-
-  $form->{rowcount}++;
-
-  if ($form->{vc} eq 'customer') {
-    $form->{title} = $locale->text('Ship Merchandise');
-    $shipped = $locale->text('Shipping Date');
-  } else {
-    $form->{title} = $locale->text('Receive Merchandise');
-    $shipped = $locale->text('Date Received');
-  }
-
-  # set option selected
-  foreach $item (warehouse, employee) {
-    $form->{"select$item"} =~ s/ selected//;
-    $form->{"select$item"} =~
-      s/option>\Q$form->{$item}\E/option selected>$form->{$item}/;
-  }
-
-  $warehouse = qq|
-	      <tr>
-		<th align=right>| . $locale->text('Warehouse') . qq|</th>
-		<td><select name=warehouse>$form->{selectwarehouse}</select></td>
-		<input type=hidden name=selectwarehouse value="$form->{selectwarehouse}">
-	      </tr>
-| if $form->{selectwarehouse};
-
-  $employee = qq|
- 	      <tr>
-	        <th align=right nowrap>| . $locale->text('Contact') . qq|</th>
-		<td><select name=employee>$form->{selectemployee}</select></td>
-		<input type=hidden name=selectemployee value="$form->{selectemployee}">
-	      </tr>
-|;
-
-  $form->header;
-
-  print qq|
-<body>
-
-<form method=post action=$form->{script}>
-
-<input type=hidden name=id value=$form->{id}>
-
-<input type=hidden name=display_form value=display_ship_receive>
-
-<input type=hidden name=type value=$form->{type}>
-<input type=hidden name=media value=$form->{media}>
-<input type=hidden name=format value=$form->{format}>
-
-<input type=hidden name=queued value="$form->{queued}">
-<input type=hidden name=printed value="$form->{printed}">
-<input type=hidden name=emailed value="$form->{emailed}">
-
-<input type=hidden name=vc value=$form->{vc}>
-
-<table width=100%>
-  <tr class=listtop>
-    <th class=listtop>$form->{title}</th>
-  </tr>
-  <tr height="5"></tr>
-  <tr>
-    <td>
-      <table width="100%">
-        <tr valign=top>
-	  <td>
-	    <table width=100%>
-	      <tr>
-		<th align=right>$vclabel</th>
-		<td colspan=3>$form->{$form->{vc}}</td>
-		<input type=hidden name=$form->{vc} value="$form->{$form->{vc}}">
-		<input type=hidden name="$form->{vc}_id" value=$form->{"$form->{vc}_id"}>
-	      </tr>
-	      $department
-	      <tr>
-		<th align=right>| . $locale->text('Shipping Point') . qq|</th>
-		<td colspan=3>
-		<input name=shippingpoint size=35 value="$form->{shippingpoint}">
-	      </tr>
-	      <tr>
-		<th align=right>| . $locale->text('Ship via') . qq|</th>
-		<td colspan=3>
-		<input name=shipvia size=35 value="$form->{shipvia}">
-	      </tr>
-	      $warehouse
-	    </table>
-	  </td>
-	  <td align=right>
-	    <table>
-	      $employee
-	      <tr>
-		<th align=right nowrap>| . $locale->text('Order Number') . qq|</th>
-		<td>$form->{ordnumber}</td>
-		<input type=hidden name=ordnumber value="$form->{ordnumber}">
-	      </tr>
-	      <tr>
-		<th align=right nowrap>| . $locale->text('Order Date') . qq|</th>
-		<td>$form->{transdate}</td>
-		<input type=hidden name=transdate value=$form->{transdate}>
-	      </tr>
-	      <tr>
-		<th align=right nowrap>$shipped</th>
-		<td><input name=shippingdate size=11 value=$form->{shippingdate}></td>
-	      </tr>
-	    </table>
-	  </td>
-	</tr>
-      </table>
-    </td>
-  </tr>
-
-<!-- shipto are in hidden variables -->
-
-<input type=hidden name=shiptoname value="$form->{shiptoname}">
-<input type=hidden name=shiptostreet value="$form->{shiptostreet}">
-<input type=hidden name=shiptozipcode value="$form->{shiptozipcode}">
-<input type=hidden name=shiptocity value="$form->{shiptocity}">
-<input type=hidden name=shiptocountry value="$form->{shiptocountry}">
-<input type=hidden name=shiptocontact value="$form->{shiptocontact}">
-<input type=hidden name=shiptophone value="$form->{shiptophone}">
-<input type=hidden name=shiptofax value="$form->{shiptofax}">
-<input type=hidden name=shiptoemail value="$form->{shiptoemail}">
-<input type=hidden name=shiptodepartment_1 value="$form->{shiptodepartment_1}">
-<input type=hidden name=shiptodepartment_2 value="$form->{shiptodepartment_2}">
-
-<!-- email variables -->
-<input type=hidden name=message value="$form->{message}">
-<input type=hidden name=email value="$form->{email}">
-<input type=hidden name=subject value="$form->{subject}">
-<input type=hidden name=cc value="$form->{cc}">
-<input type=hidden name=bcc value="$form->{bcc}">
-
-|;
-
-  @column_index =
-    (partnumber, description, qty, ship, unit, bin, serialnumber);
-
-  if ($form->{type} eq "ship_order") {
-    $column_data{ship} =
-        qq|<th class=listheading align=center width="auto">|
-      . $locale->text('Ship')
-      . qq|</th>|;
-  }
-  if ($form->{type} eq "receive_order") {
-    $column_data{ship} =
-        qq|<th class=listheading align=center width="auto">|
-      . $locale->text('Recd')
-      . qq|</th>|;
-  }
-
-  my $colspan = $#column_index + 1;
-
-  $column_data{partnumber} =
-    qq|<th class=listheading nowrap>| . $locale->text('Number') . qq|</th>|;
-  $column_data{description} =
-      qq|<th class=listheading nowrap>|
-    . $locale->text('Description')
-    . qq|</th>|;
-  $column_data{qty} =
-    qq|<th class=listheading nowrap>| . $locale->text('Qty') . qq|</th>|;
-  $column_data{unit} =
-    qq|<th class=listheading nowrap>| . $locale->text('Unit') . qq|</th>|;
-  $column_data{bin} =
-    qq|<th class=listheading nowrap>| . $locale->text('Bin') . qq|</th>|;
-  $column_data{serialnumber} =
-      qq|<th class=listheading nowrap>|
-    . $locale->text('Serial No.')
-    . qq|</th>|;
-
-  print qq|
-  <tr>
-    <td>
-      <table width=100%>
-	<tr class=listheading>|;
-
-  map { print "\n$column_data{$_}" } @column_index;
-
-  print qq|
-        </tr>
-|;
-
-  for $i (1 .. $form->{rowcount} - 1) {
-
-    # undo formatting
-    $form->{"ship_$i"} = $form->parse_amount(\%myconfig, $form->{"ship_$i"});
-
-    # convert " to &quot;
-    map { $form->{"${_}_$i"} =~ s/\"/&quot;/g }
-      qw(partnumber description unit bin serialnumber);
-
-    $description = $form->{"description_$i"};
-    $description =~ s/\n/<br>/g;
-
-    $column_data{partnumber} =
-      qq|<td>$form->{"partnumber_$i"}<input type=hidden name="partnumber_$i" value="$form->{"partnumber_$i"}"></td>|;
-    $column_data{description} =
-      qq|<td>$description<input type=hidden name="description_$i" value="$form->{"description_$i"}"></td>|;
-    $column_data{qty} =
-        qq|<td align=right>|
-      . $form->format_amount(\%myconfig, $form->{"qty_$i"}, $dec_qty)
-      . qq|<input type=hidden name="qty_$i" value="$form->{"qty_$i"}"></td>|;
-    $column_data{ship} =
-        qq|<td align=right><input name="ship_$i" size=5 value=|
-      . $form->format_amount(\%myconfig, $form->{"ship_$i"})
-      . qq|></td>|;
-    $column_data{unit} =
-      qq|<td>$form->{"unit_$i"}<input type=hidden name="unit_$i" value="$form->{"unit_$i"}"></td>|;
-    $column_data{bin} =
-      qq|<td>$form->{"bin_$i"}<input type=hidden name="bin_$i" value="$form->{"bin_$i"}"></td>|;
-
-    $column_data{serialnumber} =
-      qq|<td><input name="serialnumber_$i" size=15 value="$form->{"serialnumber_$i"}"></td>|;
-
-    print qq|
-        <tr valign=top>|;
-
-    map { print "\n$column_data{$_}" } @column_index;
-
-    print qq|
-        </tr>
-
-<input type=hidden name="orderitems_id_$i" value=$form->{"orderitems_id_$i"}>
-<input type=hidden name="id_$i" value=$form->{"id_$i"}>
-<input type=hidden name="assembly_$i" value="$form->{"assembly_$i"}">
-<input type=hidden name="partsgroup_$i" value="$form->{"partsgroup_$i"}">
-
-|;
-
-  }
-
-  print qq|
-      </table>
-    </td>
-  </tr>
-  <tr>
-    <td><hr size=3 noshade></td>
-  </tr>
-  <tr>
-    <td>
-|;
-
-  $form->{copies} = 1;
-
-  &print_options;
-
-  print qq|
-    </td>
-  </tr>
-</table>
-<br>
-<input class=submit type=submit name=action value="|
-    . $locale->text('Update') . qq|">
-<input class=submit type=submit name=action value="|
-    . $locale->text('Print') . qq|">
-|;
-
-  if ($form->{type} eq 'ship_order') {
-    print qq|
-<input class=submit type=submit name=action value="|
-      . $locale->text('Ship to') . qq|">
-<input class=submit type=submit name=action value="|
-      . $locale->text('E-mail') . qq|">
-|;
-  }
-
-  print qq|
-
-<input class=submit type=submit name=action value="|
-    . $locale->text('Done') . qq|">
-
-<input type=hidden name=rowcount value=$form->{rowcount}>
-
-<input name=callback type=hidden value="$callback">
-
-<input type=hidden name=path value=$form->{path}>
-<input type=hidden name=login value=$form->{login}>
-<input type=hidden name=password value=$form->{password}>
-
-</form>
-
-</body>
-</html>
-|;
-
-  $lxdebug->leave_sub();
-}
-
-sub done {
-  $lxdebug->enter_sub();
-
-  if ($form->{type} eq 'ship_order') {
-    $form->isblank("shippingdate", $locale->text('Shipping Date missing!'));
-  } else {
-    $form->isblank("shippingdate", $locale->text('Date received missing!'));
-  }
-
-  $total = 0;
-  map {
-    $total += $form->{"ship_$_"} =
-      $form->parse_amount(\%myconfig, $form->{"ship_$_"})
-  } (1 .. $form->{rowcount} - 1);
-
-  $form->error($locale->text('Nothing entered!')) unless $total;
-
-  $form->redirect($locale->text('Inventory saved!'))
-    if OE->save_inventory(\%myconfig, \%$form);
-  $form->error($locale->text('Could not save!'));
-
-  $lxdebug->leave_sub();
-}
-
-sub search_transfer {
-  $lxdebug->enter_sub();
-
-  OE->get_warehouses(\%myconfig, \%$form);
-
-  # warehouse
-  if (@{ $form->{all_warehouses} }) {
-    $form->{selectwarehouse} = "<option>\n";
-    $form->{warehouse}       = qq|$form->{warehouse}--$form->{warehouse_id}|;
-
-    map { $form->{selectwarehouse} .= "<option>$_->{description}--$_->{id}\n" }
-      (@{ $form->{all_warehouses} });
-  } else {
-    $form->error($locale->text('Nothing to transfer!'));
-  }
-
-  $form->{title} = $locale->text('Transfer Inventory');
-
-  $form->header;
-
-  print qq|
-<body>
-
-<form method=post action=$form->{script}>
-
-<table width=100%>
-  <tr>
-    <th class=listtop>$form->{title}</th>
-  </tr>
-  <tr height="5"></tr>
-  <tr>
-    <td>
-      <table>
-        <tr>
-          <th align=right nowrap>| . $locale->text('Transfer to') . qq|</th>
-          <td><select name=warehouse>$form->{selectwarehouse}</select></td>
-        </tr>
-	<tr>
-	  <th align="right" nowrap="true">| . $locale->text('Part Number') . qq|</th>
-	  <td><input name=partnumber size=20></td>
-	</tr>
-	<tr>
-	  <th align="right" nowrap="true">| . $locale->text('Description') . qq|</th>
-	  <td><input name=description size=40></td>
-	</tr>
-	<tr>
-	  <th align=right nowrap>| . $locale->text('Group') . qq|</th>
-	  <td><input name=partsgroup size=20></td>
-	</tr>
-      </table>
-    </td>
-  </tr>
-  <tr>
-    <td><hr size=3 noshade></td>
-  </tr>
-</table>
-
-<br>
-<input type=hidden name=sort value=partnumber>
-<input type=hidden name=nextsub value=list_transfer>
-
-<input type=hidden name=path value=$form->{path}>
-<input type=hidden name=login value=$form->{login}>
-<input type=hidden name=password value=$form->{password}>
-
-<input class=submit type=submit name=action value="|
-    . $locale->text('Continue') . qq|">
-</form>
-
-</body>
-</html>
-|;
-
-  $lxdebug->leave_sub();
-}
-
-sub list_transfer {
-  $lxdebug->enter_sub();
-
-  OE->get_inventory(\%myconfig, \%$form);
-
-  $partnumber  = $form->escape($form->{partnumber});
-  $warehouse   = $form->escape($form->{warehouse});
-  $description = $form->escape($form->{description});
-  $partsgroup  = $form->escape($form->{partsgroup});
-
-  # construct href
-  $href =
-    "$form->{script}?path=$form->{path}&action=list_transfer&partnumber=$partnumber&warehouse=$warehouse&description=$description&partsgroup=$partsgroup&login=$form->{login}&password=$form->{password}";
-
-  # construct callback
-  $partnumber  = $form->escape($form->{partnumber},  1);
-  $warehouse   = $form->escape($form->{warehouse},   1);
-  $description = $form->escape($form->{description}, 1);
-  $partsgroup  = $form->escape($form->{partsgroup},  1);
-
-  $callback =
-    "$form->{script}?path=$form->{path}&action=list_transfer&partnumber=$partnumber&warehouse=$warehouse&description=$description&partsgroup=$partsgroup&login=$form->{login}&password=$form->{password}";
-
-  @column_index =
-    $form->sort_columns(
-      qw(partnumber description partsgroup make model warehouse qty transfer));
-
-  $column_header{partnumber} =
-      qq|<th><a class=listheading href=$href&sort=partnumber>|
-    . $locale->text('Part Number')
-    . qq|</a></th>|;
-  $column_header{description} =
-      qq|<th><a class=listheading href=$href&sort=description>|
-    . $locale->text('Description')
-    . qq|</a></th>|;
-  $column_header{partsgroup} =
-      qq|<th><a class=listheading href=$href&sort=partsgroup>|
-    . $locale->text('Group')
-    . qq|</a></th>|;
-  $column_header{warehouse} =
-      qq|<th><a class=listheading href=$href&sort=warehouse>|
-    . $locale->text('From')
-    . qq|</a></th>|;
-  $column_header{qty} =
-    qq|<th><a class=listheading>| . $locale->text('Qty') . qq|</a></th>|;
-  $column_header{transfer} =
-    qq|<th><a class=listheading>| . $locale->text('Transfer') . qq|</a></th>|;
-
-  $option = $locale->text('Transfer to');
-
-  ($warehouse, $warehouse_id) = split /--/, $form->{warehouse};
-
-  if ($form->{warehouse}) {
-    $option .= " : $warehouse";
-  }
-  if ($form->{partnumber}) {
-    $option .= "\n<br>" if ($option);
-    $option .= $locale->text('Part Number') . " : $form->{partnumber}";
-  }
-  if ($form->{description}) {
-    $option .= "\n<br>" if ($option);
-    $option .= $locale->text('Description') . " : $form->{description}";
-  }
-  if ($form->{partsgroup}) {
-    $option .= "\n<br>" if ($option);
-    $option .= $locale->text('Group') . " : $form->{partsgroup}";
-  }
-
-  $form->{title} = $locale->text('Transfer Inventory');
-
-  $form->header;
-
-  print qq|
-<body>
-
-<form method=post action=$form->{script}>
-
-<input type=hidden name=warehouse_id value=$warehouse_id>
-
-<table width=100%>
-  <tr>
-    <th class=listtop>$form->{title}</th>
-  </tr>
-  <tr height="5"></tr>
-  <tr>
-    <td>$option</td>
-  </tr>
-  <tr>
-    <td>
-      <table width=100%>
-	<tr class=listheading>|;
-
-  map { print "\n$column_header{$_}" } @column_index;
-
-  print qq|
-	</tr>
-|;
-
-  if (@{ $form->{all_inventory} }) {
-    $sameitem = $form->{all_inventory}->[0]->{ $form->{sort} };
-  }
-
-  $i = 0;
-  foreach $ref (@{ $form->{all_inventory} }) {
-
-    $i++;
-
-    $column_data{partnumber} =
-      qq|<td><input type=hidden name="id_$i" value=$ref->{id}>$ref->{partnumber}</td>|;
-    $column_data{description} = "<td>$ref->{description}&nbsp;</td>";
-    $column_data{partsgroup}  = "<td>$ref->{partsgroup}&nbsp;</td>";
-    $column_data{warehouse}   =
-      qq|<td><input type=hidden name="warehouse_id_$i" value=$ref->{warehouse_id}>$ref->{warehouse}&nbsp;</td>|;
-    $column_data{qty} =
-        qq|<td><input type=hidden name="qty_$i" value=$ref->{qty}>|
-      . $form->format_amount(\%myconfig, $ref->{qty}, $dec_qty)
-      . qq|</td>|;
-    $column_data{transfer} = qq|<td><input name="transfer_$i" size=4></td>|;
-
-    $j++;
-    $j %= 2;
-    print "
-        <tr class=listrow$j>";
-
-    map { print "\n$column_data{$_}" } @column_index;
-
-    print qq|
-	</tr>
-|;
-
-  }
-
-  print qq|
-      </table>
-    </td>
-  </tr>
-
-  <tr>
-    <td><hr size=3 noshade></td>
-  </tr>
-</table>
-
-<br>
-
-<input name=callback type=hidden value="$callback">
-
-<input type=hidden name=rowcount value=$i>
-
-<input type=hidden name=path value=$form->{path}>
-<input type=hidden name=login value=$form->{login}>
-<input type=hidden name=password value=$form->{password}>
-
-<input class=submit type=submit name=action value="|
-    . $locale->text('Transfer') . qq|">
-
-</form>
-
-</body>
-</html>
-|;
-
-  $lxdebug->leave_sub();
-}
-
-sub transfer {
-  $lxdebug->enter_sub();
-
-  $form->redirect($locale->text('Inventory transferred!'))
-    if OE->transfer(\%myconfig, \%$form);
-  $form->error($locale->text('Could not transfer Inventory!'));
-
-  $lxdebug->leave_sub();
-}
diff --git a/locale/de/all b/locale/de/all
index eaa07aa51..280997aa2 100644
--- a/locale/de/all
+++ b/locale/de/all
@@ -144,7 +144,6 @@ aktualisieren wollen?',
   'Article Code'                => 'Artikelkürzel',
   'Article Code missing!'       => 'Artikelkürzel fehlt',
   'Assemblies'                  => 'Erzeugnisse',
-  'Assemblies restocked!'       => 'Erzeugnisse sind im Lager!',
   'Assembly Number missing!'    => 'Erzeugnisnummer fehlt!',
   'Asset'                       => 'Aktiva/Mittelverwendung',
   'Assign new units'            => 'Neue Einheiten zuweisen',
@@ -235,7 +234,6 @@ aktualisieren wollen?',
   'Cannot save order!'          => 'Auftrag kann nicht gespeichert werden!',
   'Cannot save preferences!'    => 'Benutzereinstellungen können nicht gespeichert werden!',
   'Cannot save quotation!'      => 'Angebot kann nicht gespeichert werden!',
-  'Cannot stock assemblies!'    => 'Erzeugnisse können nicht ins Lager!',
   'Cannot storno storno invoice!' => 'Kann eine Stornorechnung nicht stornieren',
   'Cash'                        => 'Zahlungsverkehr',
   'Cc'                          => 'Cc',
@@ -281,8 +279,6 @@ aktualisieren wollen?',
   'Could not create dunning copy!' => '',
   'Could not open the file users/members.' => 'Die Datei &quot;users/members&quot; konnte nicht ge&ouml;ffnet werden.',
   'Could not rename %s to %s. Reason: %s' => 'Die Datei &quot;%s&quot; konnte nicht in &quot;%s&quot; umbenannt werden. Grund: %s',
-  'Could not save!'             => 'Konnte nicht speichern!',
-  'Could not transfer Inventory!' => 'Konnte Waren nicht umlagern!',
   'Could not update prices!'    => 'Preise konnten nicht aktualisiert werden!',
   'Country'                     => 'Land',
   'Create Buchungsgruppen'      => 'Buchungsgruppe erfassen',
@@ -334,9 +330,7 @@ aktualisieren wollen?',
   'Date'                        => 'Datum',
   'Date Format'                 => 'Datumsformat',
   'Date Paid'                   => 'Zahlungsdatum',
-  'Date Received'               => 'Empfangsdatum',
   'Date missing!'               => 'Datum fehlt!',
-  'Date received missing!'      => 'Empfangsdatum fehlt!',
   'Datenträgernummer'           => 'Datenträgernummer',
   'Datev'                       => '',
   'Datum von'                   => 'Datum von',
@@ -556,8 +550,6 @@ gestartet',
   'Inventory Account'           => 'Warenbestand',
   'Inventory quantity must be zero before you can set this assembly obsolete!' => 'Bevor dieses Erzeugnis als ungültig markiert werden kann, muß das Inventar auf Null sein!',
   'Inventory quantity must be zero before you can set this part obsolete!' => 'Bevor diese Ware als ungültig markiert werden kann, muß das Inventar Null sein!',
-  'Inventory saved!'            => 'Inventar gespeichert.',
-  'Inventory transferred!'      => 'Inventar umgelagert.',
   'Invetory'                    => 'Inventar',
   'Invno.'                      => 'Rg. Nr.',
   'Invnumber'                   => 'Rechnungsnummer',
@@ -701,10 +693,8 @@ gestartet',
   'Not Discountable'            => 'Nicht rabattierfähig',
   'Not delivered'               => 'Nicht geliefert',
   'Notes'                       => 'Bemerkungen',
-  'Nothing entered!'            => 'Es wurde nichts eingegeben.',
   'Nothing selected!'           => 'Es wurde nichts ausgewählt!',
   'Nothing to delete!'          => 'Es konnte nichts gelöscht werden!',
-  'Nothing to transfer!'        => 'Es gibt nichts zum Umlagern!',
   'Nov'                         => 'Nov',
   'November'                    => 'November',
   'Now the user must select a single Buchungsgruppe for each part instead of three distinct accounts.' => 'Der Benutzer muss nun f&uuml;r jeden Artikel nur noch die Buchungsgruppe anstelle der drei einzelnen Konten ausw&auml;hlen.',
@@ -856,12 +846,10 @@ gestartet',
   'RFQs'                        => 'Anfragen',
   'ROP'                         => 'Mindestlagerbestand',
   'Rate'                        => 'Rate',
-  'Recd'                        => 'erhalten',
   'Receipt'                     => 'Zahlungseingang',
   'Receipt posted!'             => 'Beleg gebucht!',
   'Receipts'                    => 'Zahlungseingänge',
   'Receivables'                 => 'Forderungen',
-  'Receive Merchandise'         => 'Waren einlagern',
   'Reconciliation'              => 'Kontenabgleich',
   'Record in'                   => 'Buchen auf',
   'Reference'                   => 'Referenz',
@@ -930,13 +918,10 @@ gestartet',
   'Setup Menu'                  => 'Menüsetup',
   'Setup Templates'             => 'Vorlagen auswählen',
   'Ship'                        => 'Lagerausgang',
-  'Ship Merchandise'            => 'Waren versenden',
   'Ship rcvd'                   => 'Lagereingang',
   'Ship to'                     => 'Lieferadresse',
   'Ship via'                    => 'Transportmittel',
   'Shipping Address'            => 'Lieferadresse',
-  'Shipping Date'               => 'Lieferdatum',
-  'Shipping Date missing!'      => 'Lieferdatum fehlt.',
   'Shipping Point'              => 'Versandort',
   'Shipto'                      => 'Lieferanschriften',
   'Shopartikel'                 => 'Shopartikel',
@@ -964,7 +949,6 @@ gestartet',
   'Step 3 of 3: Default units'  => 'Schritt 3 von 3: Standardeinheiten',
   'Steuersatz'                  => 'Steuersatz',
   'Stock'                       => 'einlagern',
-  'Stock Assembly'              => 'Erzeugnis einlagern',
   'Storno'                      => 'Storno',
   'Storno (one letter abbreviation)' => 'S',
   'Storno Invoice'              => 'Stornorechnung',
@@ -1061,9 +1045,6 @@ gestartet',
   'Transaction posted!'         => 'Buchung verbucht!',
   'Transaction reversal enforced for all dates' => 'Fehleintragungen müssen für jeden Zeitraum mit einer Kontraeintragung ausgebessert werden',
   'Transaction reversal enforced up to' => 'Fehleintragungen können bis zu dem angegebenen Zeitraum nur mit einer Kontraeintragung ausgebessert werden!',
-  'Transfer'                    => 'Umlagerung',
-  'Transfer Inventory'          => 'Ware umlagern',
-  'Transfer to'                 => 'umlagern nach',
   'Translation (%s)'            => '&Uuml;bersetzung (%s)',
   'Trial Balance'               => 'Saldenbilanz',
   'Type'                        => 'Typ',
diff --git a/locale/de/ic b/locale/de/ic
index 18d1b1dd3..3e9677326 100644
--- a/locale/de/ic
+++ b/locale/de/ic
@@ -18,7 +18,6 @@ $self->{texts} = {
   'Are you sure you want to update the prices' => 'Sind Sie sicher, dass Sie die Preise 
 aktualisieren wollen?',
   'Assemblies'                  => 'Erzeugnisse',
-  'Assemblies restocked!'       => 'Erzeugnisse sind im Lager!',
   'Assembly Number missing!'    => 'Erzeugnisnummer fehlt!',
   'Attachment'                  => 'als Anhang',
   'Attachment name'             => 'Name des Anhangs',
@@ -32,7 +31,6 @@ aktualisieren wollen?',
   'Bought'                      => 'Gekauft',
   'Buchungsgruppe'              => 'Buchungsgruppe',
   'Cannot delete item!'         => 'Artikel kann nicht gelöscht werden!',
-  'Cannot stock assemblies!'    => 'Erzeugnisse können nicht ins Lager!',
   'Cc'                          => 'Cc',
   'City'                        => 'Stadt',
   'Company Name'                => 'Firmenname',
@@ -204,7 +202,6 @@ aktualisieren wollen?',
   'Show details'                => 'Details anzeigen',
   'Sold'                        => 'Verkauft',
   'Stock'                       => 'einlagern',
-  'Stock Assembly'              => 'Erzeugnis einlagern',
   'Storno Invoice'              => 'Stornorechnung',
   'Storno Packing List'         => 'Stornolieferschein',
   'Street'                      => 'Straße',
@@ -274,7 +271,6 @@ $self->{subs} = {
   'item_selected'               => 'item_selected',
   'link_part'                   => 'link_part',
   'list'                        => 'list',
-  'list_assemblies'             => 'list_assemblies',
   'makemodel_row'               => 'makemodel_row',
   'new_item'                    => 'new_item',
   'new_license'                 => 'new_license',
@@ -292,7 +288,6 @@ $self->{subs} = {
   'reformat_numbers'            => 'reformat_numbers',
   'relink_accounts'             => 'relink_accounts',
   'request_for_quotation'       => 'request_for_quotation',
-  'restock_assemblies'          => 'restock_assemblies',
   'restore_form'                => 'restore_form',
   'save'                        => 'save',
   'save_as_new'                 => 'save_as_new',
@@ -309,7 +304,6 @@ $self->{subs} = {
   'set_longdescription'         => 'set_longdescription',
   'set_pricegroup'              => 'set_pricegroup',
   'ship_to'                     => 'ship_to',
-  'stock_assembly'              => 'stock_assembly',
   'top100'                      => 'top100',
   'update'                      => 'update',
   'update_prices'               => 'update_prices',
diff --git a/locale/de/oe b/locale/de/oe
index 8523d1218..ea39d6fec 100644
--- a/locale/de/oe
+++ b/locale/de/oe
@@ -44,8 +44,6 @@ $self->{texts} = {
   'Contact Person'              => 'Ansprechpartner',
   'Continue'                    => 'Weiter',
   'Copies'                      => 'Kopien',
-  'Could not save!'             => 'Konnte nicht speichern!',
-  'Could not transfer Inventory!' => 'Konnte Waren nicht umlagern!',
   'Country'                     => 'Land',
   'Credit Limit'                => 'Kreditlimit',
   'Credit Limit exceeded!!!'    => 'Kreditlimit überschritten!',
@@ -58,8 +56,6 @@ $self->{texts} = {
   'Customer missing!'           => 'Kundenname fehlt!',
   'Customer not on file!'       => 'Kunde ist nicht in der Datenbank!',
   'Date'                        => 'Datum',
-  'Date Received'               => 'Empfangsdatum',
-  'Date received missing!'      => 'Empfangsdatum fehlt!',
   'Dec'                         => 'Dez',
   'December'                    => 'Dezember',
   'Delete'                      => 'Löschen',
@@ -68,7 +64,6 @@ $self->{texts} = {
   'Department'                  => 'Abteilung',
   'Description'                 => 'Beschreibung',
   'Discount'                    => 'Rabatt',
-  'Done'                        => 'Fertig',
   'Dunning Amount'              => 'gemahnter Betrag',
   'E-mail'                      => 'eMail',
   'E-mail address missing!'     => 'E-Mail-Adresse fehlt!',
@@ -96,8 +91,6 @@ $self->{texts} = {
   'In-line'                     => 'im Text',
   'Include in Report'           => 'In Bericht aufnehmen',
   'Internal Notes'              => 'interne Bemerkungen',
-  'Inventory saved!'            => 'Inventar gespeichert.',
-  'Inventory transferred!'      => 'Inventar umgelagert.',
   'Invoice'                     => 'Rechnung',
   'Invoice Date missing!'       => 'Rechnungsdatum fehlt!',
   'Invoice Number missing!'     => 'Rechnungsnummer fehlt!',
@@ -126,8 +119,6 @@ $self->{texts} = {
   'No.'                         => 'Position',
   'Not delivered'               => 'Nicht geliefert',
   'Notes'                       => 'Bemerkungen',
-  'Nothing entered!'            => 'Es wurde nichts eingegeben.',
-  'Nothing to transfer!'        => 'Es gibt nichts zum Umlagern!',
   'Nov'                         => 'Nov',
   'November'                    => 'November',
   'Number'                      => 'Nummer',
@@ -181,8 +172,6 @@ $self->{texts} = {
   'Quotations'                  => 'Angebote',
   'RFQ'                         => 'Anfrage',
   'RFQ Number'                  => 'Anfragenummer',
-  'Recd'                        => 'erhalten',
-  'Receive Merchandise'         => 'Waren einlagern',
   'Remaining'                   => 'Rest',
   'Reqdate'                     => 'Lieferdatum',
   'Request for Quotation'       => 'Anfrage',
@@ -208,13 +197,10 @@ $self->{texts} = {
   'Serial No.'                  => 'Seriennummer',
   'Service'                     => 'Dienstleistung',
   'Ship'                        => 'Lagerausgang',
-  'Ship Merchandise'            => 'Waren versenden',
   'Ship rcvd'                   => 'Lagereingang',
   'Ship to'                     => 'Lieferadresse',
   'Ship via'                    => 'Transportmittel',
   'Shipping Address'            => 'Lieferadresse',
-  'Shipping Date'               => 'Lieferdatum',
-  'Shipping Date missing!'      => 'Lieferdatum fehlt.',
   'Shipping Point'              => 'Versandort',
   'Show details'                => 'Details anzeigen',
   'Steuersatz'                  => 'Steuersatz',
@@ -228,9 +214,6 @@ $self->{texts} = {
   'To'                          => 'An',
   'Total'                       => 'Summe',
   'Trade Discount'              => 'Rabatt',
-  'Transfer'                    => 'Umlagerung',
-  'Transfer Inventory'          => 'Ware umlagern',
-  'Transfer to'                 => 'umlagern nach',
   'Unit'                        => 'Einheit',
   'Update'                      => 'Erneuern',
   'Valid until'                 => 'gültig bis',
@@ -278,8 +261,6 @@ $self->{subs} = {
   'delivery_customer_selection' => 'delivery_customer_selection',
   'display_form'                => 'display_form',
   'display_row'                 => 'display_row',
-  'display_ship_receive'        => 'display_ship_receive',
-  'done'                        => 'done',
   'e_mail'                      => 'e_mail',
   'edit'                        => 'edit',
   'employee_selection_internal' => 'employee_selection_internal',
@@ -290,7 +271,6 @@ $self->{subs} = {
   'invoice'                     => 'invoice',
   'invoicetotal'                => 'invoicetotal',
   'item_selected'               => 'item_selected',
-  'list_transfer'               => 'list_transfer',
   'name_selected'               => 'name_selected',
   'new_item'                    => 'new_item',
   'new_license'                 => 'new_license',
@@ -320,7 +300,6 @@ $self->{subs} = {
   'save_exchangerate'           => 'save_exchangerate',
   'save_form'                   => 'save_form',
   'search'                      => 'search',
-  'search_transfer'             => 'search_transfer',
   'select_employee'             => 'select_employee',
   'select_employee_internal'    => 'select_employee_internal',
   'select_item'                 => 'select_item',
@@ -333,10 +312,8 @@ $self->{subs} = {
   'set_headings'                => 'set_headings',
   'set_longdescription'         => 'set_longdescription',
   'set_pricegroup'              => 'set_pricegroup',
-  'ship_receive'                => 'ship_receive',
   'ship_to'                     => 'ship_to',
   'subtotal'                    => 'subtotal',
-  'transfer'                    => 'transfer',
   'update'                      => 'update',
   'validate_items'              => 'validate_items',
   'vendor_details'              => 'vendor_details',
@@ -346,7 +323,6 @@ $self->{subs} = {
   'erfassen'                    => 'add',
   'weiter'                      => 'continue',
   'löschen'                     => 'delete',
-  'fertig'                      => 'done',
   'email'                       => 'e_mail',
   'rechnung'                    => 'invoice',
   'auftrag'                     => 'order',
@@ -359,7 +335,6 @@ $self->{subs} = {
   'speichern_und_schließen'     => 'save_and_close',
   'als_neu_speichern'           => 'save_as_new',
   'lieferadresse'               => 'ship_to',
-  'umlagerung'                  => 'transfer',
   'erneuern'                    => 'update',
   'ja'                          => 'yes',
 };
diff --git a/menu.ini b/menu.ini
index 376bc97c0..b971c0128 100644
--- a/menu.ini
+++ b/menu.ini
@@ -176,27 +176,6 @@ module=oe.pl
 action=search
 type=request_quotation
 
-# Mehrlagerfähigkeit noch nicht implementiert
-# [Shipping]
-# 
-# [Shipping--Stock Assembly]
-# module=ic.pl
-# action=stock_assembly
-# 
-# [Shipping--Ship]
-# module=oe.pl
-# action=search
-# type=ship_order
-# 
-# [Shipping--Receive]
-# module=oe.pl
-# action=search
-# type=receive_order
-# 
-# [Shipping--Transfer]
-# module=oe.pl
-# action=search_transfer
-
 
 
 [General Ledger]