Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision ad033a76

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

  • ID ad033a768bbe46566afa159008c42ff7fc6bb35a
  • Vorgänger e8966d20
  • Nachfolger 8dc4cef2

surplus: Erfassungsdatum bei Stammdatensuche Waren/Dienstleistungen/Erzeugnisse ...

... im Bericht anzeigen und danach filtern.

Conflicts:

SL/IC.pm
bin/mozilla/ic.pl
templates/webpages/ic/search.html

Übernahme aus Kundenprojekt.

Unterschiede anzeigen:

SL/IC.pm
744 744
  my @apoe_filters         = qw(transdate);
745 745
  my @like_filters         = (@simple_filters, @invoice_oi_filters);
746 746
  my @all_columns          = (@simple_filters, @makemodel_filters, @apoe_filters, @project_filters, qw(serialnumber));
747
  my @simple_l_switches    = (@all_columns, qw(notes listprice sellprice lastcost priceupdate weight unit rop image shop));
747
  my @simple_l_switches    = (@all_columns, qw(notes listprice sellprice lastcost priceupdate weight unit rop image shop insertdate));
748 748
  my @oe_flags             = qw(bought sold onorder ordered rfq quoted);
749 749
  my @qsooqr_flags         = qw(invnumber ordnumber quonumber trans_id name module qty);
750 750
  my @deliverydate_flags   = qw(deliverydate);
......
820 820
    'ioi.id'       => 'ioi_id',
821 821
    'ioi.ioi'      => 'ioi',
822 822
    'projectdescription' => 'projectdescription',
823
    'insertdate'   => 'insertdate',
823 824
  );
824 825

  
825 826
  my %real_column = (
826 827
    projectdescription => 'description',
828
    insertdate         => 'itime::DATE',
827 829
  );
828 830

  
829 831
  if (($form->{searchitems} eq 'assembly') && $form->{l_lastcost}) {
......
864 866
    }
865 867
  }
866 868

  
869
  # special case insertdate
870
  if (grep { $form->{$_} } qw(insertdatefrom insertdateto)) {
871
    $form->{"l_insertdate"} = 1;
872
    push @select_tokens, 'insertdate';
873

  
874
    my $token_builder = $make_token_builder->();
875
    my $token = $token_builder->('insertdate');
876

  
877
    for (qw(insertdatefrom insertdateto)) {
878
      next unless $form->{$_};
879
      push @where_tokens, sprintf "$token %s ?", /from$/ ? '>=' : '<=';
880
      push @bind_vars,    $form->{$_};
881
    }
882
  }
883

  
867 884
  if ($form->{"partsgroup_id"}) {
868 885
    $form->{"l_partsgroup"} = '1'; # show the column
869 886
    push @where_tokens, "pg.id = ?";
......
997 1014

  
998 1015
  my $token_builder = $make_token_builder->(\%joins_needed);
999 1016

  
1000
  my @sort_cols    = (@simple_filters, qw(id priceupdate onhand invnumber ordnumber quonumber name serialnumber soldtotal deliverydate shop));
1017
  my @sort_cols    = (@simple_filters, qw(id priceupdate onhand invnumber ordnumber quonumber name serialnumber soldtotal deliverydate insertdate shop));
1001 1018
     $form->{sort} = 'id' unless grep { $form->{"l_$_"} } grep { $form->{sort} eq $_ } @sort_cols; # sort by id if unknown or invisible column
1002 1019
  my $sort_order   = ($form->{revers} ? ' DESC' : ' ASC');
1003 1020
  my $order_clause = " ORDER BY " . $token_builder->($form->{sort}) . ($form->{revers} ? ' DESC' : ' ASC');
......
1055 1072
  if ($form->{searchitems} eq 'assembly' && $form->{bom}) {
1056 1073
    $query =
1057 1074
      qq|SELECT p.id, p.partnumber, p.description, a.qty AS onhand,
1058
           p.unit, p.notes,
1075
           p.unit, p.notes, p.itime::DATE as insertdate,
1059 1076
           p.sellprice, p.listprice, p.lastcost,
1060 1077
           p.rop, p.weight, p.priceupdate,
1061 1078
           p.image, p.drawing, p.microfiche,

Auch abrufbar als: Unified diff