X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FWH.pm;h=df5bad90935c0d8451a5a65489d17a615f6c3687;hb=33da73f7fed5dff643a1cedc33cff14829afd9cc;hp=eaba55332cf5f352398a19300ac73166ea3864c0;hpb=5067d7bd31514962af9730b33323b831d87164f8;p=kivitendo-erp.git

diff --git a/SL/WH.pm b/SL/WH.pm
index eaba55332..df5bad909 100644
--- a/SL/WH.pm
+++ b/SL/WH.pm
@@ -25,7 +25,8 @@
 # GNU General Public License for more details.
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+# MA 02110-1335, USA.
 #======================================================================
 #
 #  Warehouse module
@@ -432,8 +433,7 @@ sub get_warehouse_journal {
      "partnumber"           => "p.partnumber",
      "partdescription"      => "p.description",
      "classification_id"    => "p.classification_id",
-     "assembly"             => "p.assembly",
-     "inventory_accno_id"   => "p.inventory_accno_id",
+     "part_type"            => "p.part_type",
      "bindescription"       => "b.description",
      "chargenumber"         => "i1.chargenumber",
      "bestbefore"           => "i1.bestbefore",
@@ -466,8 +466,6 @@ sub get_warehouse_journal {
      };
 
   $form->{l_classification_id}  = 'Y';
-  $form->{l_assembly}           = 'Y';
-  $form->{l_inventory_accno_id} = 'Y';
   $form->{l_invoice_id} = $form->{l_oe_id} if $form->{l_oe_id};
 
   # build the select clauses.
@@ -755,8 +753,7 @@ sub get_warehouse_report {
      "partnumber"           => "p.partnumber",
      "partdescription"      => "p.description",
      "classification_id"    => "p.classification_id",
-     "assembly"             => "p.assembly",
-     "inventory_accno_id"   => "p.inventory_accno_id",
+     "part_type"            => "p.part_type",
      "bindescription"       => "b.description",
      "binid"                => "b.id",
      "chargenumber"         => "i.chargenumber",
@@ -768,8 +765,8 @@ sub get_warehouse_report {
      "stock_value"          => "p.lastcost / COALESCE(pfac.factor, 1)",
   );
   $form->{l_classification_id}  = 'Y';
-  $form->{l_assembly}           = 'Y';
-  $form->{l_inventory_accno_id} = 'Y';
+  $form->{l_part_type}          = 'Y';
+
   my $select_clause = join ', ', map { +/^l_/; "$select_tokens{$'} AS $'" }
         ( grep( { !/qty/ and /^l_/ and $form->{$_} eq 'Y' } keys %$form),
           qw(l_parts_id l_qty l_partunit) );