Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision a3153d12

Von Bernd Bleßmann vor mehr als 1 Jahr hinzugefügt

  • ID a3153d12a218af986fdbeacf807a2500d03b0580
  • Vorgänger 64dc1c9b
  • Nachfolger 0392970d

Lagerstandsbericht: Export/keys für "für Import kompatibel machen" anpassen

Behebt #558 (redmine)

Unterschiede anzeigen:

SL/WH.pm
625 625
     "partdescription"      => "p.description",
626 626
     "classification_id"    => "p.classification_id",
627 627
     "part_type"            => "p.part_type",
628
     "bindescription"       => "b.description",
628
     "bin"                  => "b.description",
629 629
     "binid"                => "b.id",
630 630
     "chargenumber"         => "i.chargenumber",
631 631
     "bestbefore"           => "i.bestbefore",
632 632
     "ean"                  => "p.ean",
633 633
     "chargeid"             => "c.id",
634
     "warehousedescription" => "w.description",
634
     "warehouse"            => "w.description",
635 635
     "partunit"             => "p.unit",
636 636
     "stock_value"          => ($form->{stock_value_basis} // '') eq 'list_price' ? "p.listprice / COALESCE(pfac.factor, 1)" : "p.lastcost / COALESCE(pfac.factor, 1)",
637 637
     "purchase_price"       => "p.lastcost",
......
721 721
  if ($form->{include_empty_bins}) {
722 722
    $query =
723 723
      qq|SELECT
724
           w.id AS warehouseid, w.description AS warehousedescription,
725
           b.id AS binid, b.description AS bindescription
724
           w.id AS warehouseid, w.description AS warehouse,
725
           b.id AS binid, b.description AS bin
726 726
         FROM bin b
727 727
         LEFT JOIN warehouse w ON (b.warehouse_id = w.id)|;
728 728

  
......
745 745
    }
746 746
    $sth->finish();
747 747

  
748
    if (grep { $orderby eq $_ } qw(bindescription warehousedescription)) {
748
    if (grep { $orderby eq $_ } qw(bin warehouse)) {
749 749
      @contents = sort { ($a->{$orderby} cmp $b->{$orderby}) * (($form->{order}) ? 1 : -1) } @contents;
750 750
    }
751 751
  }

Auch abrufbar als: Unified diff