Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision a3153d12

Von Bernd Bleßmann vor fast 2 Jahren 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
  }
bin/mozilla/wh.pl
871 871
  my $sort_col     = $form->{sort};
872 872

  
873 873
  my %filter;
874
  my @columns = qw(warehousedescription bindescription partnumber type_and_classific partdescription chargenumber bestbefore comment qty partunit list_price purchase_price stock_value);
874
  my @columns = qw(warehouse bin partnumber type_and_classific partdescription chargenumber bestbefore comment qty partunit list_price purchase_price stock_value);
875 875

  
876 876
  # filter stuff
877 877
  map { $filter{$_} = $form->{$_} if ($form->{$_}) } qw(warehouse_id bin_id classification_id partnumber description partsgroup_id chargenumber bestbefore date include_invalid_warehouses);
......
949 949
  push @columns, map { "cvar_$_->{name}" } @includeable_custom_variables;
950 950

  
951 951
  my @hidden_variables = map { "l_${_}" } @columns;
952
  push @hidden_variables, qw(warehouse_id bin_id partnumber partstypes_id description partsgroup_id chargenumber bestbefore qty_op qty qty_unit partunit l_warehousedescription l_bindescription);
952
  push @hidden_variables, qw(warehouse_id bin_id partnumber partstypes_id description partsgroup_id chargenumber bestbefore qty_op qty qty_unit partunit l_warehouse l_bin);
953 953
  push @hidden_variables, qw(include_empty_bins subtotal include_invalid_warehouses date);
954 954
  push @hidden_variables, qw(classification_id stock_value_basis allrows);
955 955
  push @hidden_variables, map({'cvar_'. $_->{name}}                                         @searchable_custom_variables);
......
958 958
  push @hidden_variables, map({'cvar_'. $_->{name} .'_qtyop'} grep({$_->{type} eq 'number'} @searchable_custom_variables));
959 959

  
960 960
  my %column_defs = (
961
    'warehousedescription' => { 'text' => $locale->text('Warehouse'), },
962
    'bindescription'       => { 'text' => $locale->text('Bin'), },
961
    'warehouse'            => { 'text' => $locale->text('Warehouse'), },
962
    'bin'                  => { 'text' => $locale->text('Bin'), },
963 963
    'partnumber'           => { 'text' => $locale->text('Part Number'), },
964 964
    'type_and_classific'   => { 'text' => $locale->text('Type'), },
965 965
    'partdescription'      => { 'text' => $locale->text('Part Description'), },
templates/design40_webpages/wh/report_filter.html
177 177
  <div class="list col">
178 178
    <h4>[% 'Warehouse & Article' | $T8 %]</h4>
179 179
    <div>
180
      <input name="l_warehousedescription" id="l_warehousedescription" type="checkbox" value="Y" checked>
181
      <label for="l_warehousedescription">[% 'Warehouse' | $T8 %]</label>
180
      <input name="l_warehouse" id="l_warehouse" type="checkbox" value="Y" checked>
181
      <label for="l_warehouse">[% 'Warehouse' | $T8 %]</label>
182 182
    </div>
183 183
    <div>
184
      <input name="l_bindescription" id="l_bindescription" type="checkbox" value="Y" checked>
185
      <label for="l_bindescription">[% 'Bin' | $T8 %]</label>
184
      <input name="l_bin" id="l_bin" type="checkbox" value="Y" checked>
185
      <label for="l_bin">[% 'Bin' | $T8 %]</label>
186 186
    </div>
187 187
    <div>
188 188
      <input name="l_partnumber" id="l_partnumber" type="checkbox" value="Y" checked>
templates/webpages/wh/report_filter.html
184 184

  
185 185
      <table>
186 186
       <tr>
187
        <td align="right"><input name="l_warehousedescription" id="l_warehousedescription" class="checkbox" type="checkbox" value="Y" checked></td>
188
        <td nowrap><label for="l_warehousedescription">[% 'Warehouse' | $T8 %]</label></td>
189
        <td align="right"><input name="l_bindescription" id="l_bindescription" class="checkbox" type="checkbox" value="Y" checked></td>
190
        <td nowrap><label for="l_bindescription">[% 'Bin' | $T8 %]</label></td>
187
        <td align="right"><input name="l_warehouse" id="l_warehouse" class="checkbox" type="checkbox" value="Y" checked></td>
188
        <td nowrap><label for="l_warehouse">[% 'Warehouse' | $T8 %]</label></td>
189
        <td align="right"><input name="l_bin" id="l_bin" class="checkbox" type="checkbox" value="Y" checked></td>
190
        <td nowrap><label for="l_bin">[% 'Bin' | $T8 %]</label></td>
191 191
       </tr>
192 192

  
193 193
       <tr>

Auch abrufbar als: Unified diff