Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision 30645d2c

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

  • ID 30645d2ca27d8eca6df47ce3c6c0216628ce3839
  • Vorgänger 3fcf64fc
  • Nachfolger dcf47a56

Liefertermin im Lieferscheinbericht filterbar gemacht ...

... und Datum in Lieferscheindatum umbenannt.

Unterschiede anzeigen:

SL/DO.pm
push @values, conv_date($form->{transdateto});
}
if($form->{reqdatefrom}) {
push @where, qq|dord.reqdate >= ?|;
push @values, conv_date($form->{reqdatefrom});
}
if($form->{reqdateto}) {
push @where, qq|dord.reqdate <= ?|;
push @values, conv_date($form->{reqdateto});
}
if (@where) {
$query .= " WHERE " . join(" AND ", map { "($_)" } @where);
}
bin/mozilla/do.pl
my @hidden_variables = map { "l_${_}" } @columns;
push @hidden_variables, $form->{vc}, qw(l_closed l_notdelivered open closed delivered notdelivered donumber ordnumber serialnumber
transaction_description transdatefrom transdateto type vc employee_id salesman_id project_id);
transaction_description transdatefrom transdateto reqdatefrom reqdateto
type vc employee_id salesman_id project_id);
my $href = build_std_url('action=orders', grep { $form->{$_} } @hidden_variables);
my %column_defs = (
'ids' => { 'text' => '', },
'transdate' => { 'text' => $locale->text('Date'), },
'transdate' => { 'text' => $locale->text('Delivery Order Date'), },
'reqdate' => { 'text' => $locale->text('Reqdate'), },
'id' => { 'text' => $locale->text('ID'), },
'donumber' => { 'text' => $locale->text('Delivery Order'), },
......
if ($form->{transaction_description}) {
push @options, $locale->text('Transaction description') . " : $form->{transaction_description}";
}
if ($form->{transdatefrom}) {
push @options, $locale->text('From') . " " . $locale->date(\%myconfig, $form->{transdatefrom}, 1);
}
if ($form->{transdateto}) {
push @options, $locale->text('Bis') . " " . $locale->date(\%myconfig, $form->{transdateto}, 1);
}
if ( $form->{transdatefrom} or $form->{transdateto} ) {
push @options, $locale->text('Delivery Order Date');
push @options, $locale->text('From') . " " . $locale->date(\%myconfig, $form->{transdatefrom}, 1) if $form->{transdatefrom};
push @options, $locale->text('Bis') . " " . $locale->date(\%myconfig, $form->{transdateto}, 1) if $form->{transdateto};
};
if ( $form->{reqdatefrom} or $form->{reqdateto} ) {
push @options, $locale->text('Reqdate');
push @options, $locale->text('From') . " " . $locale->date(\%myconfig, $form->{reqdatefrom}, 1) if $form->{reqdatefrom};
push @options, $locale->text('Bis') . " " . $locale->date(\%myconfig, $form->{reqdateto}, 1) if $form->{reqdateto};
};
if ($form->{open}) {
push @options, $locale->text('Open');
}
templates/webpages/do/search.html
</tr>
<tr>
<th align="right">[% 'From' | $T8 %]</th>
<th align="right">[% 'Delivery Order Date' | $T8 %] [% 'From' | $T8 %]</th>
<td>
[% L.date_tag('transdatefrom') %]
</td>
......
</td>
</tr>
<tr>
<th align="right">[% 'Reqdate' | $T8 %] [% 'From' | $T8 %]</th>
<td>
[% L.date_tag('reqdatefrom') %]
</td>
<th align="right">[% 'Bis' | $T8 %]</th>
<td>
[% L.date_tag('reqdateto') %]
</td>
</tr>
<tr>
<th align="right">[% 'Include in Report' | $T8 %]</th>
<td colspan="5">
......
<tr>
<td>
<input name="l_transdate" id="l_transdate" class="checkbox" type="checkbox" value="Y" checked>
<label for="l_transdate">[% 'Date' | $T8 %]</label>
<label for="l_transdate">[% 'Delivery Order Date' | $T8 %]</label>
</td>
<td>
<input name="l_reqdate" id="l_reqdate" class="checkbox" type="checkbox" value="Y" checked>

Auch abrufbar als: Unified diff