Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision 253a9323

Von Bernd Bleßmann vor mehr als 11 Jahren hinzugefügt

Verkauf->Berichte->Lieferscheine: Lieferdatum mit anzeigen lassen.

Unterschiede anzeigen:

SL/DO.pm
61 61
  my $vc = $form->{vc} eq "customer" ? "customer" : "vendor";
62 62

  
63 63
  my $query =
64
    qq|SELECT dord.id, dord.donumber, dord.ordnumber, dord.transdate,
64
    qq|SELECT dord.id, dord.donumber, dord.ordnumber,
65
         dord.transdate, dord.reqdate,
65 66
         ct.${vc}number, ct.name, dord.${vc}_id, dord.globalproject_id,
66 67
         dord.closed, dord.delivered, dord.shippingpoint, dord.shipvia,
67 68
         dord.transaction_description,
......
143 144

  
144 145
  my %allowed_sort_columns = (
145 146
    "transdate"               => "dord.transdate",
147
    "reqdate"                 => "dord.reqdate",
146 148
    "id"                      => "dord.id",
147 149
    "donumber"                => "dord.donumber",
148 150
    "ordnumber"               => "dord.ordnumber",
bin/mozilla/do.pl
489 489
  $form->{rowcount} = scalar @{ $form->{DO} };
490 490

  
491 491
  my @columns = qw(
492
    ids                     transdate
492
    ids                     transdate               reqdate
493 493
    id                      donumber
494 494
    ordnumber               customernumber
495 495
    name                    employee  salesman
......
516 516
  my %column_defs = (
517 517
    'ids'                     => { 'text' => '', },
518 518
    'transdate'               => { 'text' => $locale->text('Date'), },
519
    'reqdate'                 => { 'text' => $locale->text('Reqdate'), },
519 520
    'id'                      => { 'text' => $locale->text('ID'), },
520 521
    'donumber'                => { 'text' => $locale->text('Delivery Order'), },
521 522
    'ordnumber'               => { 'text' => $locale->text('Order'), },
......
531 532
    'department'              => { 'text' => $locale->text('Department'), },
532 533
  );
533 534

  
534
  foreach my $name (qw(id transdate donumber ordnumber name employee salesman shipvia transaction_description department)) {
535
  foreach my $name (qw(id transdate reqdate donumber ordnumber name employee salesman shipvia transaction_description department)) {
535 536
    my $sortdir                 = $form->{sort} eq $name ? 1 - $form->{sortdir} : $form->{sortdir};
536 537
    $column_defs{$name}->{link} = $href . "&sort=$name&sortdir=$sortdir";
537 538
  }
templates/webpages/do/search.html
163 163
         <input name="l_transdate" id="l_transdate" class="checkbox" type="checkbox" value="Y" checked>
164 164
         <label for="l_transdate">[% 'Date' | $T8 %]</label>
165 165
        </td>
166
        <td>
167
         <input name="l_reqdate" id="l_reqdate" class="checkbox" type="checkbox" value="Y" checked>
168
         <label for="l_reqdate">[% 'Reqdate' | $T8 %]</label>
169
        </td>
170
       </tr>
166 171

  
172
       <tr>
167 173
        <td>
168 174
         <input name="l_name" id="l_name" class="checkbox" type="checkbox" value="Y" checked>
169 175
         <label for="l_name">[% IF is_customer %][% 'Customer' | $T8 %][% ELSE %][% 'Vendor' | $T8 %][% END %]</label>

Auch abrufbar als: Unified diff