Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision 22a52f84

Von Bernd Bleßmann vor etwa 9 Jahren hinzugefügt

  • ID 22a52f84da5686ecce3a55cd4c4ab2ecabab1d9c
  • Vorgänger 9052a048
  • Nachfolger 8bf3fee4

Stammdaten->Berichte->Waren: Nach Shopartikel filtern und anzeigen können.

Unterschiede anzeigen:

SL/IC.pm
730 730
  my @apoe_filters         = qw(transdate);
731 731
  my @like_filters         = (@simple_filters, @invoice_oi_filters);
732 732
  my @all_columns          = (@simple_filters, @makemodel_filters, @apoe_filters, @project_filters, qw(serialnumber));
733
  my @simple_l_switches    = (@all_columns, qw(notes listprice sellprice lastcost priceupdate weight unit rop image));
733
  my @simple_l_switches    = (@all_columns, qw(notes listprice sellprice lastcost priceupdate weight unit rop image shop));
734 734
  my @oe_flags             = qw(bought sold onorder ordered rfq quoted);
735 735
  my @qsooqr_flags         = qw(invnumber ordnumber quonumber trans_id name module qty);
736 736
  my @deliverydate_flags   = qw(deliverydate);
......
856 856
    push @bind_vars, $form->{"partsgroup_id"};
857 857
  }
858 858

  
859
  if ($form->{shop} ne '') {
860
    $form->{l_shop} = '1'; # show the column
861
    if ($form->{shop} eq '0' || $form->{shop} eq 'f') {
862
      push @where_tokens, 'NOT p.shop';
863
      $form->{shop} = 'f';
864
    } else {
865
      push @where_tokens, 'p.shop';
866
    }
867
  }
868

  
859 869
  foreach (@like_filters) {
860 870
    next unless $form->{$_};
861 871
    $form->{"l_$_"} = '1'; # show the column
......
973 983

  
974 984
  my $token_builder = $make_token_builder->(\%joins_needed);
975 985

  
976
  my @sort_cols    = (@simple_filters, qw(id priceupdate onhand invnumber ordnumber quonumber name serialnumber soldtotal deliverydate));
986
  my @sort_cols    = (@simple_filters, qw(id priceupdate onhand invnumber ordnumber quonumber name serialnumber soldtotal deliverydate shop));
977 987
     $form->{sort} = 'id' unless grep { $form->{"l_$_"} } grep { $form->{sort} eq $_ } @sort_cols; # sort by id if unknown or invisible column
978 988
  my $sort_order   = ($form->{revers} ? ' DESC' : ' ASC');
979 989
  my $order_clause = " ORDER BY " . $token_builder->($form->{sort}) . ($form->{revers} ? ' DESC' : ' ASC');

Auch abrufbar als: Unified diff