Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision 8cd9ac14

Von Werner Hahn vor etwa 1 Jahr hinzugefügt

  • ID 8cd9ac14ce51d5df52538f34032a4b90dbd60427
  • Vorgänger 2e5114e8
  • Nachfolger 1a270fdd

Fix #580 Umlagern

Unterschiede anzeigen:

SL/WH.pm
269 269

  
270 270
  # if of a property number or description is requested,
271 271
  # automatically check the matching id too.
272
  map { $form->{"l_${_}id"} = "Y" if ($form->{"l_${_}description"} || $form->{"l_${_}number"}); } qw(warehouse bin);
272
  map { $form->{"l_${_}id"} = "Y" if ($form->{"l_${_}"} || $form->{"l_${_}number"}); } qw(warehouse bin);
273 273

  
274 274
  # customize shown entry for not available fields.
275 275
  $filter{na} = '-' unless $filter{na};
......
319 319
  }
320 320

  
321 321
  $select_tokens{'trans'} = {
322
     "parts_id"             => "i1.parts_id",
323
     "qty"                  => "ABS(SUM(i1.qty))",
324
     "partnumber"           => "p.partnumber",
325
     "partdescription"      => "p.description",
326
     "classification_id"    => "p.classification_id",
327
     "part_type"            => "p.part_type",
328
     "bindescription"       => "b.description",
329
     "chargenumber"         => "i1.chargenumber",
330
     "bestbefore"           => "i1.bestbefore",
331
     "warehousedescription" => "w.description",
332
     "partunit"             => "p.unit",
333
     "bin_from"             => "b1.description",
334
     "bin_to"               => "b2.description",
335
     "warehouse_from"       => "w1.description",
336
     "warehouse_to"         => "w2.description",
337
     "comment"              => "i1.comment",
338
     "trans_type"           => "tt.description",
339
     "trans_id"             => "i1.trans_id",
340
     "id"                   => "i1.id",
341
     "oe_id"                => "COALESCE(i1.oe_id, i2.oe_id)",
342
     "invoice_id"           => "COALESCE(i1.invoice_id, i2.invoice_id)",
343
     "date"                 => "i1.shippingdate",
344
     "itime"                => "i1.itime",
345
     "shippingdate"         => "i1.shippingdate",
346
     "employee"             => "e.name",
347
     "projectnumber"        => "COALESCE(pr.projectnumber, '$filter{na}')",
322
     "parts_id"          => "i1.parts_id",
323
     "qty"               => "ABS(SUM(i1.qty))",
324
     "partnumber"        => "p.partnumber",
325
     "partdescription"   => "p.description",
326
     "classification_id" => "p.classification_id",
327
     "part_type"         => "p.part_type",
328
     "bin"               => "b.description",
329
     "chargenumber"      => "i1.chargenumber",
330
     "bestbefore"        => "i1.bestbefore",
331
     "warehouse"         => "w.description",
332
     "partunit"          => "p.unit",
333
     "bin_from"          => "b1.description",
334
     "bin_to"            => "b2.description",
335
     "warehouse_from"    => "w1.description",
336
     "warehouse_to"      => "w2.description",
337
     "comment"           => "i1.comment",
338
     "trans_type"        => "tt.description",
339
     "trans_id"          => "i1.trans_id",
340
     "id"                => "i1.id",
341
     "oe_id"             => "COALESCE(i1.oe_id, i2.oe_id)",
342
     "invoice_id"        => "COALESCE(i1.invoice_id, i2.invoice_id)",
343
     "date"              => "i1.shippingdate",
344
     "itime"             => "i1.itime",
345
     "shippingdate"      => "i1.shippingdate",
346
     "employee"          => "e.name",
347
     "projectnumber"     => "COALESCE(pr.projectnumber, '$filter{na}')",
348 348
     };
349 349

  
350 350
  $select_tokens{'out'} = {
......
597 597

  
598 598
  # if of a property number or description is requested,
599 599
  # automatically check the matching id too.
600
  map { $form->{"l_${_}id"} = "Y" if ($form->{"l_${_}description"} || $form->{"l_${_}number"}); } qw(warehouse bin);
600
  map { $form->{"l_${_}id"} = "Y" if ($form->{"l_${_}"} || $form->{"l_${_}number"}); } qw(warehouse bin);
601 601

  
602 602
  # make order, search in $filter and $form
603 603
  my $sort_col    =  $form->{sort};

Auch abrufbar als: Unified diff